From e0b1a707fbeccee29994fb6f222f1cac9c0bd54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Mon, 16 Mar 2026 10:05:19 +0800 Subject: [PATCH] chore(admin-ui): hide renew tool link in expiry view --- resources/views/admin/site_subscriptions/index.blade.php | 7 ++++++- ...dminSiteSubscriptionIndexCreateRenewalOrderLinkTest.php | 4 ++-- ...SiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php index 12bb048..6e8eb49 100644 --- a/resources/views/admin/site_subscriptions/index.blade.php +++ b/resources/views/admin/site_subscriptions/index.blade.php @@ -261,11 +261,16 @@ } $createOrderFromSubIndexUrl = \App\Support\BackUrl::withBack('/admin/platform-orders/create?' . \Illuminate\Support\Arr::query($q), $selfWithoutBack); @endphp - 续费下单(先选订阅) + @if(!($isExpiryView ?? false)) + 续费下单(先选订阅) + @endif
用于运营从订阅目录快速发起续费下单:会把当前 merchant_id/plan_id 作为默认值带到下单页。 续费单必须绑定订阅,建议从下方列表行内「续费下单」选择具体订阅。 + @if(($isExpiryView ?? false)) + (已处于到期集合视图:请优先使用上方「创建续费订单(当前集合)」入口) + @endif
diff --git a/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderLinkTest.php b/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderLinkTest.php index fe1b21a..5482c86 100644 --- a/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderLinkTest.php +++ b/tests/Feature/AdminSiteSubscriptionIndexCreateRenewalOrderLinkTest.php @@ -94,8 +94,8 @@ class AdminSiteSubscriptionIndexCreateRenewalOrderLinkTest extends TestCase } } - $this->assertTrue($found, '未找到包含当前筛选条件与 back 的创建续费订单链接'); - $res->assertSee('创建续费订单(带当前筛选)', false); + $this->assertTrue($found, '未找到包含当前筛选条件与 back 的续费下单链接'); + $res->assertSee('续费下单(先选订阅)', false); // 防 back 嵌套 $res->assertDontSee('back%3D', false); diff --git a/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php b/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php index 8e43017..29df6bd 100644 --- a/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php +++ b/tests/Feature/AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest.php @@ -27,6 +27,8 @@ class AdminSiteSubscriptionIndexExpiryGovernanceRenewalCtaTest extends TestCase $res->assertOk(); $res->assertSee('创建续费订单(当前集合)'); + // 去重降噪:到期集合视图已有专用 CTA,此处不应再出现“续费下单(先选订阅)”工具入口 + $res->assertDontSee('续费下单(先选订阅)'); // CTA 应带上当前筛选 merchant_id/plan_id,并且 back 回到当前列表(selfWithoutBack) $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);