diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php index 6a9b04d..b6304a6 100644 --- a/resources/views/admin/site_subscriptions/index.blade.php +++ b/resources/views/admin/site_subscriptions/index.blade.php @@ -190,9 +190,12 @@ @endphp {{ $subscription->subscription_no }} @php + $remarkPrefix = (string) config('saasshop.platform_orders.renewal_order_remark_prefix', '来自订阅:'); $q = [ 'order_type' => 'renewal', 'site_subscription_id' => $subscription->id, + 'quantity' => 1, + 'remark' => $remarkPrefix . $subscription->subscription_no, 'back' => $back, ]; if ((int) ($subscription->merchant_id ?? 0) > 0) { diff --git a/tests/Feature/AdminSiteSubscriptionIndexRowRenewOrderLinkTest.php b/tests/Feature/AdminSiteSubscriptionIndexRowRenewOrderLinkTest.php index ad71412..24001ba 100644 --- a/tests/Feature/AdminSiteSubscriptionIndexRowRenewOrderLinkTest.php +++ b/tests/Feature/AdminSiteSubscriptionIndexRowRenewOrderLinkTest.php @@ -84,6 +84,8 @@ class AdminSiteSubscriptionIndexRowRenewOrderLinkTest extends TestCase && (string) ($q['site_subscription_id'] ?? '') === (string) $sub->id && (string) ($q['merchant_id'] ?? '') === (string) $merchant->id && (string) ($q['plan_id'] ?? '') === (string) $plan->id + && (string) ($q['quantity'] ?? '') === '1' + && str_contains((string) ($q['remark'] ?? ''), $sub->subscription_no) && (string) ($q['back'] ?? '') === $selfWithoutBack) { $found = true; // 防 back 嵌套