平台订单列表:新建订单链接从筛选条件预填 merchant/plan/subscription
This commit is contained in:
@@ -724,7 +724,19 @@
|
|||||||
<h3>平台订单列表</h3>
|
<h3>平台订单列表</h3>
|
||||||
@php
|
@php
|
||||||
// 新建平台订单:默认携带 back 回到本页自身(剔除 back query,避免嵌套)
|
// 新建平台订单:默认携带 back 回到本页自身(剔除 back query,避免嵌套)
|
||||||
$createOrderUrl = '/admin/platform-orders/create?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]);
|
// 同时:若当前列表已筛选站点/套餐/订阅ID,则预填到创建页,提高运营下单效率
|
||||||
|
$createQuery = ['back' => $selfWithoutBack];
|
||||||
|
if (trim((string) ($filters['merchant_id'] ?? '')) !== '') {
|
||||||
|
$createQuery['merchant_id'] = (int) ($filters['merchant_id'] ?? 0);
|
||||||
|
}
|
||||||
|
if (trim((string) ($filters['plan_id'] ?? '')) !== '') {
|
||||||
|
$createQuery['plan_id'] = (int) ($filters['plan_id'] ?? 0);
|
||||||
|
}
|
||||||
|
if (trim((string) ($filters['site_subscription_id'] ?? '')) !== '') {
|
||||||
|
$createQuery['site_subscription_id'] = (int) ($filters['site_subscription_id'] ?? 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
$createOrderUrl = '/admin/platform-orders/create?' . \Illuminate\Support\Arr::query($createQuery);
|
||||||
@endphp
|
@endphp
|
||||||
<a href="{!! $createOrderUrl !!}" class="btn">新建平台订单</a>
|
<a href="{!! $createOrderUrl !!}" class="btn">新建平台订单</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\Merchant;
|
||||||
|
use App\Models\Plan;
|
||||||
|
use App\Models\SiteSubscription;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdminPlatformOrderIndexCreateLinkPrefillFromFiltersTest 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_platform_order_link_should_prefill_from_index_filters(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
|
||||||
|
$plan = Plan::query()->create([
|
||||||
|
'code' => 'po_index_prefill_plan',
|
||||||
|
'name' => '平台订单列表预填测试套餐',
|
||||||
|
'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' => 'active',
|
||||||
|
'source' => 'manual',
|
||||||
|
'subscription_no' => 'SS_PREFILL_0001',
|
||||||
|
'plan_name' => $plan->name,
|
||||||
|
'billing_cycle' => $plan->billing_cycle,
|
||||||
|
'period_months' => 1,
|
||||||
|
'amount' => 10,
|
||||||
|
'starts_at' => now(),
|
||||||
|
'ends_at' => now()->addMonth(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res = $this->get('/admin/platform-orders?' . Arr::query([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'plan_id' => $plan->id,
|
||||||
|
'site_subscription_id' => $sub->id,
|
||||||
|
]));
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$expectedBack = '/admin/platform-orders?' . Arr::query([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'plan_id' => $plan->id,
|
||||||
|
'site_subscription_id' => $sub->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$expectedCreateUrl = '/admin/platform-orders/create?' . Arr::query([
|
||||||
|
'back' => $expectedBack,
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'plan_id' => $plan->id,
|
||||||
|
'site_subscription_id' => $sub->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res->assertSee($expectedCreateUrl, false);
|
||||||
|
$res->assertDontSee('back%3D', false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user