From 3182dd72a010ab7f82ba6099a93101a99845e620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= <dev@saasshop.local>
Date: Sun, 15 Mar 2026 02:36:27 +0000
Subject: [PATCH] PlatformOrder create: require_subscription flag narrows order
 types

---
 .../Admin/PlatformOrderController.php         |  1 +
 .../admin/platform_orders/form.blade.php      | 12 +++++++
 ...bscriptionFlagShouldDisableRenewalTest.php |  7 ++--
 ...nFlagShouldOnlyShowNewPurchaseTypeTest.php | 34 +++++++++++++++++++
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldOnlyShowNewPurchaseTypeTest.php

diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php
index 170a259..251e046 100644
--- a/app/Http/Controllers/Admin/PlatformOrderController.php
+++ b/app/Http/Controllers/Admin/PlatformOrderController.php
@@ -93,6 +93,7 @@ class PlatformOrderController extends Controller
             'siteSubscription' => $siteSubscription,
             'billingCycleLabels' => $this->billingCycleLabels(),
             'orderTypeLabels' => $this->orderTypeLabels(),
+            'requireSubscription' => $requireSubscription,
             'defaults' => $defaults,
         ]);
     }
diff --git a/resources/views/admin/platform_orders/form.blade.php b/resources/views/admin/platform_orders/form.blade.php
index ec1c7b6..ebdc7bc 100644
--- a/resources/views/admin/platform_orders/form.blade.php
+++ b/resources/views/admin/platform_orders/form.blade.php
@@ -107,13 +107,25 @@
         @php
             $canRenew = ((int) ($defaults['site_subscription_id'] ?? 0) > 0) && (($siteSubscription ?? null) && ($siteSubscription->id ?? 0));
             $selectedOrderType = (string) old('order_type', $defaults['order_type'] ?? 'new_purchase');
+
             // 治理口径：续费必须绑定订阅。若当前页面未绑定订阅，则不允许选中 renewal（避免提交后才报错）。
             if (! $canRenew && $selectedOrderType === 'renewal') {
                 $selectedOrderType = 'new_purchase';
             }
+
+            // 更强治理：若来源页声明 require_subscription=1，且当前未绑定订阅，则不展示 upgrade/downgrade 等类型，避免误用。
+            $requireSub = (bool) ($requireSubscription ?? false);
+            $allowedTypes = array_keys($orderTypeLabels ?? []);
+            if ($requireSub && ! $canRenew) {
+                $allowedTypes = ['new_purchase'];
+            }
         @endphp
         <select name="order_type" required>
             @foreach(($orderTypeLabels ?? []) as $value => $label)
+                @if(!in_array($value, $allowedTypes, true))
+                    @continue
+                @endif
+
                 @if($value === 'renewal' && ! $canRenew)
                     <option value="{{ $value }}" disabled>{{ $label }}（需从订阅进入）</option>
                 @else
diff --git a/tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldDisableRenewalTest.php b/tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldDisableRenewalTest.php
index 8feb42b..e77eaf3 100644
--- a/tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldDisableRenewalTest.php
+++ b/tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldDisableRenewalTest.php
@@ -26,10 +26,9 @@ class AdminPlatformOrderCreateRequireSubscriptionFlagShouldDisableRenewalTest ex
         $res = $this->get('/admin/platform-orders/create?require_subscription=1&order_type=renewal');
         $res->assertOk();
 
-        // 续费选项应禁用
-        $res->assertSee('value="renewal" disabled', false);
-
-        // 不应出现 renewal 被选中（避免误导）
+        // 当 require_subscription=1 且未绑定订阅时：续费选项不应可选（可能被隐藏或 disabled）
         $res->assertDontSee('value="renewal" selected', false);
+        // 更强口径：不应出现 renewal option（避免误导）
+        $res->assertDontSee('value="renewal"', false);
     }
 }
diff --git a/tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldOnlyShowNewPurchaseTypeTest.php b/tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldOnlyShowNewPurchaseTypeTest.php
new file mode 100644
index 0000000..0739844
--- /dev/null
+++ b/tests/Feature/AdminPlatformOrderCreateRequireSubscriptionFlagShouldOnlyShowNewPurchaseTypeTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdminPlatformOrderCreateRequireSubscriptionFlagShouldOnlyShowNewPurchaseTypeTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected function loginAsPlatformAdmin(): void
+    {
+        $this->seed();
+
+        $this->post('/admin/login', [
+            'email' => 'platform.admin@demo.local',
+            'password' => 'Platform@123456',
+        ])->assertRedirect('/admin');
+    }
+
+    public function test_create_should_only_show_new_purchase_when_require_subscription_flag_and_no_subscription_context(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $res = $this->get('/admin/platform-orders/create?require_subscription=1');
+        $res->assertOk();
+
+        // 仅保留 new_purchase 作为可选项（避免误用 upgrade/downgrade 等）
+        $res->assertSee('value="new_purchase"', false);
+        $res->assertDontSee('value="upgrade"', false);
+        $res->assertDontSee('value="downgrade"', false);
+    }
+}