Platform orders index: add lead governance quick links
This commit is contained in:
@@ -67,11 +67,42 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
@if($incomingLeadId > 0)
|
@if($incomingLeadId > 0)
|
||||||
<div class="mt-10 actions">
|
<div class="mt-10">
|
||||||
|
<div class="actions">
|
||||||
<span class="badge">当前线索:#{{ $incomingLeadId }}</span>
|
<span class="badge">当前线索:#{{ $incomingLeadId }}</span>
|
||||||
<span class="muted muted-xs">(已按 lead_id 过滤订单集合)</span>
|
<span class="muted muted-xs">(已按 lead_id 过滤订单集合)</span>
|
||||||
<a class="btn btn-secondary btn-sm" href="{!! $clearLeadUrl !!}">清除线索筛选</a>
|
<a class="btn btn-secondary btn-sm" href="{!! $clearLeadUrl !!}">清除线索筛选</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-10">
|
||||||
|
<div class="muted muted-xs">线索治理入口:</div>
|
||||||
|
@php
|
||||||
|
// 线索治理快捷入口:需要保留 lead_id + 其它业务上下文(merchant/plan/subscription/keyword/back),
|
||||||
|
// 但不应继承 syncable_only/fail_only/page 等“工具型开关”,避免从其它集合切换时产生误判。
|
||||||
|
$buildLeadGovernUrl = function (array $overrides) use ($safeBackForLinks) {
|
||||||
|
return \App\Support\BackUrl::currentPathQuickFilter(
|
||||||
|
['lead_id', 'merchant_id', 'plan_id', 'site_subscription_id', 'keyword'],
|
||||||
|
$overrides,
|
||||||
|
$safeBackForLinks
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
$leadUnpaidUrl = $buildLeadGovernUrl([
|
||||||
|
'payment_status' => 'unpaid',
|
||||||
|
'status' => null,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$leadPaidPendingUrl = $buildLeadGovernUrl([
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'status' => 'pending',
|
||||||
|
]);
|
||||||
|
@endphp
|
||||||
|
<div class="mt-6 actions gap-10">
|
||||||
|
<a class="btn btn-secondary btn-sm" href="{!! $leadUnpaidUrl !!}">查看待支付(该线索)</a>
|
||||||
|
<a class="btn btn-secondary btn-sm" href="{!! $leadPaidPendingUrl !!}">查看待生效(该线索)</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if($currentSubscription && $currentSubscription->id)
|
@if($currentSubscription && $currentSubscription->id)
|
||||||
@@ -163,9 +194,16 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@php
|
@php
|
||||||
// 快捷筛选:尽量保留当前筛选(站点/套餐/订阅ID/back 等),仅覆盖目标筛选字段,并清空 page。
|
// 快捷筛选:尽量保留当前筛选上下文(站点/套餐/订阅ID/keyword/lead_id/back 等),仅覆盖目标筛选字段,并清空 page。
|
||||||
|
// 注意:不保留 syncable_only/fail_only 等“工具型开关”,避免用户从一个集合切到另一个集合时被残留开关影响(导致误判/空结果)。
|
||||||
$buildQuickFilterUrl = function (array $overrides) use ($safeBackForLinks) {
|
$buildQuickFilterUrl = function (array $overrides) use ($safeBackForLinks) {
|
||||||
return \App\Support\BackUrl::currentPathQuickFilter(['merchant_id', 'plan_id', 'site_subscription_id', 'keyword', 'lead_id'], $overrides, $safeBackForLinks);
|
// 快捷筛选:仅保留上下文字段(站点/套餐/订阅ID/keyword/lead_id/安全 back),避免把其它筛选条件叠加导致空结果。
|
||||||
|
// 该构造器内部会强制清空 page,并且不会继承 syncable_only/fail_only 等“工具型开关”。
|
||||||
|
return \App\Support\BackUrl::currentPathQuickFilter(
|
||||||
|
['merchant_id', 'plan_id', 'site_subscription_id', 'keyword', 'lead_id'],
|
||||||
|
$overrides,
|
||||||
|
$safeBackForLinks
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
// “全部”:清空筛选,但保留 back(用于返回来源页)
|
// “全部”:清空筛选,但保留 back(用于返回来源页)
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdminPlatformOrderIndexLeadGovernanceQuickLinksTest 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_index_should_render_lead_governance_quick_links_when_lead_locked(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$url = '/admin/platform-orders?' . Arr::query([
|
||||||
|
'lead_id' => 12,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res = $this->get($url);
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$res->assertSee('线索治理入口:', false);
|
||||||
|
|
||||||
|
$unpaidUrl = '/admin/platform-orders?' . Arr::query([
|
||||||
|
'lead_id' => 12,
|
||||||
|
'payment_status' => 'unpaid',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$paidPendingUrl = '/admin/platform-orders?' . Arr::query([
|
||||||
|
'lead_id' => 12,
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'status' => 'pending',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res->assertSee($unpaidUrl, false);
|
||||||
|
$res->assertSee($paidPendingUrl, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user