diff --git a/app/Http/Controllers/Admin/SalesController.php b/app/Http/Controllers/Admin/SalesController.php index 2688188..9dccd13 100644 --- a/app/Http/Controllers/Admin/SalesController.php +++ b/app/Http/Controllers/Admin/SalesController.php @@ -35,7 +35,9 @@ class SalesController extends Controller $search = $request->input('search'); $machineId = $request->input('machine_id'); $paymentType = $request->input('payment_type'); - $status = $request->input('status'); + // 付款狀態預設只看「已完成」:避免客戶把 failed(付款失敗/逾時) 誤會成刷卡失敗。 + // 「所有付款狀態」為明確選項 status=all(非空值,AJAX 才不會當空值丟掉)。 + $status = $request->input('status', 'completed'); $deliveryStatus = $request->input('delivery_status'); $startDate = $request->input('start_date'); $endDate = $request->input('end_date'); @@ -138,7 +140,7 @@ class SalesController extends Controller // 訂單專用過濾器 if ($tab === 'orders') { if ($paymentType) $ordersQuery->where('payment_type', $paymentType); - if ($status) $ordersQuery->where('status', $status); + if ($status && $status !== 'all') $ordersQuery->where('status', $status); // 出貨狀態:唯有付款成功(completed/paid)的單才有出貨結果,需與列表顯示邏輯 (hasDeliveryOutcome) 一致 if ($deliveryStatus !== null && $deliveryStatus !== '') { $ordersQuery->whereIn('status', [Order::STATUS_COMPLETED, 'paid']) @@ -1545,6 +1547,7 @@ class SalesController extends Controller 'pending' => __('Pending'), 'paid' => __('Paid'), 'completed' => __('Completed'), + 'awaiting_pickup' => __('Awaiting Pickup'), 'failed' => __('Failed'), 'abandoned' => __('Unpaid'), 'cancelled' => __('Cancelled'), diff --git a/resources/views/admin/sales/partials/order-detail-panel.blade.php b/resources/views/admin/sales/partials/order-detail-panel.blade.php index 02472c2..43369d3 100644 --- a/resources/views/admin/sales/partials/order-detail-panel.blade.php +++ b/resources/views/admin/sales/partials/order-detail-panel.blade.php @@ -34,6 +34,7 @@ 'pending' => 'pending', 'paid' => 'active', 'completed' => 'active', + 'awaiting_pickup' => 'pending', 'failed' => 'error', 'abandoned' => 'disabled', 'cancelled' => 'disabled', @@ -43,6 +44,7 @@ 'pending' => __('Pending'), 'paid' => __('Paid'), 'completed' => __('Completed'), + 'awaiting_pickup' => __('Awaiting Pickup'), 'failed' => __('Failed'), 'abandoned' => __('Unpaid'), 'cancelled' => __('Cancelled'), diff --git a/resources/views/admin/sales/partials/tab-orders.blade.php b/resources/views/admin/sales/partials/tab-orders.blade.php index ae790e3..beac529 100644 --- a/resources/views/admin/sales/partials/tab-orders.blade.php +++ b/resources/views/admin/sales/partials/tab-orders.blade.php @@ -31,11 +31,14 @@ {{-- 付款狀態 --}}
- + + @@ -325,6 +328,8 @@ 'pending' => ['label' => __('Pending'), 'color' => 'amber'], 'paid' => ['label' => __('Paid'), 'color' => 'emerald'], 'completed' => ['label' => __('Completed'), 'color' => 'emerald'], + 'awaiting_pickup' => ['label' => __('Awaiting Pickup'), 'color' => 'amber'], + 'awaiting_pickup' => ['label' => __('Awaiting Pickup'), 'color' => 'amber'], 'failed' => ['label' => __('Failed'), 'color' => 'rose'], 'abandoned' => ['label' => __('Unpaid'), 'color' => 'slate'], 'cancelled' => ['label' => __('Cancelled'), 'color' => 'slate'],