diff --git a/app/Http/Controllers/Admin/SalesController.php b/app/Http/Controllers/Admin/SalesController.php index becc8e2..01f8f24 100644 --- a/app/Http/Controllers/Admin/SalesController.php +++ b/app/Http/Controllers/Admin/SalesController.php @@ -376,7 +376,7 @@ class SalesController extends Controller // 1. 取貨碼列表 (list) if (!$isAjax || $tab === 'list') { // 僅顯示目前帳號可存取機台的取貨碼(機台授權以 machine_user 為準,whereHas 會套用 Machine 的 machine_access 全域 scope) - $query = PickupCode::with(['machine.slots.product', 'creator', 'order']) + $query = PickupCode::with(['machine.slots.product', 'product', 'creator', 'order']) ->whereHas('machine') ->latest(); diff --git a/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php b/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php index 1eb5373..cc35db6 100644 --- a/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php +++ b/resources/views/admin/sales/pickup-codes/partials/tab-list.blade.php @@ -80,7 +80,7 @@
- {{ __('Slot') }}
+ {{ __('Product') }}- {{ $code->slot_no }} - @php - $slotMobile = $code->machine?->slots->where('slot_no', - $code->slot_no)->first(); - $prodMobile = $slotMobile ? ($slotMobile->product?->name ?? __('Empty')) : - __('Empty'); - @endphp - ({{ $prodMobile - }}) + {{ $prodMobile }} + @if($slotMobileLabel) + {{ __('Slot') }}: {{ $slotMobileLabel }} + @endif