diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php
index 41c5883..f07a46b 100644
--- a/resources/views/admin/platform_orders/index.blade.php
+++ b/resources/views/admin/platform_orders/index.blade.php
@@ -760,7 +760,10 @@
@forelse($orders as $order)
| {{ $order->id }} |
- {{ $order->order_no }} |
+ @php
+ $orderShowUrl = '/admin/platform-orders/' . $order->id . '?' . \Illuminate\Support\Arr::query(['back' => $selfWithoutBack]);
+ @endphp
+ {{ $order->order_no }} |
@if($order->merchant)
{{ $order->merchant->name }}
diff --git a/tests/Feature/AdminPlatformOrderIndexOrderNoLinkWithBackTest.php b/tests/Feature/AdminPlatformOrderIndexOrderNoLinkWithBackTest.php
index dd85eaf..e5c240c 100644
--- a/tests/Feature/AdminPlatformOrderIndexOrderNoLinkWithBackTest.php
+++ b/tests/Feature/AdminPlatformOrderIndexOrderNoLinkWithBackTest.php
@@ -56,7 +56,7 @@ class AdminPlatformOrderIndexOrderNoLinkWithBackTest extends TestCase
$res = $this->get('/admin/platform-orders?status=pending');
$res->assertOk();
- $expectedBack = urlencode('/admin/platform-orders?status=pending');
- $res->assertSee('/admin/platform-orders/' . $order->id . '?back=' . $expectedBack, false);
+ $expectedBack = \Illuminate\Support\Arr::query(['back' => '/admin/platform-orders?status=pending']);
+ $res->assertSee('/admin/platform-orders/' . $order->id . '?' . $expectedBack, false);
}
}
|