linxianzhuang/saasshop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(platform-orders): align paid-pending governance links with unsynced scope

Browse Source
This commit is contained in:
萝卜
2026-03-16 18:51:23 +08:00
parent 88347d1185
commit 33ab55b10a
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/admin/platform_orders/index.blade.php
View File

@@ -148,9 +148,11 @@
'status' => null, 'status' => null,
]); ]);
// 待生效口径与仪表盘一致：paid + pending + sync_status=unsynced（排除同步失败等异常单）
$leadPaidPendingUrl = $buildLeadGovernUrl([ $leadPaidPendingUrl = $buildLeadGovernUrl([
'payment_status' => 'paid', 'payment_status' => 'paid',
'status' => 'pending', 'status' => 'pending',
'sync_status' => 'unsynced',
]); ]);
@endphp @endphp
@php @php
@@ -266,11 +268,12 @@
'fail_only' => null, 'fail_only' => null,
]); ]);
// 待生效口径与仪表盘一致：paid + pending + sync_status=unsynced（排除同步失败等异常单）
$subPaidPendingUrl = $buildSubGovernUrl([ $subPaidPendingUrl = $buildSubGovernUrl([
'payment_status' => 'paid', 'payment_status' => 'paid',
'status' => 'pending', 'status' => 'pending',
'syncable_only' => null, 'syncable_only' => null,
'sync_status' => null, 'sync_status' => 'unsynced',
'fail_only' => null, 'fail_only' => null,
]); ]);
@@ -325,7 +328,7 @@
<a href="{!! $allUrl !!}" class="muted">全部</a> <a href="{!! $allUrl !!}" class="muted">全部</a>
<a href="{!! $buildQuickFilterUrl(['payment_status' => 'unpaid']) !!}" class="muted">待支付</a> <a href="{!! $buildQuickFilterUrl(['payment_status' => 'unpaid']) !!}" class="muted">待支付</a>
<a href="{!! $buildQuickFilterUrl(['status' => 'pending', 'payment_status' => 'unpaid']) !!}" class="muted">可BMPA处理</a> <a href="{!! $buildQuickFilterUrl(['status' => 'pending', 'payment_status' => 'unpaid']) !!}" class="muted">可BMPA处理</a>
<a href="{!! $buildQuickFilterUrl(['payment_status' => 'paid', 'status' => 'pending']) !!}" class="muted">待生效</a> <a href="{!! $buildQuickFilterUrl(['payment_status' => 'paid', 'status' => 'pending', 'sync_status' => 'unsynced']) !!}" class="muted">待生效</a>
<a href="{!! $buildQuickFilterUrl(['syncable_only' => '1']) !!}" class="muted">可同步订阅</a> <a href="{!! $buildQuickFilterUrl(['syncable_only' => '1']) !!}" class="muted">可同步订阅</a>
<a href="{!! $buildQuickFilterUrl(['sync_status' => 'failed']) !!}" class="muted">同步失败</a> <a href="{!! $buildQuickFilterUrl(['sync_status' => 'failed']) !!}" class="muted">同步失败</a>
<a href="{!! $buildQuickFilterUrl(['bmpa_failed_only' => '1']) !!}" class="muted">BMPA失败</a> <a href="{!! $buildQuickFilterUrl(['bmpa_failed_only' => '1']) !!}" class="muted">BMPA失败</a>

8
tests/Feature/AdminDashboardBillingWorkbenchQuickLinksTest.php
View File

@@ -28,16 +28,16 @@ class AdminDashboardBillingWorkbenchQuickLinksTest extends TestCase
$res->assertSee('快捷筛选'); $res->assertSee('快捷筛选');
$res->assertSee('href="/admin/platform-orders?payment_status=unpaid&status=pending"', false); $res->assertSee('href="/admin/platform-orders?payment_status=unpaid&status=pending&back=%2Fadmin"', false);
$res->assertSee('待支付'); $res->assertSee('待支付');
$res->assertSee('href="/admin/platform-orders?payment_status=paid&status=pending&sync_status=unsynced"', false); $res->assertSee('href="/admin/platform-orders?payment_status=paid&status=pending&sync_status=unsynced&back=%2Fadmin"', false);
$res->assertSee('待生效'); $res->assertSee('待生效');
$res->assertSee('href="/admin/platform-orders?syncable_only=1"', false); $res->assertSee('href="/admin/platform-orders?syncable_only=1&back=%2Fadmin"', false);
$res->assertSee('可同步'); $res->assertSee('可同步');
$res->assertSee('href="/admin/platform-orders?sync_status=failed"', false); $res->assertSee('href="/admin/platform-orders?sync_status=failed&back=%2Fadmin"', false);
$res->assertSee('同步失败'); $res->assertSee('同步失败');
} }
} }

2
tests/Feature/AdminPlatformOrderTest.php
View File

@@ -52,7 +52,7 @@ class AdminPlatformOrderTest extends TestCase
->assertSee('已退款') ->assertSee('已退款')
->assertSee('退款数') ->assertSee('退款数')
->assertSee('退款总额') ->assertSee('退款总额')
->assertSee('/admin/platform-orders?payment_status=paid&status=pending', false); ->assertSee('/admin/platform-orders?payment_status=paid&status=pending&sync_status=unsynced', false);
} }
public function test_guest_cannot_open_platform_orders_page(): void public function test_guest_cannot_open_platform_orders_page(): void