diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php index e32d83d..a607c57 100644 --- a/resources/views/admin/site_subscriptions/index.blade.php +++ b/resources/views/admin/site_subscriptions/index.blade.php @@ -284,6 +284,7 @@ $remarkPrefix = (string) config('saasshop.platform_orders.renewal_order_remark_prefix', '来自订阅:'); $q = [ 'order_type' => 'renewal', + 'require_subscription' => '1', 'site_subscription_id' => $subscription->id, 'quantity' => 1, 'remark' => $remarkPrefix . $subscription->subscription_no, diff --git a/tests/Feature/AdminSiteSubscriptionIndexRowRenewOrderLinkShouldCarryRequireSubscriptionFlagTest.php b/tests/Feature/AdminSiteSubscriptionIndexRowRenewOrderLinkShouldCarryRequireSubscriptionFlagTest.php new file mode 100644 index 0000000..bb9be7d --- /dev/null +++ b/tests/Feature/AdminSiteSubscriptionIndexRowRenewOrderLinkShouldCarryRequireSubscriptionFlagTest.php @@ -0,0 +1,85 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_subscription_row_renew_order_link_should_carry_require_subscription_flag(): void + { + $this->loginAsPlatformAdmin(); + + $merchant = Merchant::query()->firstOrFail(); + $plan = Plan::query()->create([ + 'code' => 'sub_row_renew_require_sub_plan', + 'name' => '订阅行内续费链接 require_subscription 测试套餐', + '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_ROW_RENEW_REQSUB_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/site-subscriptions?' . Arr::query([ + 'status' => 'activated', + ])); + $res->assertOk(); + + $html = (string) $res->getContent(); + + preg_match_all('/href="([^"]+)"/', $html, $m); + $hrefs = $m[1] ?? []; + + $found = false; + foreach ($hrefs as $u) { + if (!str_contains($u, '/admin/platform-orders/create?')) { + continue; + } + + $parts = parse_url($u); + parse_str($parts['query'] ?? '', $q); + + if ((string) ($q['site_subscription_id'] ?? '') === (string) $sub->id) { + $this->assertSame('1', (string) ($q['require_subscription'] ?? '')); + $found = true; + break; + } + } + + $this->assertTrue($found, '未找到包含订阅ID的续费下单链接'); + } +}