From d299e133a63776a13c1d481a1fb3698c58de62a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Fri, 13 Mar 2026 17:41:45 +0000 Subject: [PATCH] Preserve subscription show context when opening platform order details --- .../admin/site_subscriptions/show.blade.php | 4 +- ...onOrdersTableOrderLinkContainsBackTest.php | 84 +++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 tests/Feature/AdminSiteSubscriptionOrdersTableOrderLinkContainsBackTest.php diff --git a/resources/views/admin/site_subscriptions/show.blade.php b/resources/views/admin/site_subscriptions/show.blade.php index 7534ace..6804acc 100644 --- a/resources/views/admin/site_subscriptions/show.blade.php +++ b/resources/views/admin/site_subscriptions/show.blade.php @@ -342,7 +342,7 @@ @endphp {{ $order->id }} - {{ $order->order_no }} + {{ $order->order_no }} {{ $order->status }} {{ $order->payment_status }} ¥{{ number_format((float) $order->payable_amount, 2) }} / ¥{{ number_format((float) $order->paid_amount, 2) }} @@ -360,7 +360,7 @@ @endif - 详情 + 详情 @empty diff --git a/tests/Feature/AdminSiteSubscriptionOrdersTableOrderLinkContainsBackTest.php b/tests/Feature/AdminSiteSubscriptionOrdersTableOrderLinkContainsBackTest.php new file mode 100644 index 0000000..2d3cd9e --- /dev/null +++ b/tests/Feature/AdminSiteSubscriptionOrdersTableOrderLinkContainsBackTest.php @@ -0,0 +1,84 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_orders_table_links_to_platform_order_show_include_back_param(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'sub_orders_table_back_plan', + 'name' => '订阅详情订单表 back 参数测试套餐', + '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' => 'SUB_ORDERS_TABLE_BACK_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(), + ]); + + $order = PlatformOrder::query()->create([ + 'merchant_id' => $merchant->id, + 'plan_id' => $plan->id, + 'site_subscription_id' => $sub->id, + 'order_no' => 'PO_SUB_ORDERS_TABLE_BACK_0001', + 'order_type' => 'renewal', + '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' => [], + ]); + + $res = $this->get('/admin/site-subscriptions/' . $sub->id); + $res->assertOk(); + + $expectedBack = urlencode('/admin/site-subscriptions/' . $sub->id); + + $res->assertSee('/admin/platform-orders/' . $order->id . '?back=' . $expectedBack, false); + } +}