diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php index f1f0fd0..1ae9963 100644 --- a/resources/views/admin/platform_orders/index.blade.php +++ b/resources/views/admin/platform_orders/index.blade.php @@ -87,8 +87,17 @@ $selfWithoutBack ); @endphp + @php + // 清除订阅锁定:保留其它筛选上下文(例如 lead_id/keyword/back),但移除 site_subscription_id + page。 + $clearSubscriptionUrl = \App\Support\BackUrl::currentPathWithQuery([ + 'site_subscription_id' => null, + 'page' => null, + ], $safeBackForLinks); + @endphp {{ $currentSubscription->subscription_no }} (订阅ID:{{ $currentSubscription->id }}) + + 取消锁定订阅
提示:本页快捷筛选会保留该订阅ID;右上角“新建平台订单”会自动预填订阅ID。
diff --git a/tests/Feature/AdminPlatformOrderIndexClearSubscriptionFilterLinkTest.php b/tests/Feature/AdminPlatformOrderIndexClearSubscriptionFilterLinkTest.php new file mode 100644 index 0000000..64c9d44 --- /dev/null +++ b/tests/Feature/AdminPlatformOrderIndexClearSubscriptionFilterLinkTest.php @@ -0,0 +1,63 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_index_should_render_clear_subscription_filter_link_when_site_subscription_id_present(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'po_clear_sub_filter_plan', + 'name' => '平台订单清除订阅锁定测试套餐', + 'billing_cycle' => 'monthly', + 'price' => 10, + 'list_price' => 10, + 'status' => 'active', + 'sort' => 10, + 'published_at' => now(), + ]); + + $sub = SiteSubscription::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'status' => 'activated', + 'source' => 'manual', + 'subscription_no' => 'SS_CLEAR_SUB_FILTER_0001', + 'plan_name' => $plan->name, + 'billing_cycle' => $plan->billing_cycle, + 'period_months' => 1, + 'amount' => 10, + 'starts_at' => now()->subDay(), + 'ends_at' => now()->addMonth(), + 'activated_at' => now()->subDay(), + ]); + + $res = $this->get('/admin/platform-orders?site_subscription_id=' . $sub->id . '&keyword=abc'); + $res->assertOk(); + + // 清除订阅锁定:应移除 site_subscription_id,但保留 keyword。 + $res->assertSee('取消锁定订阅', false); + $res->assertSee('href="/admin/platform-orders?keyword=abc"', false); + } +}