dashboard: recent orders show sync/bmpa failed hints with quick list links
This commit is contained in:
@@ -228,27 +228,48 @@
|
|||||||
@forelse(($recentPlatformOrders ?? []) as $po)
|
@forelse(($recentPlatformOrders ?? []) as $po)
|
||||||
@php
|
@php
|
||||||
$poShowUrl = \App\Support\BackUrl::withBack('/admin/platform-orders/' . $po->id, $selfWithoutBack);
|
$poShowUrl = \App\Support\BackUrl::withBack('/admin/platform-orders/' . $po->id, $selfWithoutBack);
|
||||||
@endphp
|
|
||||||
@php
|
|
||||||
$hasReceiptEvidence = (data_get($po->meta, 'payment_summary.total_amount') !== null)
|
$hasReceiptEvidence = (data_get($po->meta, 'payment_summary.total_amount') !== null)
|
||||||
|| (data_get($po->meta, 'payment_receipts.0.amount') !== null);
|
|| (data_get($po->meta, 'payment_receipts.0.amount') !== null);
|
||||||
$fixReceiptUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'add-payment-receipt');
|
$fixReceiptUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'add-payment-receipt');
|
||||||
|
|
||||||
|
$syncErrMsg = (string) (data_get($po->meta, 'subscription_activation_error.message') ?? '');
|
||||||
|
$bmpaErrMsg = (string) (data_get($po->meta, 'batch_mark_paid_and_activate_error.message') ?? '');
|
||||||
|
|
||||||
|
$syncFailedListUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?sync_status=failed', $selfWithoutBack);
|
||||||
|
$bmpaFailedListUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?bmpa_failed_only=1', $selfWithoutBack);
|
||||||
@endphp
|
@endphp
|
||||||
<tr>
|
<tr data-role="recent-platform-order-row" data-order-no="{{ $po->order_no }}">
|
||||||
<td><a class="link" href="{!! $poShowUrl !!}">{{ $po->order_no }}</a></td>
|
<td><a class="link" href="{!! $poShowUrl !!}">{{ $po->order_no }}</a></td>
|
||||||
<td>{{ $po->orderTypeLabel() }}</td>
|
<td>{{ $po->orderTypeLabel() }}</td>
|
||||||
<td>¥{{ number_format((float) $po->payable_amount, 2) }}</td>
|
<td>¥{{ number_format((float) $po->payable_amount, 2) }}</td>
|
||||||
<td>
|
<td>
|
||||||
{{ $po->payment_status }}
|
{{ $po->payment_status }}
|
||||||
@if((string) $po->payment_status === 'paid' && ! $hasReceiptEvidence)
|
@if((string) $po->payment_status === 'paid' && ! $hasReceiptEvidence)
|
||||||
<div class="muted text-danger muted-xs row-warn">
|
<div class="muted text-danger muted-xs row-warn" data-role="recent-order-no-receipt-hint">
|
||||||
<span class="row-warn-prefix">无回执</span>
|
<span class="row-warn-prefix">无回执</span>
|
||||||
<span class="muted">|</span>
|
<span class="muted">|</span>
|
||||||
<a class="link" href="{!! $fixReceiptUrl !!}">去补回执</a>
|
<a class="link" href="{!! $fixReceiptUrl !!}">去补回执</a>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
<td>{{ $po->status }}</td>
|
<td>
|
||||||
|
{{ $po->status }}
|
||||||
|
@if($syncErrMsg !== '')
|
||||||
|
<div class="muted text-danger muted-xs row-warn" data-role="recent-order-sync-failed-hint">
|
||||||
|
<span class="row-warn-prefix">同步失败</span>
|
||||||
|
<span class="muted">|</span>
|
||||||
|
<a class="link" href="{!! $syncFailedListUrl !!}">进入集合</a>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
@if($bmpaErrMsg !== '')
|
||||||
|
<div class="muted text-danger muted-xs row-warn" data-role="recent-order-bmpa-failed-hint">
|
||||||
|
<span class="row-warn-prefix">BMPA失败</span>
|
||||||
|
<span class="muted">|</span>
|
||||||
|
<a class="link" href="{!! $bmpaFailedListUrl !!}">进入集合</a>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@empty
|
@empty
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\Admin;
|
||||||
|
use App\Models\Merchant;
|
||||||
|
use App\Models\PlatformOrder;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdminDashboardRecentPlatformOrdersShouldShowSyncFailedAndBmpaFailedHintsTest 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_dashboard_recent_platform_orders_should_show_sync_failed_and_bmpa_failed_hints(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchantId = (int) Merchant::query()->value('id');
|
||||||
|
$platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id');
|
||||||
|
|
||||||
|
PlatformOrder::query()->create([
|
||||||
|
'merchant_id' => $merchantId,
|
||||||
|
'plan_id' => null,
|
||||||
|
'site_subscription_id' => null,
|
||||||
|
'created_by_admin_id' => $platformAdminId ?: null,
|
||||||
|
'order_no' => 'PO_DASH_SYNC_FAILED_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'status' => 'pending',
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'payable_amount' => 9,
|
||||||
|
'paid_amount' => 9,
|
||||||
|
'meta' => [
|
||||||
|
'subscription_activation_error' => [
|
||||||
|
'message' => 'sync failed',
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
PlatformOrder::query()->create([
|
||||||
|
'merchant_id' => $merchantId,
|
||||||
|
'plan_id' => null,
|
||||||
|
'site_subscription_id' => null,
|
||||||
|
'created_by_admin_id' => $platformAdminId ?: null,
|
||||||
|
'order_no' => 'PO_DASH_BMPA_FAILED_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'status' => 'pending',
|
||||||
|
'payment_status' => 'unpaid',
|
||||||
|
'payable_amount' => 9,
|
||||||
|
'paid_amount' => 0,
|
||||||
|
'meta' => [
|
||||||
|
'batch_mark_paid_and_activate_error' => [
|
||||||
|
'message' => 'bmpa failed',
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res = $this->get('/admin');
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$res->assertSee('PO_DASH_SYNC_FAILED_0001');
|
||||||
|
$res->assertSee('同步失败', false);
|
||||||
|
|
||||||
|
$syncFailedUrl = '/admin/platform-orders?' . Arr::query([
|
||||||
|
'sync_status' => 'failed',
|
||||||
|
'back' => '/admin',
|
||||||
|
]);
|
||||||
|
$res->assertSee($syncFailedUrl, false);
|
||||||
|
|
||||||
|
$res->assertSee('PO_DASH_BMPA_FAILED_0001');
|
||||||
|
$res->assertSee('BMPA失败', false);
|
||||||
|
|
||||||
|
$bmpaFailedUrl = '/admin/platform-orders?' . Arr::query([
|
||||||
|
'bmpa_failed_only' => '1',
|
||||||
|
'back' => '/admin',
|
||||||
|
]);
|
||||||
|
$res->assertSee($bmpaFailedUrl, false);
|
||||||
|
|
||||||
|
// 不应出现 &back=,避免回跳断链
|
||||||
|
$res->assertDontSee('&back=', false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user