feat(admin-dashboard): no receipt hint links to list scope
This commit is contained in:
@@ -312,6 +312,7 @@
|
|||||||
$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');
|
||||||
|
$noReceiptListUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?payment_status=paid&receipt_status=none', $selfWithoutBack);
|
||||||
|
|
||||||
$syncErrMsg = (string) (data_get($po->meta, 'subscription_activation_error.message') ?? '');
|
$syncErrMsg = (string) (data_get($po->meta, 'subscription_activation_error.message') ?? '');
|
||||||
$bmpaErrMsg = (string) (data_get($po->meta, 'batch_mark_paid_and_activate_error.message') ?? '');
|
$bmpaErrMsg = (string) (data_get($po->meta, 'batch_mark_paid_and_activate_error.message') ?? '');
|
||||||
@@ -330,6 +331,8 @@
|
|||||||
<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>
|
||||||
|
<span class="muted">|</span>
|
||||||
|
<a class="link" href="{!! $noReceiptListUrl !!}">进入集合</a>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
<?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 AdminDashboardRecentPlatformOrdersNoReceiptShouldIncludeListLinkTest 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_no_receipt_should_include_list_link(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchantId = (int) Merchant::query()->value('id');
|
||||||
|
$platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id');
|
||||||
|
|
||||||
|
$order = PlatformOrder::query()->create([
|
||||||
|
'merchant_id' => $merchantId,
|
||||||
|
'plan_id' => null,
|
||||||
|
'site_subscription_id' => null,
|
||||||
|
'created_by_admin_id' => $platformAdminId ?: null,
|
||||||
|
'order_no' => 'PO_DASH_NO_RECEIPT_LIST_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'status' => 'pending',
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'payable_amount' => 9,
|
||||||
|
'paid_amount' => 9,
|
||||||
|
'meta' => [],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res = $this->get('/admin');
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$res->assertSee('PO_DASH_NO_RECEIPT_LIST_0001');
|
||||||
|
$res->assertSee('无回执', false);
|
||||||
|
|
||||||
|
$listUrl = '/admin/platform-orders?' . Arr::query([
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'receipt_status' => 'none',
|
||||||
|
'back' => '/admin',
|
||||||
|
]);
|
||||||
|
$res->assertSee($listUrl, false);
|
||||||
|
$res->assertDontSee('&back=', false);
|
||||||
|
|
||||||
|
// 保留“去补回执”单订单治理入口
|
||||||
|
$fixUrl = '/admin/platform-orders/' . $order->id . '?' . Arr::query([
|
||||||
|
'back' => '/admin',
|
||||||
|
]) . '#add-payment-receipt';
|
||||||
|
$res->assertSee($fixUrl, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user