From 9872296968dd9e91e131d8db34016d9fa4b6fcb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Sun, 15 Mar 2026 02:47:55 +0000 Subject: [PATCH] SiteSubscription index: refine renewal entry copy and align tests --- resources/views/admin/site_subscriptions/index.blade.php | 7 +++++-- ...rKeepsFiltersShouldCarryRequireSubscriptionFlagTest.php | 2 +- ...SiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php index 93ffbd7..e32d83d 100644 --- a/resources/views/admin/site_subscriptions/index.blade.php +++ b/resources/views/admin/site_subscriptions/index.blade.php @@ -243,9 +243,12 @@ } $createOrderFromSubIndexUrl = \App\Support\BackUrl::withBack('/admin/platform-orders/create?' . \Illuminate\Support\Arr::query($q), $selfWithoutBack); @endphp - 创建续费订单(带当前筛选) + 续费下单(先选订阅) + +
+ 用于运营从订阅目录快速发起续费下单:会把当前 merchant_id/plan_id 作为默认值带到下单页。 + 续费单必须绑定订阅,建议从下方列表行内「续费下单」选择具体订阅。
-
用于运营从订阅目录快速补单/续费:会把当前 merchant_id/plan_id/site_subscription_id 作为默认值带到下单页。
diff --git a/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderKeepsFiltersShouldCarryRequireSubscriptionFlagTest.php b/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderKeepsFiltersShouldCarryRequireSubscriptionFlagTest.php index 018cfa5..e3f5f5a 100644 --- a/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderKeepsFiltersShouldCarryRequireSubscriptionFlagTest.php +++ b/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderKeepsFiltersShouldCarryRequireSubscriptionFlagTest.php @@ -32,7 +32,7 @@ class AdminSiteSubscriptionIndexCreateRenewalOrderKeepsFiltersShouldCarryRequire $res->assertOk(); - $res->assertSee('创建续费订单(带当前筛选)', false); + $res->assertSee('续费下单(先选订阅)', false); $res->assertSee('require_subscription=1', false); } } diff --git a/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php b/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php index 36cdb97..8e43017 100644 --- a/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php +++ b/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php @@ -29,7 +29,7 @@ class AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest extends TestCase $res->assertSee('创建续费订单(当前集合)'); // CTA 应带上当前筛选 merchant_id/plan_id,并且 back 回到当前列表(selfWithoutBack) - $res->assertSee('href="/admin/platform-orders/create?order_type=renewal&merchant_id=2&plan_id=3&back=%2Fadmin%2Fsite-subscriptions%3Fexpiry%3Dexpiring_7d%26merchant_id%3D2%26plan_id%3D3"', false); + $res->assertSee('href="/admin/platform-orders/create?order_type=renewal&require_subscription=1&merchant_id=2&plan_id=3&back=%2Fadmin%2Fsite-subscriptions%3Fexpiry%3Dexpiring_7d%26merchant_id%3D2%26plan_id%3D3"', false); // 链接不应出现 &(只检查该 CTA 的 href 文本中不含 &) $html = (string) $res->getContent();