chore(admin-ui): dedupe orders show back links and keep context
This commit is contained in:
@@ -7,6 +7,12 @@
|
|||||||
@php
|
@php
|
||||||
$incomingBack = (string) request()->query('back', '');
|
$incomingBack = (string) request()->query('back', '');
|
||||||
$safeBackForLinks = \App\Support\BackUrl::sanitizeForLinks($incomingBack);
|
$safeBackForLinks = \App\Support\BackUrl::sanitizeForLinks($incomingBack);
|
||||||
|
|
||||||
|
// back 参数用于“返回上一页(保留上下文)”,但 back 本身不应再包含 back(避免无限嵌套导致 URL 膨胀)
|
||||||
|
$selfWithoutBack = \App\Support\BackUrl::selfWithoutBack();
|
||||||
|
|
||||||
|
// 去重降噪:仅在没有 incoming back 时,提供“返回订单列表(保留上下文)”入口
|
||||||
|
$ordersIndexUrl = \App\Support\BackUrl::withBack('/admin/orders', $selfWithoutBack);
|
||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
<div class="page-header mb-20" data-page="admin.orders.show">
|
<div class="page-header mb-20" data-page="admin.orders.show">
|
||||||
@@ -17,9 +23,10 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="page-header-actions">
|
<div class="page-header-actions">
|
||||||
@if($safeBackForLinks)
|
@if($safeBackForLinks)
|
||||||
<a class="btn btn-secondary btn-sm" href="{!! $safeBackForLinks !!}">← 返回上一页(保留上下文)</a>
|
<a class="btn btn-secondary btn-sm" href="{!! $safeBackForLinks !!}">返回上一页(保留上下文)</a>
|
||||||
|
@else
|
||||||
|
<a class="btn btn-secondary btn-sm" href="{!! $ordersIndexUrl !!}">返回订单列表(保留上下文)</a>
|
||||||
@endif
|
@endif
|
||||||
<a class="btn btn-secondary btn-sm" href="/admin/orders">返回订单列表</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
104
tests/Feature/AdminOrdersShowBackLinkDedupeTest.php
Normal file
104
tests/Feature/AdminOrdersShowBackLinkDedupeTest.php
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\Merchant;
|
||||||
|
use App\Models\Order;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdminOrdersShowBackLinkDedupeTest 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_show_should_render_only_one_back_entry_when_incoming_back_present(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
|
||||||
|
$order = Order::query()->create([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'user_id' => null,
|
||||||
|
'order_no' => 'O_SHOW_BACK_DEDUPE_0001',
|
||||||
|
'status' => 'pending',
|
||||||
|
'platform' => 'pc',
|
||||||
|
'payment_channel' => 'manual',
|
||||||
|
'payment_status' => 'unpaid',
|
||||||
|
'device_type' => 'pc',
|
||||||
|
'product_amount' => 10,
|
||||||
|
'discount_amount' => 0,
|
||||||
|
'shipping_amount' => 0,
|
||||||
|
'pay_amount' => 10,
|
||||||
|
'buyer_name' => '张三',
|
||||||
|
'buyer_phone' => '13800000000',
|
||||||
|
'buyer_email' => 'buyer@example.com',
|
||||||
|
'remark' => 'test',
|
||||||
|
'paid_at' => null,
|
||||||
|
'shipped_at' => null,
|
||||||
|
'completed_at' => null,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$back = '/admin/orders?' . Arr::query(['status' => 'pending']);
|
||||||
|
|
||||||
|
$res = $this->get('/admin/orders/' . $order->id . '?back=' . urlencode($back));
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$res->assertSee('返回上一页(保留上下文)');
|
||||||
|
$res->assertDontSee('返回订单列表(保留上下文)');
|
||||||
|
$res->assertDontSee('返回订单列表</a>', false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_show_should_render_back_to_orders_index_with_context_when_no_incoming_back(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
|
||||||
|
$order = Order::query()->create([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'user_id' => null,
|
||||||
|
'order_no' => 'O_SHOW_BACK_DEDUPE_0002',
|
||||||
|
'status' => 'pending',
|
||||||
|
'platform' => 'pc',
|
||||||
|
'payment_channel' => 'manual',
|
||||||
|
'payment_status' => 'unpaid',
|
||||||
|
'device_type' => 'pc',
|
||||||
|
'product_amount' => 10,
|
||||||
|
'discount_amount' => 0,
|
||||||
|
'shipping_amount' => 0,
|
||||||
|
'pay_amount' => 10,
|
||||||
|
'buyer_name' => '李四',
|
||||||
|
'buyer_phone' => '13800000001',
|
||||||
|
'buyer_email' => 'buyer2@example.com',
|
||||||
|
'remark' => 'test',
|
||||||
|
'paid_at' => null,
|
||||||
|
'shipped_at' => null,
|
||||||
|
'completed_at' => null,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res = $this->get('/admin/orders/' . $order->id);
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$res->assertSee('返回订单列表(保留上下文)');
|
||||||
|
|
||||||
|
$expectedBack = '/admin/orders/' . $order->id;
|
||||||
|
$expectedIndexUrl = '/admin/orders?' . Arr::query([
|
||||||
|
'back' => $expectedBack,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res->assertSee($expectedIndexUrl, false);
|
||||||
|
$res->assertDontSee('back%3D', false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user