平台订单:同步失败原因过长时不生成筛选链接
This commit is contained in:
@@ -245,11 +245,24 @@
|
|||||||
@endphp
|
@endphp
|
||||||
<div>
|
<div>
|
||||||
@if($reason !== '' && $reason !== '(空)')
|
@if($reason !== '' && $reason !== '(空)')
|
||||||
@php $reasonText = mb_substr($reason, 0, 60); @endphp
|
@php
|
||||||
|
$reasonText = mb_substr($reason, 0, 60);
|
||||||
|
$reasonTooLong = mb_strlen($reason) > 200;
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
@if($reasonTooLong)
|
||||||
|
<span class="muted" title="{{ $reason }}">{{ $reasonText }}</span>
|
||||||
|
<span class="muted">({{ $count }})</span>
|
||||||
|
<span class="muted">|</span>
|
||||||
|
<span class="muted">原因过长,请复制到筛选框</span>
|
||||||
|
<span class="muted">|</span>
|
||||||
|
<a class="link" href="{{ request()->fullUrlWithQuery(['sync_status' => 'failed', 'page' => null]) }}">进入同步失败集合</a>
|
||||||
|
@else
|
||||||
<a class="link" title="{{ $reason }}" href="{!! request()->fullUrlWithQuery(['sync_error_keyword' => $reason, 'sync_status' => 'failed', 'page' => null]) !!}">{{ $reasonText }}</a>
|
<a class="link" title="{{ $reason }}" href="{!! request()->fullUrlWithQuery(['sync_error_keyword' => $reason, 'sync_status' => 'failed', 'page' => null]) !!}">{{ $reasonText }}</a>
|
||||||
<span class="muted">({{ $count }})</span>
|
<span class="muted">({{ $count }})</span>
|
||||||
<span class="muted">|</span>
|
<span class="muted">|</span>
|
||||||
<a class="link" href="{!! request()->fullUrlWithQuery(['sync_error_keyword' => $reason, 'sync_status' => null, 'syncable_only' => '1', 'page' => null]) !!}">切到可同步重试</a>
|
<a class="link" href="{!! request()->fullUrlWithQuery(['sync_error_keyword' => $reason, 'sync_status' => null, 'syncable_only' => '1', 'page' => null]) !!}">切到可同步重试</a>
|
||||||
|
@endif
|
||||||
@else
|
@else
|
||||||
<span class="muted">(空原因)</span>
|
<span class="muted">(空原因)</span>
|
||||||
<span class="muted">({{ $count }})</span>
|
<span class="muted">({{ $count }})</span>
|
||||||
@@ -582,9 +595,18 @@
|
|||||||
<td>{{ optional($order->siteSubscription?->ends_at)->format('Y-m-d H:i:s') ?: '-' }}</td>
|
<td>{{ optional($order->siteSubscription?->ends_at)->format('Y-m-d H:i:s') ?: '-' }}</td>
|
||||||
<td>{{ data_get($order->meta, 'subscription_activation.synced_at') ?: '-' }}</td>
|
<td>{{ data_get($order->meta, 'subscription_activation.synced_at') ?: '-' }}</td>
|
||||||
<td>
|
<td>
|
||||||
@php $syncErrMsg = (string) (data_get($order->meta, 'subscription_activation_error.message') ?? ''); @endphp
|
@php
|
||||||
|
$syncErrMsg = (string) (data_get($order->meta, 'subscription_activation_error.message') ?? '');
|
||||||
|
$syncErrTooLong = $syncErrMsg !== '' && mb_strlen($syncErrMsg) > 200;
|
||||||
|
@endphp
|
||||||
@if($syncErrMsg !== '')
|
@if($syncErrMsg !== '')
|
||||||
|
@if($syncErrTooLong)
|
||||||
|
<span class="muted text-danger" title="{{ $syncErrMsg }}">{{ mb_substr($syncErrMsg, 0, 60) }}</span>
|
||||||
|
<div class="muted text-danger muted-xs">原因过长,请复制到筛选框</div>
|
||||||
|
<a class="link" href="{{ request()->fullUrlWithQuery(['sync_status' => 'failed', 'page' => null]) }}">进入同步失败集合</a>
|
||||||
|
@else
|
||||||
<a class="link text-danger" href="{!! request()->fullUrlWithQuery(['sync_error_keyword' => $syncErrMsg, 'sync_status' => 'failed', 'page' => null]) !!}">{{ mb_substr($syncErrMsg, 0, 60) }}</a>
|
<a class="link text-danger" href="{!! request()->fullUrlWithQuery(['sync_error_keyword' => $syncErrMsg, 'sync_status' => 'failed', 'page' => null]) !!}">{{ mb_substr($syncErrMsg, 0, 60) }}</a>
|
||||||
|
@endif
|
||||||
@else
|
@else
|
||||||
<span class="muted">-</span>
|
<span class="muted">-</span>
|
||||||
@endif
|
@endif
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\Merchant;
|
||||||
|
use App\Models\Plan;
|
||||||
|
use App\Models\PlatformOrder;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdminPlatformOrderSyncFailedReasonTop5LongReasonNoLinkTest extends TestCase
|
||||||
|
{
|
||||||
|
use RefreshDatabase;
|
||||||
|
|
||||||
|
protected function loginAsPlatformAdmin(): void
|
||||||
|
{
|
||||||
|
$this->seed();
|
||||||
|
|
||||||
|
$this->post('/admin/login', [
|
||||||
|
'email' => 'platform.admin@demo.local',
|
||||||
|
'password' => 'Platform@123456',
|
||||||
|
])->assertRedirect('/admin');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_sync_failed_reason_top5_long_reason_should_not_render_keyword_links(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
$plan = Plan::query()->create([
|
||||||
|
'code' => 'sync_failed_reason_long_reason_no_link_test',
|
||||||
|
'name' => '同步失败原因过长不渲染链接测试套餐',
|
||||||
|
'billing_cycle' => 'monthly',
|
||||||
|
'price' => 10,
|
||||||
|
'list_price' => 10,
|
||||||
|
'status' => 'active',
|
||||||
|
'sort' => 10,
|
||||||
|
'published_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$reason = str_repeat('很长的失败原因', 30); // > 200 chars
|
||||||
|
$shown = mb_substr($reason, 0, 60);
|
||||||
|
|
||||||
|
PlatformOrder::query()->create([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'plan_id' => $plan->id,
|
||||||
|
'order_no' => 'PO_SYNC_FAILED_LONG_REASON_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'status' => 'activated',
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'plan_name' => $plan->name,
|
||||||
|
'billing_cycle' => $plan->billing_cycle,
|
||||||
|
'period_months' => 1,
|
||||||
|
'quantity' => 1,
|
||||||
|
'payable_amount' => 10,
|
||||||
|
'paid_amount' => 10,
|
||||||
|
'placed_at' => now(),
|
||||||
|
'paid_at' => now(),
|
||||||
|
'activated_at' => now(),
|
||||||
|
'meta' => [
|
||||||
|
'subscription_activation_error' => [
|
||||||
|
'message' => $reason,
|
||||||
|
'at' => now()->toDateTimeString(),
|
||||||
|
'admin_id' => 1,
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$page = $this->get('/admin/platform-orders');
|
||||||
|
$page->assertOk();
|
||||||
|
|
||||||
|
// 展示截断文本与“原因过长”提示
|
||||||
|
$page->assertSee($shown);
|
||||||
|
$page->assertSee('原因过长,请复制到筛选框');
|
||||||
|
|
||||||
|
// 不应渲染 sync_error_keyword= 的链接(避免 URL 过长/特殊字符问题)
|
||||||
|
$page->assertDontSee('sync_error_keyword=', false);
|
||||||
|
|
||||||
|
// 仍应给一个“进入同步失败集合”的入口
|
||||||
|
$page->assertSee('进入同步失败集合');
|
||||||
|
$page->assertSee('sync_status=failed', false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user