Merge branch 'dev' of http://103.248.30.24:3000/kent-logistics/Kent-logistics-Laravel into dev

app/Events/NewChatMessage.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\ChatMessage;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Queue\SerializesModels;
+
+class NewChatMessage implements ShouldBroadcastNow
+{
+    use SerializesModels;
+
+    public $message;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(ChatMessage $message)
+    {
+        // Also load sender polymorphic relationship
+        $message->load('sender');
+
+        $this->message = $message;
+    }
+
+    /**
+     * The channel the event should broadcast on.
+     */
+    public function broadcastOn()
+    {
+      return [
+        new PrivateChannel('ticket.' . $this->message->ticket_id),
+        new PrivateChannel('admin.chat') // 👈 ADD THIS
+    ];
+
+    }
+
+    /**
+     * Data sent to frontend (Blade + Flutter)
+     */
+    public function broadcastWith()
+    {   
+        \Log::info('APP_URL USED IN EVENT', [
+    'url' => config('app.url'),
+]);
+
+        \Log::info("DEBUG: NewChatMessage broadcasting on channel ticket.".$this->message->ticket_id);
+
+        \Log::info("EVENT BROADCAST FIRED", [
+            'channel' => 'ticket.'.$this->message->ticket_id,
+            'sender_type' => $this->message->sender_type,
+            'sender_id' => $this->message->sender_id,
+        ]);
+
+
+        return [
+            'id'          => $this->message->id,
+            'ticket_id'   => $this->message->ticket_id,
+            'sender_id'   => $this->message->sender_id,
+            'sender_type' => $this->message->sender_type,
+            'message'     => $this->message->message,
+            'client_id' => $this->message->client_id,
+
+            // ✅ relative path only
+            'file_path'   => $this->message->file_path ?? null,
+            'file_type'   => $this->message->file_type ?? null,
+
+            'sender' => [
+                'id'       => $this->message->sender->id,
+                'name'     => $this->getSenderName(),
+                'is_admin' => $this->message->sender_type === \App\Models\Admin::class,
+            ],
+
+            'created_at'  => $this->message->created_at->toDateTimeString(),
+        ];
+
+    }
+
+    /**
+     * Helper to extract sender name
+     */
+    private function getSenderName()
+    {
+        $sender = $this->message->sender;
+
+        // User has customer_name (in your app)
+        if ($this->message->sender_type === \App\Models\User::class) {
+            return $sender->customer_name ?? $sender->name ?? "User";
+        }
+
+        // Admin model has ->name
+        return $sender->name ?? "Admin";
+    }
+
+    public function broadcastAs()
+    {
+        return 'NewChatMessage';
+    }
+
+}

app/Exports/OrdersExport.php

@@ -6,10 +6,11 @@ use App\Models\Order;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\WithHeadings;
+use Carbon\Carbon;
 
 class OrdersExport implements FromCollection, WithHeadings
 {
-    protected $request;
+    protected Request $request;
 
     public function __construct(Request $request)
     {
@@ -18,61 +19,99 @@ class OrdersExport implements FromCollection, WithHeadings
 
     private function buildQuery()
     {
-        $query = Order::with(['markList', 'invoice', 'shipments']);
+        $query = Order::query()->with([
+            'markList',
+            'invoice',
+            'shipments',
+        ]);
 
+        // SEARCH
         if ($this->request->filled('search')) {
-            $search = $this->request->search;
+            $search = trim($this->request->search);
-            $query->where(function($q) use ($search) {
+
-                $q->where('order_id', 'like', "%{$search}%")
+            $query->where(function ($q) use ($search) {
-                  ->orWhereHas('markList', function($q2) use ($search) {
+                $q->where('orders.order_id', 'like', "%{$search}%")
+                  ->orWhereHas('markList', function ($q2) use ($search) {
                       $q2->where('company_name', 'like', "%{$search}%")
-                         ->orWhere('customer_id', 'like', "%{$search}%");
+                         ->orWhere('customer_id', 'like', "%{$search}%")
+                         ->orWhere('origin', 'like', "%{$search}%")
+                         ->orWhere('destination', 'like', "%{$search}%");
                   })
-                  ->orWhereHas('invoice', function($q3) use ($search) {
+                  ->orWhereHas('invoice', function ($q3) use ($search) {
                       $q3->where('invoice_number', 'like', "%{$search}%");
+                  })
+                  ->orWhereHas('shipments', function ($q4) use ($search) {
+                      // ✅ FIXED
+                      $q4->where('shipments.shipment_id', 'like', "%{$search}%");
                   });
             });
         }
 
+        // INVOICE STATUS
+        // INVOICE STATUS (FIXED)
         if ($this->request->filled('status')) {
-            $query->whereHas('invoice', function($q) {
+            $query->where(function ($q) {
-                $q->where('status', $this->request->status);
+                $q->whereHas('invoice', function ($q2) {
+                    $q2->where('status', $this->request->status);
+                })
+                ->orWhereDoesntHave('invoice');
             });
         }
 
+
+        // SHIPMENT STATUS (FIXED)
         if ($this->request->filled('shipment')) {
-            $query->whereHas('shipments', function($q) {
+            $query->where(function ($q) {
-                $q->where('status', $this->request->shipment);
+                $q->whereHas('shipments', function ($q2) {
+                    $q2->where('status', $this->request->shipment);
+                })
+                ->orWhereDoesntHave('shipments');
             });
         }
 
-        return $query->latest('id');
+
+        // DATE RANGE
+        if ($this->request->filled('from_date')) {
+            $query->whereDate('orders.created_at', '>=', $this->request->from_date);
+        }
+
+        if ($this->request->filled('to_date')) {
+            $query->whereDate('orders.created_at', '<=', $this->request->to_date);
+        }
+
+        return $query->latest('orders.id');
     }
 
     public function collection()
     {
-        $orders = $this->buildQuery()->get();
+        return $this->buildQuery()->get()->map(function ($order) {
 
-        // Map to simple array rows suitable for Excel
+            $mark     = $order->markList;
-        return $orders->map(function($order) {
+            $invoice  = $order->invoice;
-            $mark = $order->markList;
+            $shipment = $order->shipments->first();
-            $invoice = $order->invoice;
-            $shipment = $order->shipments->first() ?? null;
 
             return [
-                'Order ID' => $order->order_id,
+                'Order ID'        => $order->order_id ?? '-',
-                'Shipment ID' => $shipment->shipment_id ?? '-',
+                'Shipment ID'     => $shipment?->shipment_id ?? '-',
-                'Customer ID' => $mark->customer_id ?? '-',
+                'Customer ID'     => $mark?->customer_id ?? '-',
-                'Company' => $mark->company_name ?? '-',
+                'Company'         => $mark?->company_name ?? '-',
-                'Origin' => $mark->origin ?? $order->origin ?? '-',
+                'Origin'          => $mark?->origin ?? $order->origin ?? '-',
-                'Destination' => $mark->destination ?? $order->destination ?? '-',
+                'Destination'     => $mark?->destination ?? $order->destination ?? '-',
-                'Order Date' => $order->created_at ? $order->created_at->format('d-m-Y') : '-',
+                'Order Date'      => $order->created_at
-                'Invoice No' => $invoice->invoice_number ?? '-',
+                                      ? $order->created_at->format('d-m-Y')
-                'Invoice Date' => $invoice?->invoice_date ? \Carbon\Carbon::parse($invoice->invoice_date)->format('d-m-Y') : '-',
+                                      : '-',
-                'Amount' => $invoice?->final_amount ? number_format($invoice->final_amount, 2) : '-',
+                'Invoice No'      => $invoice?->invoice_number ?? '-',
-                'Amount + GST' => $invoice?->final_amount_with_gst ? number_format($invoice->final_amount_with_gst, 2) : '-',
+                'Invoice Date'    => $invoice?->invoice_date
-                'Invoice Status' => $invoice->status ? ucfirst($invoice->status) : 'Pending',
+                                      ? Carbon::parse($invoice->invoice_date)->format('d-m-Y')
-                'Shipment Status' => $shipment?->status ? ucfirst(str_replace('_', ' ', $shipment->status)) : 'Pending',
+                                      : '-',
+                'Amount'          => $invoice?->final_amount !== null
+                                      ? number_format($invoice->final_amount, 2)
+                                      : '0.00',
+                'Amount + GST'    => $invoice?->final_amount_with_gst !== null
+                                      ? number_format($invoice->final_amount_with_gst, 2)
+                                      : '0.00',
+                'Invoice Status'  => ucfirst($invoice?->status ?? 'pending'),
+                'Shipment Status' => ucfirst(str_replace('_', ' ', $shipment?->status ?? 'pending')),
             ];
         });
     }

app/Http/Controllers/Admin/AdminChatController.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Models\SupportTicket;
+use App\Models\ChatMessage;
+use App\Events\NewChatMessage;
+
+class AdminChatController extends Controller
+{
+    /**
+     * Page 1: List all active user chats
+     */
+    public function index()
+{
+    $tickets = SupportTicket::with('user')
+        ->withCount([
+            'messages as unread_count' => function ($q) {
+                $q->where('sender_type', \App\Models\User::class)
+                  ->where('read_by_admin', false);
+            }
+        ])
+        ->orderBy('updated_at', 'desc')
+        ->get();
+
+    return view('admin.chat_support', compact('tickets'));
+}
+
+
+    /**
+     * Page 2: Open chat window for a specific user
+     */
+    public function openChat($ticketId)
+{
+    $ticket = SupportTicket::with('user')->findOrFail($ticketId);
+
+    // ✅ MARK USER MESSAGES AS READ FOR ADMIN
+    ChatMessage::where('ticket_id', $ticketId)
+        ->where('sender_type', \App\Models\User::class)
+        ->where('read_by_admin', false)
+        ->update(['read_by_admin' => true]);
+
+    $messages = ChatMessage::where('ticket_id', $ticketId)
+        ->orderBy('created_at', 'asc')
+        ->with('sender')
+        ->get();
+
+    return view('admin.chat_window', compact('ticket', 'messages'));
+}
+
+
+    /**
+     * Admin sends a message to the user
+     */
+    public function sendMessage(Request $request, $ticketId)
+    {
+        $request->validate([
+            'message' => 'nullable|string',
+            'file'    => 'nullable|file|max:20480', // 20 MB
+        ]);
+
+        $ticket = SupportTicket::findOrFail($ticketId);
+        $admin  = auth('admin')->user();
+
+        $data = [
+            'ticket_id'   => $ticketId,
+            'sender_id'   => $admin->id,
+            'sender_type' => \App\Models\Admin::class,
+            'message'     => $request->message,
+
+            'read_by_admin' => true,
+            'read_by_user'  => false,
+        ];
+
+        // File Upload
+        if ($request->hasFile('file')) {
+            $path = $request->file('file')->store('chat', 'public');
+            $data['file_path'] = $path;
+            $data['file_type'] = $request->file('file')->getMimeType();
+        }
+
+        // Save message
+        $message = ChatMessage::create($data);
+        $message->load('sender');
+
+                \Log::info("DEBUG: ChatController sendMessage called", [
+            'ticket_id' => $ticketId,
+            'payload' => $request->all()
+        ]);
+
+        // Broadcast real-time
+        broadcast(new NewChatMessage($message));
+
+        \Log::info("DEBUG: ChatController sendMessage called 79", [
+            'ticket_id' => $ticketId,
+            'payload' => $request->all()
+        ]);
+        return response()->json([
+            'success' => true,
+            'message' => $message
+        ]);
+    }
+}

app/Http/Controllers/Admin/AdminInvoiceController.php

@@ -183,6 +183,8 @@ class AdminInvoiceController extends Controller
         // Mark as 'paid' if GST-inclusive total is cleared
         if ($newPaid >= $invoice->final_amount_with_gst) {
             $invoice->update(['status' => 'paid']);
+
+            $this->generateInvoicePDF($invoice);
         }
 
         return response()->json([
@@ -210,6 +212,8 @@ class AdminInvoiceController extends Controller
         // Update status if not fully paid anymore
         if ($remaining > 0 && $invoice->status === "paid") {
             $invoice->update(['status' => 'pending']);
+
+            $this->generateInvoicePDF($invoice);
         }
     
         return response()->json([

app/Http/Controllers/Admin/AdminOrderController.php

@@ -365,6 +365,128 @@ class AdminOrderController extends Controller
     }
 
 
+    public function see($id)
+    {
+        $order = Order::with([
+            'markList',
+            'items',
+            'invoice.items',
+            'shipments' => function ($q) use ($id) {
+                $q->whereHas('orders', function ($oq) use ($id) {
+                    $oq->where('orders.id', $id)
+                    ->whereNull('orders.deleted_at');
+                })->with([
+                    'orders' => function ($oq) use ($id) {
+                        $oq->where('orders.id', $id)
+                        ->whereNull('orders.deleted_at')
+                        ->with('items');
+                    }
+                ]);
+            }
+        ])->findOrFail($id);
+
+        /* ---------------- ORDER DATA ---------------- */
+        $orderData = [
+            'order_id' => $order->order_id,
+            'status'   => $order->status,
+            'totals'   => [
+                'ctn'      => $order->ctn,
+                'qty'      => $order->qty,
+                'ttl_qty'  => $order->ttl_qty,
+                'cbm'      => $order->cbm,
+                'ttl_cbm'  => $order->ttl_cbm,
+                'kg'       => $order->kg,
+                'ttl_kg'   => $order->ttl_kg,
+                'amount'   => $order->ttl_amount,
+            ],
+            'items' => $order->items,
+        ];
+
+        /* ---------------- SHIPMENTS DATA ---------------- */
+        $shipmentsData = [];
+
+        foreach ($order->shipments as $shipment) {
+
+            $shipmentOrders = [];
+            $totals = [
+                'ctn' => 0, 'qty' => 0, 'ttl_qty' => 0,
+                'cbm' => 0, 'ttl_cbm' => 0,
+                'kg' => 0, 'ttl_kg' => 0,
+                'amount' => 0,
+            ];
+
+            foreach ($shipment->orders as $shipOrder) {
+                foreach ($shipOrder->items as $item) {
+
+                    $shipmentOrders[] = [
+                        'order_id'    => $shipOrder->order_id,
+                        'origin'      => $shipOrder->origin,
+                        'destination' => $shipOrder->destination,
+                        'description' => $item->description,
+                        'ctn'         => $item->ctn,
+                        'qty'         => $item->qty,
+                        'ttl_qty'     => $item->ttl_qty,
+                        'amount'      => $item->ttl_amount,
+                    ];
+
+                    $totals['ctn']      += $item->ctn;
+                    $totals['qty']      += $item->qty;
+                    $totals['ttl_qty']  += $item->ttl_qty;
+                    $totals['cbm']      += $item->cbm;
+                    $totals['ttl_cbm']  += $item->ttl_cbm;
+                    $totals['kg']       += $item->kg;
+                    $totals['ttl_kg']   += $item->ttl_kg;
+                    $totals['amount']   += $item->ttl_amount;
+                }
+            }
+
+            if (empty($shipmentOrders)) {
+                continue;
+            }
+
+            $shipmentsData[] = [
+                'shipment_id'  => $shipment->shipment_id,
+                'status'       => $shipment->status,
+                'date'         => $shipment->shipment_date,
+                'total_orders' => 1,
+                'orders'       => $shipmentOrders,
+                'totals'       => $totals,
+            ];
+        }
+
+        /* ---------------- INVOICE DATA ---------------- */
+        $invoiceData = null;
+        if ($order->invoice) {
+            $invoice = $order->invoice;
+            $invoiceData = [
+                'invoice_no' => $invoice->invoice_number,
+                'status'     => $invoice->status,
+                'invoice_date' => $invoice->invoice_date,
+                'due_date'     => $invoice->due_date,
+                'customer' => [
+                    'name'    => $invoice->customer_name,
+                    'mobile'  => $invoice->customer_mobile,
+                    'email'   => $invoice->customer_email,
+                    'address' => $invoice->customer_address,
+                    'pincode' => $invoice->pincode,
+                ],
+                'items' => $invoice->items,
+                'summary' => [
+                    'amount' => $invoice->final_amount,
+                    'cgst'   => 0,
+                    'sgst'   => 0,
+                    'total'  => $invoice->final_amount_with_gst,
+                ],
+            ];
+        }
+
+        return view('admin.see_order', compact(
+            'order',
+            'orderData',
+            'shipmentsData',
+            'invoiceData'
+        ));
+    }
 
 
     public function resetTemp()
@@ -375,89 +497,143 @@ class AdminOrderController extends Controller
                         ->with('success', 'Order reset successfully.');
     }
 
-    public function orderShow()
+        public function orderShow()
-    {
+        {
-        $orders = Order::with([
+            $orders = Order::with([
-            'markList',     // company, customer, origin, destination, date
+                'markList',     // company, customer, origin, destination, date
-            'shipments',    // shipment_id, shipment_date, status
+                'shipments',    // shipment_id, shipment_date, status
-            'invoice'       // invoice number, dates, amounts, status
+                'invoice'       // invoice number, dates, amounts, status
-        ])
+            ])
-        ->latest('id') // show latest orders first
+            ->latest('id') // show latest orders first
-        ->get();
+            ->get();
 
-        return view('admin.orders', compact('orders'));
+            return view('admin.orders', compact('orders'));
-    }
+        }
         
-    // inside AdminOrderController
+        // inside AdminOrderController
 
     private function buildOrdersQueryFromRequest(Request $request)
-    {
+        {
-        $query = Order::with(['markList', 'invoice', 'shipments']);
+            $query = Order::query()
+                ->with(['markList', 'invoice', 'shipments']);
 
-        // Search across order_id, markList.company_name, markList.customer_id, invoice.invoice_number
+            /* ----------------------------------
-        if ($request->filled('search')) {
+            | SEARCH FILTER
-            $search = $request->search;
+            |----------------------------------*/
-            $query->where(function($q) use ($search) {
+            if ($request->filled('search')) {
-                $q->where('order_id', 'like', "%{$search}%")
+                $search = trim($request->search);
-                ->orWhereHas('markList', function($q2) use ($search) {
+
-                    $q2->where('company_name', 'like', "%{$search}%")
+                $query->where(function ($q) use ($search) {
-                        ->orWhere('customer_id', 'like', "%{$search}%");
+                    $q->where('orders.order_id', 'like', "%{$search}%")
-                })
+
-                ->orWhereHas('invoice', function($q3) use ($search) {
+                    ->orWhereHas('markList', function ($q2) use ($search) {
-                    $q3->where('invoice_number', 'like', "%{$search}%");
+                        $q2->where('company_name', 'like', "%{$search}%")
+                            ->orWhere('customer_id', 'like', "%{$search}%")
+                            ->orWhere('origin', 'like', "%{$search}%")
+                            ->orWhere('destination', 'like', "%{$search}%");
+                    })
+
+                    ->orWhereHas('invoice', function ($q3) use ($search) {
+                        $q3->where('invoice_number', 'like', "%{$search}%");
+                    })
+
+                    ->orWhereHas('shipments', function ($q4) use ($search) {
+                        // ✅ VERY IMPORTANT: table name added
+                        $q4->where('shipments.shipment_id', 'like', "%{$search}%");
+                    });
                 });
-            });
+            }
+
+            /* ----------------------------------
+            | INVOICE STATUS FILTER
+            |----------------------------------*/
+            if ($request->filled('status')) {
+                $query->where(function ($q) use ($request) {
+                    $q->whereHas('invoice', function ($q2) use ($request) {
+                        $q2->where('status', $request->status);
+                    })
+                    ->orWhereDoesntHave('invoice');
+                });
+            }
+
+            /* ----------------------------------
+            | SHIPMENT STATUS FILTER
+            |----------------------------------*/
+            if ($request->filled('shipment')) {
+                $query->where(function ($q) use ($request) {
+                    $q->whereHas('shipments', function ($q2) use ($request) {
+                        $q2->where('status', $request->shipment);
+                    })
+                    ->orWhereDoesntHave('shipments');
+                });
+            }
+
+            /* ----------------------------------
+            | DATE RANGE FILTER (🔥 FIXED)
+            |----------------------------------*/
+            if ($request->filled('from_date')) {
+                $query->whereDate('orders.created_at', '>=', $request->from_date);
+            }
+
+            if ($request->filled('to_date')) {
+                $query->whereDate('orders.created_at', '<=', $request->to_date);
+            }
+
+            return $query->latest('orders.id');
         }
 
-        // Invoice status filter
-        if ($request->filled('status')) {
-            $query->whereHas('invoice', function($q) use ($request) {
-                $q->where('status', $request->status);
-            });
-        }
 
-        // Shipment status filter
-        if ($request->filled('shipment')) {
-            $query->whereHas('shipments', function($q) use ($request) {
-                $q->where('status', $request->shipment);
-            });
-        }
 
-        // optional ordering
-        $query->latest('id');
 
-        return $query;
+        public function downloadPdf(Request $request)
-    }
+        {
+            // Build same filtered query used for table
+            // $query = $this->buildOrdersQueryFromRequest($request);
 
-    public function downloadPdf(Request $request)
+            // $orders = $query->get();
-    {
-        // Build same filtered query used for table
-        $query = $this->buildOrdersQueryFromRequest($request);
 
-        $orders = $query->get();
+            // // optional: pass filters to view for header
+            // $filters = [
+            //     'search' => $request->search ?? null,
+            //     'status' => $request->status ?? null,
+            //     'shipment' => $request->shipment ?? null,
+            // ];
+
+            // $pdf = PDF::loadView('admin.orders.pdf', compact('orders', 'filters'))
+            //         ->setPaper('a4', 'landscape'); // adjust if needed
+
+            // $fileName = 'orders-report'
+            //         . ($filters['status'] ? "-{$filters['status']}" : '')
+            //         . '-' . date('Y-m-d') . '.pdf';
+
+            // return $pdf->download($fileName);
+            $orders = $this->buildOrdersQueryFromRequest($request)->get();
 
-        // optional: pass filters to view for header
         $filters = [
-            'search' => $request->search ?? null,
+            'search'   => $request->search,
-            'status' => $request->status ?? null,
+            'status'   => $request->status,
-            'shipment' => $request->shipment ?? null,
+            'shipment' => $request->shipment,
+            'from'     => $request->from_date,
+            'to'       => $request->to_date,
         ];
 
         $pdf = PDF::loadView('admin.orders.pdf', compact('orders', 'filters'))
-                ->setPaper('a4', 'landscape'); // adjust if needed
+                ->setPaper('a4', 'landscape');
 
-        $fileName = 'orders-report'
+        return $pdf->download(
-                . ($filters['status'] ? "-{$filters['status']}" : '')
+            'orders-report-' . now()->format('Y-m-d') . '.pdf'
-                . '-' . date('Y-m-d') . '.pdf';
+        );
+        }
 
-        return $pdf->download($fileName);
+        public function downloadExcel(Request $request)
-    }
+        {
-
+            // pass request to OrdersExport which will build Filtered query internally
-    public function downloadExcel(Request $request)
+            // return Excel::download(new OrdersExport($request), 'orders-report-' . date('Y-m-d') . '.xlsx');
-    {
+            return Excel::download(
-        // pass request to OrdersExport which will build Filtered query internally
+            new OrdersExport($request),
-        return Excel::download(new OrdersExport($request), 'orders-report-' . date('Y-m-d') . '.xlsx');
+            'orders-report-' . now()->format('Y-m-d') . '.xlsx'
-    }
+        );
+        }
 
 
     public function addTempItem(Request $request)

app/Http/Controllers/Admin/ShipmentController.php

@@ -224,5 +224,81 @@ class ShipmentController extends Controller
 
         return view('admin.view_shipment', compact('shipment', 'dummyData'));
     }
+    // App\Models\Shipment.php
+
+public function orders()
+{
+    return $this->belongsToMany(\App\Models\Order::class, 'shipment_items', 'shipment_id', 'order_id');
+}
+
+public function removeOrder(Shipment $shipment, Order $order)
+{
+    // Remove row from pivot table shipment_items
+    ShipmentItem::where('shipment_id', $shipment->id)
+        ->where('order_id', $order->id)
+        ->delete();                                     // removes link shipment <-> order [web:41][web:45]
+
+    // Recalculate totals on this shipment (optional but recommended)
+    $orders = Order::whereIn(
+        'id',
+        ShipmentItem::where('shipment_id', $shipment->id)->pluck('order_id')
+    )->get();
+
+    $shipment->total_ctn     = $orders->sum('ctn');
+    $shipment->total_qty     = $orders->sum('qty');
+    $shipment->total_ttl_qty = $orders->sum('ttl_qty');
+    $shipment->total_cbm     = $orders->sum('cbm');
+    $shipment->total_ttl_cbm = $orders->sum('ttl_cbm');
+    $shipment->total_kg      = $orders->sum('kg');
+    $shipment->total_ttl_kg  = $orders->sum('ttl_kg');
+    $shipment->total_amount  = $orders->sum('ttl_amount');
+    $shipment->save();
+
+    // Redirect back to preview page where your blade is loaded
+    return redirect()
+        ->route('admin.shipments.dummy', $shipment->id)
+        ->with('success', 'Order removed from shipment successfully.');
+}
+
+public function addOrders(Request $request, Shipment $shipment)
+{
+    $request->validate([
+        'order_ids' => 'required|array|min:1',
+    ]);
+
+    // फक्त न वापरलेले orders घ्या
+    $orders = Order::whereIn('id', $request->order_ids)->get();
+
+    foreach ($orders as $order) {
+        // pivot मध्ये insert
+        ShipmentItem::create([
+            'shipment_id'      => $shipment->id,
+            'order_id'         => $order->id,
+            'order_ctn'        => $order->ctn,
+            'order_qty'        => $order->qty,
+            'order_ttl_qty'    => $order->ttl_qty,
+            'order_ttl_amount' => $order->ttl_amount,
+            'order_ttl_kg'     => $order->ttl_kg,
+        ]);
+    }
+
+    // totals 
+    $orderIds = ShipmentItem::where('shipment_id', $shipment->id)->pluck('order_id');
+    $allOrders = Order::whereIn('id', $orderIds)->get();
+
+    $shipment->total_ctn     = $allOrders->sum('ctn');
+    $shipment->total_qty     = $allOrders->sum('qty');
+    $shipment->total_ttl_qty = $allOrders->sum('ttl_qty');
+    $shipment->total_cbm     = $allOrders->sum('cbm');
+    $shipment->total_ttl_cbm = $allOrders->sum('ttl_cbm');
+    $shipment->total_kg      = $allOrders->sum('kg');
+    $shipment->total_ttl_kg  = $allOrders->sum('ttl_kg');
+    $shipment->total_amount  = $allOrders->sum('ttl_amount');
+    $shipment->save();
+
+    return redirect()
+        ->route('admin.shipments.dummy', $shipment->id)
+        ->with('success', 'Orders added to shipment successfully.');
+}
 
 }

app/Http/Controllers/UserAuthController.php

@@ -6,76 +6,48 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use PHPOpenSourceSaver\JWTAuth\Facades\JWTAuth;
 use App\Models\User;
+use Illuminate\Support\Facades\Log;
 
 class UserAuthController extends Controller
 {
 
-    public function refreshToken()
+public function refreshToken()
-    {
+{
-        \Log::info('🔄 refreshToken() called');
+    Log::info('🔄 [JWT-REFRESH] called');
 
-        try {
+    try {
-            // Get current token
+        $newToken = JWTAuth::parseToken()->refresh();
-            $currentToken = JWTAuth::getToken();
 
-            if (!$currentToken) {
+        Log::info('✅ [JWT-REFRESH] Token refreshed');
-                \Log::warning('⚠ No token provided in refreshToken()');
-                return response()->json([
-                    'success' => false,
-                    'message' => 'Token not provided',
-                ], 401);
-            }
 
-            \Log::info('📥 Current Token:', ['token' => (string) $currentToken]);
+        return response()->json([
+            'success' => true,
+            'token' => $newToken,
+        ]);
 
-            // Try refreshing token
+    } catch (\PHPOpenSourceSaver\JWTAuth\Exceptions\TokenExpiredException $e) {
-            $newToken = JWTAuth::refresh($currentToken);
+        Log::warning('⛔ [JWT-REFRESH] Refresh TTL expired');
 
-            \Log::info('✅ Token refreshed successfully', ['new_token' => $newToken]);
+        return response()->json([
+            'success' => false,
+            'message' => 'Refresh expired. Please login again.',
+        ], 401);
 
-            return response()->json([
+    } catch (\Exception $e) {
-                'success' => true,
+        Log::error('🔥 [JWT-REFRESH] Exception', [
-                'token' => $newToken,
+            'error' => $e->getMessage(),
-            ]);
+        ]);
 
-        } catch (\Tymon\JWTAuth\Exceptions\TokenExpiredException $e) {
+        return response()->json([
-            \Log::error('❌ TokenExpiredException in refreshToken()', [
+            'success' => false,
-                'message' => $e->getMessage(),
+            'message' => 'Unable to refresh token.',
-            ]);
+        ], 401);
-            return response()->json([
-                'success' => false,
-                'message' => 'Token expired, cannot refresh.',
-            ], 401);
-
-        } catch (\Tymon\JWTAuth\Exceptions\TokenInvalidException $e) {
-            \Log::error('❌ TokenInvalidException in refreshToken()', [
-                'message' => $e->getMessage(),
-            ]);
-            return response()->json([
-                'success' => false,
-                'message' => 'Invalid token.',
-            ], 401);
-
-        } catch (\Tymon\JWTAuth\Exceptions\JWTException $e) {
-            \Log::error('❌ JWTException in refreshToken()', [
-                'message' => $e->getMessage(),
-            ]);
-            return response()->json([
-                'success' => false,
-                'message' => 'Could not refresh token.',
-            ], 401);
-
-        } catch (\Exception $e) {
-            \Log::error('❌ General Exception in refreshToken()', [
-                'message' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-            ]);
-            return response()->json([
-                'success' => false,
-                'message' => 'Unexpected error while refreshing token.',
-            ], 500);
-        }
     }
+}
+
+
+
+
 
     /**
      * User Login

app/Http/Controllers/user/ChatController.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Models\SupportTicket;
+use App\Models\ChatMessage;
+use App\Events\NewChatMessage;
+
+class ChatController extends Controller
+{
+    /**
+     * Start chat or return existing ticket for this user
+     */
+    public function startChat()
+    {
+        // One chat ticket per user
+        $ticket = SupportTicket::firstOrCreate([
+            'user_id' => auth()->id(),
+        ]);
+
+        return response()->json([
+            'success' => true,
+            'ticket'  => $ticket
+        ]);
+    }
+
+    /**
+     * Load all messages for this ticket
+     */
+    public function getMessages($ticketId)
+    {
+        // Ensure this ticket belongs to the logged-in user
+        $ticket = SupportTicket::where('id', $ticketId)
+            ->where('user_id', auth()->id())
+            ->firstOrFail();
+
+        $messages = ChatMessage::where('ticket_id', $ticketId)
+            ->orderBy('created_at', 'asc')
+            ->with('sender')
+            ->get();
+
+        return response()->json([
+            'success'  => true,
+            'messages' => $messages
+        ]);
+    }
+
+    /**
+     * Send text or file message from user → admin/staff
+     */
+    public function sendMessage(Request $request, $ticketId)
+    {
+        $request->validate([
+            'message' => 'nullable|string',
+            'file'    => 'nullable|file|max:20480', // 20MB limit
+        ]);
+
+        // Validate ticket ownership
+        $ticket = SupportTicket::where('id', $ticketId)
+            ->where('user_id', auth()->id())
+            ->firstOrFail();
+
+        $data = [
+            'ticket_id'   => $ticketId,
+            'sender_id'   => auth()->id(),
+            'sender_type' => \App\Models\User::class,
+            'message'     => $request->message,
+             'client_id'   => $request->client_id, // ✅ ADD
+            'read_by_admin' => false,
+            'read_by_user'  => true,
+        ];
+
+        // Handle file upload
+        if ($request->hasFile('file')) {
+            $path = $request->file('file')->store('chat', 'public');
+            $data['file_path'] = $path;
+            $data['file_type'] = $request->file('file')->getMimeType();
+        }
+
+        // Save message
+        $message = ChatMessage::create($data);
+
+        // Load sender info for broadcast
+        $message->load('sender');
+
+        // Fire real-time event
+        broadcast(new NewChatMessage($message));
+
+        return response()->json([
+            'success' => true,
+            'message' => $message
+        ]);
+    }
+}

app/Http/Middleware/JwtRefreshMiddleware.php

@@ -12,6 +12,7 @@ class JwtRefreshMiddleware
 {
     public function handle($request, Closure $next)
     {   
+
         try {
             JWTAuth::parseToken()->authenticate();
         } catch (TokenExpiredException $e) {

app/Models/ChatMessage.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class ChatMessage extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+    'ticket_id',
+    'sender_id',
+    'sender_type',
+    'message',
+    'file_path',
+    'file_type',
+    'read_by_admin',
+    'read_by_user',
+    'client_id',
+];
+
+
+    /**
+     * The ticket this message belongs to.
+     */
+    public function ticket()
+    {
+        return $this->belongsTo(SupportTicket::class, 'ticket_id');
+    }
+
+    /**
+     * Polymorphic sender (User or Admin)
+     */
+    public function sender()
+    {
+        return $this->morphTo();
+    }
+}

app/Models/SupportTicket.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class SupportTicket extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'user_id',
+        'status',
+    ];
+
+    /**
+     * The user (customer) who owns this ticket.
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /**
+     * All chat messages for this ticket.
+     */
+    public function messages()
+    {
+        return $this->hasMany(ChatMessage::class, 'ticket_id')->orderBy('created_at', 'asc');
+    }
+}

app/Providers/BroadcastServiceProvider.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
+
+class BroadcastServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Broadcast::routes([
+            'middleware' => ['web'],
+        ]);
+
+        // 👇 FORCE admin guard for broadcasting
+        Auth::shouldUse('admin');
+
+        require base_path('routes/channels.php');
+    }
+}

bootstrap/app.php

@@ -6,13 +6,18 @@ use Illuminate\Foundation\Configuration\Middleware;
 
 return Application::configure(basePath: dirname(__DIR__))
     ->withRouting(
-        web: __DIR__.'/../routes/web.php',
+        web: [
+            __DIR__.'/../routes/web.php',
+            __DIR__.'/../routes/channels.php',
+        ],
+        api: __DIR__.'/../routes/api.php',
         commands: __DIR__.'/../routes/console.php',
         health: '/up',
     )
-    ->withMiddleware(function (Middleware $middleware): void {
+    ->withMiddleware(function (Middleware $middleware) {
         //
     })
-    ->withExceptions(function (Exceptions $exceptions): void {
+    ->withExceptions(function (Exceptions $exceptions) {
         //
-    })->create();
+    })
+    ->create();

bootstrap/providers.php

@@ -4,4 +4,6 @@ return [
     App\Providers\AppServiceProvider::class,
     App\Providers\RouteServiceProvider::class,
     App\Providers\AuthServiceProvider::class,
+    App\Providers\BroadcastServiceProvider::class,
+
 ];

composer.json

@@ -9,8 +9,9 @@
         "php": "^8.2",
         "barryvdh/laravel-dompdf": "^3.1",
         "laravel/framework": "^12.0",
+        "laravel/reverb": "^1.6",
         "laravel/tinker": "^2.10.1",
-        "maatwebsite/excel": "^1.1",
+        "maatwebsite/excel": "^3.1",
         "mpdf/mpdf": "^8.2",
         "php-open-source-saver/jwt-auth": "2.8",
         "spatie/laravel-permission": "^6.23"

config/auth.php

@@ -90,6 +90,8 @@ return [
             'model' => App\Models\Staff::class,
         ],
         
+
+
     ],
 
     /*

config/broadcasting.php

@@ -0,0 +1,31 @@
+<?php
+
+return [
+
+    'default' => env('BROADCAST_DRIVER', 'null'),
+
+    'connections' => [
+
+            'reverb' => [
+                'driver' => 'reverb',
+                'key' => env('REVERB_APP_KEY'),
+                'secret' => env('REVERB_APP_SECRET'),
+                'app_id' => env('REVERB_APP_ID'),
+                'options' => [
+                    'host' => env('REVERB_HOST'),
+                    'port' => env('REVERB_PORT'),
+                    'scheme' => env('REVERB_SCHEME'),
+                    'useTLS' => false,
+                ],
+            ],
+
+
+        'log' => [
+            'driver' => 'log',
+        ],
+
+        'null' => [
+            'driver' => 'null',
+        ],
+    ],
+];

config/jwt.php

@@ -89,7 +89,7 @@ return [
     |
     */
 
-    'ttl' => (int) env('JWT_TTL', 60),
+    'ttl' => (int) env('JWT_TTL', 15),
 
     /*
     |--------------------------------------------------------------------------
@@ -108,7 +108,7 @@ return [
     |
     */
 
-    'refresh_ttl' => (int) env('JWT_REFRESH_TTL', 20160),
+    'refresh_ttl' => (int) env('JWT_REFRESH_TTL', 60),
 
     /*
     |--------------------------------------------------------------------------

config/reverb.php

@@ -0,0 +1,96 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Reverb Server
+    |--------------------------------------------------------------------------
+    */
+
+    'default' => env('REVERB_SERVER', 'reverb'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Reverb Servers
+    |--------------------------------------------------------------------------
+    */
+
+    'servers' => [
+
+        'reverb' => [
+            'host' => env('REVERB_SERVER_HOST', '0.0.0.0'), // WebSocket listens here
+            'port' => env('REVERB_SERVER_PORT', 8080),       // WebSocket port
+            'path' => env('REVERB_SERVER_PATH', ''),
+
+            // Used for Echo client hostname
+            'hostname' => env('REVERB_HOST', 'localhost'),
+
+            'options' => [
+                'tls' => [], // No TLS for localhost
+            ],
+
+            'max_request_size' => env('REVERB_MAX_REQUEST_SIZE', 10000),
+
+            'scaling' => [
+                'enabled' => env('REVERB_SCALING_ENABLED', false),
+            ],
+
+            'pulse_ingest_interval' => env('REVERB_PULSE_INGEST_INTERVAL', 15),
+            'telescope_ingest_interval' => env('REVERB_TELESCOPE_INGEST_INTERVAL', 15),
+        ],
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Reverb Applications
+    |--------------------------------------------------------------------------
+    */
+
+    'apps' => [
+
+        'provider' => 'config',
+
+        'apps' => [
+            [
+                'key' => env('REVERB_APP_KEY'),
+                'secret' => env('REVERB_APP_SECRET'),
+                'app_id' => env('REVERB_APP_ID'),
+
+                /*
+                 |--------------------------------------------------------------------------
+                 | Echo + Flutter Client Options
+                 |--------------------------------------------------------------------------
+                 */
+                'options' => [
+                    'host' => env('REVERB_HOST', 'localhost'),   // for client connections
+                    'port' => env('REVERB_PORT', 8080),          // SAME as WebSocket server port
+                    'scheme' => env('REVERB_SCHEME', 'http'),
+                    'useTLS' => false,
+                ],
+
+                /*
+                 |--------------------------------------------------------------------------
+                 | Allowed Origins (Important)
+                 |--------------------------------------------------------------------------
+                 |
+                 | "*" allows all origins:
+                 | - Flutter (Android/iOS/Web)
+                 | - Admin Panel
+                 | - Localhost
+                 |
+                 */
+                'allowed_origins' => ['*'],
+
+                'ping_interval' => env('REVERB_APP_PING_INTERVAL', 60),
+                'activity_timeout' => env('REVERB_APP_ACTIVITY_TIMEOUT', 30),
+                'max_connections' => env('REVERB_APP_MAX_CONNECTIONS'),
+                'max_message_size' => env('REVERB_APP_MAX_MESSAGE_SIZE', 10000),
+            ],
+        ],
+
+    ],
+
+];
+

database/migrations/2025_12_08_044254_create_chat_messages_table.php

@@ -13,16 +13,28 @@ return new class extends Migration
     {
         Schema::create('chat_messages', function (Blueprint $table) {
             $table->id();
-            $table->unsignedBigInteger('ticket_id'); // support ticket ID
+
-            $table->unsignedBigInteger('sender_id'); // user or admin/staff
+            // Chat belongs to a ticket
-            $table->text('message')->nullable();     // message content
+            $table->unsignedBigInteger('ticket_id');
-            $table->string('file_path')->nullable(); // image/pdf/video
+
-            $table->string('file_type')->default('text'); // text/image/pdf/video
+            // POLYMORPHIC sender (User OR Admin)
+            $table->unsignedBigInteger('sender_id');
+            $table->string('sender_type'); 
+            // Example values:
+            // - "App\Models\User"
+            // - "App\Models\Admin"
+
+            // Content
+            $table->text('message')->nullable();
+            $table->string('file_path')->nullable(); // storage/app/public/chat/...
+            $table->string('file_type')->default('text'); // text / image / video / pdf
+
             $table->timestamps();
 
-            // foreign keys
+            // FK to tickets table
-            $table->foreign('ticket_id')->references('id')->on('support_tickets')->onDelete('cascade');
+            $table->foreign('ticket_id')
-            $table->foreign('sender_id')->references('id')->on('users')->onDelete('cascade'); // admin also stored in users table? If admin separate, change later.
+                  ->references('id')->on('support_tickets')
+                  ->onDelete('cascade');
         });
     }
 

database/migrations/2025_12_14_073425_add_read_flags_to_chat_messages.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('chat_messages', function (Blueprint $table) {
+    $table->boolean('read_by_admin')->default(false)->after('file_type');
+    $table->boolean('read_by_user')->default(false)->after('read_by_admin');
+});
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('chat_messages', function (Blueprint $table) {
+            //
+        });
+    }
+};

database/migrations/2025_12_17_053233_add_client_id_to_chat_messages.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('chat_messages', function (Blueprint $table) {
+            $table->string('client_id')
+                  ->nullable()
+                  ->after('sender_type')
+                  ->index();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('chat_messages', function (Blueprint $table) {
+            $table->dropColumn('client_id');
+        });
+    }
+};

package.json

@@ -13,5 +13,9 @@
         "laravel-vite-plugin": "^2.0.0",
         "tailwindcss": "^4.0.0",
         "vite": "^7.0.7"
+    },
+    "dependencies": {
+        "laravel-echo": "^2.2.6",
+        "pusher-js": "^8.4.0"
     }
 }

resources/js/app.js

@@ -1 +1,6 @@
-import './bootstrap';
+import "./bootstrap";
+
+// VERY IMPORTANT — Load Echo globally
+import "./echo";
+
+console.log("[APP] app.js loaded");

resources/js/bootstrap.js

@@ -1,4 +1,9 @@
 import axios from 'axios';
 window.axios = axios;
 
-window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+axios.defaults.withCredentials = true;
+axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
+axios.defaults.headers.common["X-CSRF-TOKEN"] = document.querySelector(
+    'meta[name="csrf-token"]'
+).content;
+

resources/js/echo.js

@@ -0,0 +1,30 @@
+import Echo from "laravel-echo";
+import Pusher from "pusher-js";
+
+window.Pusher = Pusher;
+
+console.log("[ECHO] Initializing Reverb...");
+
+window.Echo = new Echo({
+    broadcaster: "reverb",
+    key: import.meta.env.VITE_REVERB_APP_KEY,
+
+    wsHost: import.meta.env.VITE_REVERB_HOST,
+    wsPort: Number(import.meta.env.VITE_REVERB_PORT),
+
+    forceTLS: false,
+    disableStats: true,
+
+    authEndpoint: "/broadcasting/auth",
+
+    auth: {
+        headers: {
+            "X-CSRF-TOKEN": document
+                .querySelector('meta[name="csrf-token"]')
+                ?.getAttribute("content"),
+            "X-Requested-With": "XMLHttpRequest",
+        },
+    },
+});
+
+console.log("[ECHO] Loaded Successfully!", window.Echo);

resources/views/admin/chat_support.blade.php

@@ -1,12 +1,646 @@
 @extends('admin.layouts.app')
 
-@section('page-title', 'Dashboard')
+@section('page-title', 'Chat Support Dashboard')
 
 @section('content')
-<div class="card shadow-sm">
+<style>
-  <div class="card-body">
+    :root {
-    <h4>Welcome to the Admin chat</h4>
+        --primary-gradient: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    <p>Here you can manage all system modules.</p>
+        --success-gradient: linear-gradient(135deg, #11998e 0%, #38ef7d 100%);
-  </div>
+        --danger-gradient: linear-gradient(135deg, #ff416c 0%, #ff4b2b 100%);
+        --warning-gradient: linear-gradient(135deg, #f7971e 0%, #ffd200 100%);
+        --info-gradient: linear-gradient(135deg, #56ccf2 0%, #2f80ed 100%);
+        --card-shadow: 0 8px 25px rgba(0,0,0,0.08);
+        --card-shadow-hover: 0 15px 35px rgba(0,0,0,0.12);
+        --border-radius: 12px;
+        --transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+    }
+
+    * {
+        box-sizing: border-box;
+    }
+
+    .chat-dashboard {
+        min-height: 100vh;
+        background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
+        padding: 1.5rem;
+        font-family: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif;
+    }
+
+    .dashboard-header {
+        text-align: center;
+        margin-bottom: 2rem;
+        position: relative;
+    }
+
+    .dashboard-title {
+        font-size: clamp(2rem, 4vw, 3rem);
+        font-weight: 800;
+        background: var(--primary-gradient);
+        -webkit-background-clip: text;
+        background-clip: text;
+        -webkit-text-fill-color: transparent;
+        margin: 0 0 0.75rem 0;
+        position: relative;
+        display: inline-block;
+    }
+
+    .dashboard-title::before {
+        content: '💬';
+        position: absolute;
+        left: -2.5rem;
+        top: 50%;
+        transform: translateY(-50%);
+        font-size: 2rem;
+        animation: bounce 2s infinite;
+    }
+
+    @keyframes bounce {
+        0%, 20%, 50%, 80%, 100% { transform: translateY(-50%) translateY(0); }
+        40% { transform: translateY(-50%) translateY(-8px); }
+        60% { transform: translateY(-50%) translateY(-4px); }
+    }
+
+    .dashboard-subtitle {
+        color: #64748b;
+        font-size: 1rem;
+        max-width: 500px;
+        margin: 0 auto;
+        line-height: 1.5;
+    }
+
+    .stats-grid {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+        gap: 1rem;
+        margin-bottom: 2rem;
+    }
+
+    .stat-card {
+        background: rgba(255, 255, 255, 0.95);
+        backdrop-filter: blur(15px);
+        border-radius: var(--border-radius);
+        padding: 1.25rem 1.5rem;
+        display: flex;
+        align-items: center;
+        gap: 1rem;
+        border: 1px solid rgba(255, 255, 255, 0.3);
+        box-shadow: var(--card-shadow);
+        transition: var(--transition);
+        position: relative;
+        overflow: hidden;
+    }
+
+    .stat-card::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        height: 3px;
+        background: var(--primary-gradient);
+        transform: scaleX(0);
+        transition: transform 0.3s ease;
+    }
+
+    .stat-card:hover {
+        transform: translateY(-4px);
+        box-shadow: var(--card-shadow-hover);
+    }
+
+    .stat-card:hover::before {
+        transform: scaleX(1);
+    }
+
+    .stat-icon {
+        width: 55px;
+        height: 55px;
+        border-radius: 12px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 1.5rem;
+        box-shadow: 0 6px 20px rgba(0,0,0,0.1);
+        flex-shrink: 0;
+    }
+
+    .stat-total { background: var(--primary-gradient); color: white; }
+    .stat-open  { background: var(--success-gradient); color: white; }
+    .stat-closed{ background: var(--danger-gradient); color: white; }
+
+    .stat-content h3 {
+        font-size: 2rem;
+        font-weight: 800;
+        margin: 0 0 0.125rem 0;
+        color: #1e293b;
+    }
+
+    .stat-content p {
+        margin: 0;
+        color: #64748b;
+        font-size: 0.9rem;
+        font-weight: 500;
+    }
+
+    .tickets-container {
+        background: rgba(255, 255, 255, 0.95);
+        backdrop-filter: blur(15px);
+        border-radius: var(--border-radius);
+        padding: 1.5rem;
+        box-shadow: var(--card-shadow);
+        border: 1px solid rgba(255, 255, 255, 0.3);
+    }
+
+    .tickets-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 1.5rem;
+        padding-bottom: 1rem;
+        border-bottom: 1px solid #f1f5f9;
+    }
+
+    .tickets-title {
+        font-size: 1.4rem;
+        font-weight: 700;
+        color: #1e293b;
+        display: flex;
+        align-items: center;
+        gap: 0.5rem;
+    }
+
+    .tickets-count {
+        background: var(--primary-gradient);
+        color: white;
+        padding: 0.2rem 0.6rem;
+        border-radius: 16px;
+        font-size: 0.8rem;
+        font-weight: 600;
+    }
+
+    /* ========= COMPACT TICKET CARD ========= */
+    .ticket-item {
+        background: white;
+        border-radius: 10px;
+        padding: 0.75rem 1rem;
+        margin-bottom: 0.6rem;
+        border: 1px solid #f1f5f9;
+        transition: var(--transition);
+        position: relative;
+        overflow: hidden;
+    }
+
+    .ticket-item::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        width: 3px;
+        background: var(--primary-gradient);
+        transform: scaleY(0);
+        transition: var(--transition);
+    }
+
+    .ticket-item:hover {
+        transform: translateY(-2px);
+        box-shadow: var(--card-shadow-hover);
+        border-color: rgba(102, 126, 234, 0.15);
+    }
+
+    .ticket-item:hover::before {
+        transform: scaleY(1);
+    }
+
+    .ticket-header {
+        display: flex;
+        align-items: flex-start;
+        gap: 0.6rem;
+        margin-bottom: 0.5rem;
+    }
+
+    .ticket-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+        background: var(--info-gradient);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 1rem;
+        font-weight: 700;
+        color: white;
+        flex-shrink: 0;
+        box-shadow: 0 6px 16px rgba(86, 204, 242, 0.25);
+        position: relative;
+        overflow: hidden;
+    }
+
+    .ticket-avatar::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
+        transition: left 0.5s;
+    }
+
+    .ticket-item:hover .ticket-avatar::after {
+        left: 100%;
+    }
+
+    .ticket-content {
+        flex: 1;
+        min-width: 0;
+    }
+
+    .ticket-name {
+        font-size: 0.95rem;
+        font-weight: 700;
+        color: #1e293b;
+        margin: 0 0 0.15rem 0;
+        display: flex;
+        align-items: center;
+        gap: 0.4rem;
+    }
+
+    .unread-count {
+        background: #ef4444;
+        color: white;
+        min-width: 20px;
+        height: 20px;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 0.7rem;
+        font-weight: 700;
+        box-shadow: 0 3px 10px rgba(239, 68, 68, 0.4);
+        animation: pulse 2s infinite;
+    }
+
+    @keyframes pulse {
+        0%, 100% { transform: scale(1); }
+        50% { transform: scale(1.05); }
+    }
+
+    .ticket-preview {
+        color: #64748b;
+        font-size: 0.8rem;
+        line-height: 1.4;
+        margin-bottom: 0.25rem;
+        display: flex;
+        align-items: center;
+        gap: 0.4rem;
+    }
+
+    .ticket-time {
+        font-size: 0.75rem;
+        color: #94a3b8;
+        display: flex;
+        align-items: center;
+        gap: 0.25rem;
+    }
+
+    .ticket-time svg {
+        width: 12px;
+        height: 12px;
+        flex-shrink: 0;
+    }
+
+    .ticket-footer {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding-top: 0.6rem;
+        border-top: 1px dashed #f1f5f9;
+        margin-top: 0.4rem;
+    }
+
+    .status-badge {
+        padding: 0.25rem 0.7rem;
+        border-radius: 50px;
+        font-size: 0.7rem;
+        font-weight: 700;
+        text-transform: uppercase;
+        letter-spacing: 0.3px;
+    }
+
+    .status-open  { background: var(--success-gradient); color: white; }
+    .status-closed{ background: var(--danger-gradient);  color: white; }
+
+    .chat-btn {
+        background: var(--primary-gradient);
+        color: white;
+        border: none;
+        padding: 0.45rem 0.9rem;
+        border-radius: 25px;
+        font-weight: 600;
+        font-size: 0.8rem;
+        display: flex;
+        align-items: center;
+        gap: 0.4rem;
+        text-decoration: none;
+        transition: var(--transition);
+        box-shadow: 0 6px 20px rgba(102, 126, 234, 0.25);
+    }
+
+    .chat-btn:hover {
+        transform: translateY(-1px);
+        box-shadow: 0 10px 25px rgba(102, 126, 234, 0.35);
+        color: white;
+    }
+
+    .chat-btn::after {
+        content: '→';
+        transition: margin-left 0.3s ease;
+        margin-left: 0;
+    }
+
+    .chat-btn:hover::after {
+        margin-left: 0.4rem;
+    }
+
+    .empty-state {
+        text-align: center;
+        padding: 2.5rem 1.5rem;
+        background: rgba(255, 255, 255, 0.6);
+        border-radius: var(--border-radius);
+        border: 2px dashed #e2e8f0;
+    }
+
+    .empty-icon {
+        font-size: 4rem;
+        margin-bottom: 1.5rem;
+        display: block;
+        animation: float 3s ease-in-out infinite;
+    }
+
+    @keyframes float {
+        0%, 100% { transform: translateY(0px); }
+        50% { transform: translateY(-15px); }
+    }
+
+    .empty-title {
+        font-size: 1.4rem;
+        font-weight: 700;
+        color: #1e293b;
+        margin-bottom: 0.75rem;
+    }
+
+    .empty-subtitle {
+        color: #64748b;
+        font-size: 1rem;
+        margin-bottom: 1.5rem;
+        line-height: 1.5;
+    }
+
+    .ticket-id {
+        background: rgba(102, 126, 234, 0.1);
+        color: #667eea;
+        padding: 0.2rem 0.75rem;
+        border-radius: 16px;
+        font-size: 0.75rem;
+        font-weight: 600;
+        display: inline-flex;
+        align-items: center;
+        gap: 0.25rem;
+    }
+
+    .new-message-dot {
+        position: absolute;
+        top: 0.75rem;
+        right: 0.75rem;
+        width: 10px;
+        height: 10px;
+        background: #ef4444;
+        border-radius: 50%;
+        border: 2px solid white;
+        box-shadow: 0 0 0 2px rgba(239, 68, 68, 0.3);
+        animation: blink 1.5s infinite;
+        z-index: 10;
+    }
+
+    @keyframes blink {
+        0%, 100% { opacity: 1; transform: scale(1); }
+        50% { opacity: 0.5; transform: scale(1.15); }
+    }
+
+    @media (max-width: 768px) {
+        .chat-dashboard {
+            padding: 1rem;
+        }
+        
+        .stats-grid {
+            grid-template-columns: 1fr;
+            gap: 0.75rem;
+        }
+        
+        .ticket-header {
+            flex-direction: column;
+            gap: 0.75rem;
+        }
+        
+        .ticket-footer {
+            flex-direction: column;
+            gap: 0.75rem;
+            align-items: stretch;
+        }
+        
+        .chat-btn {
+            justify-content: center;
+        }
+    }
+
+    .tickets-list {
+        max-height: 55vh;
+        overflow-y: auto;
+        padding-right: 0.4rem;
+    }
+
+    .tickets-list::-webkit-scrollbar {
+        width: 5px;
+    }
+
+    .tickets-list::-webkit-scrollbar-track {
+        background: #f1f5f9;
+        border-radius: 8px;
+    }
+
+    .tickets-list::-webkit-scrollbar-thumb {
+        background: var(--primary-gradient);
+        border-radius: 8px;
+    }
+</style>
+
+<div class="chat-dashboard">
+    <!-- Header -->
+    <div class="dashboard-header">
+        <h1 class="dashboard-title">Live Chat Dashboard</h1>
+        <p class="dashboard-subtitle">
+            Monitor customer conversations with real-time updates
+        </p>
+    </div>
+
+    <!-- Stats Cards -->
+    <div class="stats-grid">
+        <div class="stat-card">
+            <div class="stat-icon stat-total">💬</div>
+            <div class="stat-content">
+                <h3>{{ $tickets->count() }}</h3>
+                <p>Total Conversations</p>
+            </div>
+        </div>
+        <div class="stat-card">
+            <div class="stat-icon stat-open">📈</div>
+            <div class="stat-content">
+                <h3>{{ $tickets->where('status', 'open')->count() }}</h3>
+                <p>Active Tickets</p>
+            </div>
+        </div>
+        <div class="stat-card">
+            <div class="stat-icon stat-closed">✅</div>
+            <div class="stat-content">
+                <h3>{{ $tickets->where('status', 'closed')->count() }}</h3>
+                <p>Resolved Tickets</p>
+            </div>
+        </div>
+    </div>
+
+    <!-- Tickets Container -->
+    <div class="tickets-container">
+        <div class="tickets-header">
+            <div>
+                <h2 class="tickets-title">
+                    📋 Active Conversations 
+                    <span class="tickets-count">{{ $tickets->count() }}</span>
+                </h2>
+            </div>
+        </div>
+
+        @if($tickets->count() === 0)
+            <!-- Empty State -->
+            <div class="empty-state">
+                <div class="empty-icon">💬</div>
+                <h3 class="empty-title">No Active Conversations</h3>
+                <p class="empty-subtitle">
+                    Customer conversations will appear here with real-time notifications.
+                </p>
+                <div class="ticket-id">Ready for support requests</div>
+            </div>
+        @else
+            <!-- Tickets List -->
+            <div class="tickets-list">
+                @foreach($tickets as $ticket)
+                    <div class="ticket-item" data-ticket-id="{{ $ticket->id }}">
+                        @if($ticket->unread_count > 0)
+                            <div class="new-message-dot"></div>
+                        @endif
+
+                        <div class="ticket-header">
+                            <div class="ticket-avatar">
+                                {{ strtoupper(substr($ticket->user->customer_name ?? $ticket->user->name, 0, 1)) }}
+                            </div>
+                            <div class="ticket-content">
+                                <div class="ticket-name">
+                                    {{ $ticket->user->customer_name ?? $ticket->user->name }}
+                                    @if($ticket->unread_count > 0)
+                                        <span id="badge-{{ $ticket->id }}" class="unread-count">
+                                            {{ $ticket->unread_count }}
+                                        </span>
+                                    @endif
+                                </div>
+                                
+                                @php
+                                    $lastMsg = $ticket->messages()->latest()->first();
+                                @endphp
+                                
+                                <div class="ticket-preview">
+                                    @if($lastMsg)
+                                        @if($lastMsg->message)
+                                            {{ Str::limit($lastMsg->message, 55) }}
+                                        @elseif(Str::startsWith($lastMsg->file_type, 'image'))
+                                            📷 Photo shared
+                                        @else
+                                            📎 File attached
+                                        @endif
+                                    @else
+                                        <em>Conversation started</em>
+                                    @endif
+                                </div>
+
+                                @if($lastMsg)
+                                    <div class="ticket-time">
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 16">
+                                            <path d="M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71V3.5z"/>
+                                            <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0z"/>
+                                        </svg>
+                                        {{ $lastMsg->created_at->diffForHumans() }}
+                                    </div>
+                                @endif
+                            </div>
+                            <div class="ticket-id">#{{ $ticket->id }}</div>
+                        </div>
+
+                        <div class="ticket-footer">
+                            <span class="status-badge status-{{ $ticket->status }}">
+                                {{ ucfirst($ticket->status) }}
+                            </span>
+                            <a href="{{ route('admin.chat.open', $ticket->id) }}" class="chat-btn">
+                                Open Chat
+                            </a>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        @endif
+    </div>
 </div>
 @endsection
+
+@section('scripts')
+<script>
+// -------------------------------
+// WAIT FOR ECHO READY (DEFINE IT)
+// -------------------------------
+function waitForEcho(callback, retries = 40) {
+    if (window.Echo) {
+        console.log('%c[ECHO] Ready (Admin List)', 'color: green; font-weight: bold;');
+        callback();
+        return;
+    }
+
+    if (retries <= 0) {
+        console.error('[ECHO] Failed to initialize');
+        return;
+    }
+
+    setTimeout(() => waitForEcho(callback, retries - 1), 200);
+}
+
+// -------------------------------
+// LISTEN FOR REALTIME MESSAGES
+// -------------------------------
+waitForEcho(() => {
+    console.log('[ADMIN LIST] Listening for new messages...');
+
+    window.Echo.private('admin.chat')
+        .listen('.NewChatMessage', (event) => {
+
+            // only USER → ADMIN messages
+            if (event.sender_type !== 'App\\Models\\User') return;
+
+            const badge = document.getElementById(`badge-${event.ticket_id}`);
+            if (!badge) return;
+
+            let count = parseInt(badge.innerText || 0);
+            badge.innerText = count + 1;
+            badge.classList.remove('d-none');
+
+            console.log('[ADMIN LIST] Badge updated for ticket', event.ticket_id);
+        });
+});
+</script>
+@endsection

resources/views/admin/dashboard.blade.php

@@ -333,6 +333,13 @@ body, .container-fluid {
   border-color: #f59e0b !important;
 }
 
+.badge-loading {
+  background: linear-gradient(135deg, #e3f2fd, #90caf9) !important;
+  color: #1565c0 !important;
+  border-color: #2196f3 !important;
+  width: 110px;
+}
+
 /* In Transit Status - SAME SIZE WITH TRUCK ICON */
 .badge-in_transit {
   background: linear-gradient(135deg, #dbeafe, #93c5fd) !important;
@@ -1101,6 +1108,7 @@ body, .container-fluid {
     break-inside: avoid;
   }
 }
+
 </style>
 
 <div class="container-fluid py-3">

resources/views/admin/layouts/app.blade.php

@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+  
   <meta charset="UTF-8" />
+   <meta name="csrf-token" content="{{ csrf_token() }}">
   <title>Admin Panel</title>
   <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" />
   <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css" rel="stylesheet" />
@@ -220,6 +222,7 @@
       font-weight: 500;
     }
   </style>
+
 </head>
 <body>
   <div class="sidebar">
@@ -346,6 +349,8 @@
   </div>
   
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+  @vite(['resources/js/app.js'])
+  @yield('scripts')   <!-- ⭐ REQUIRED FOR CHAT TO WORK -->
   <script>
     document.addEventListener('DOMContentLoaded', function() {
       const headerToggle = document.getElementById('headerToggle');

resources/views/admin/orders/pdf.blade.php

@@ -11,60 +11,64 @@
   </style>
 </head>
 <body>
-  <h3>Orders Report</h3>
 
-  @if(!empty($filters))
+<h3>Orders Report</h3>
-    <p>
-      @if($filters['search']) Search: <strong>{{ $filters['search'] }}</strong> @endif
-      @if($filters['status']) &nbsp; | Status: <strong>{{ ucfirst($filters['status']) }}</strong> @endif
-      @if($filters['shipment']) &nbsp; | Shipment: <strong>{{ ucfirst($filters['shipment']) }}</strong> @endif
-    </p>
-  @endif
 
-  <table>
+@if(!empty($filters))
-    <thead>
+  <p>
+    @if(!empty($filters['search'])) Search: <strong>{{ $filters['search'] }}</strong> @endif
+    @if(!empty($filters['status'])) | Status: <strong>{{ ucfirst($filters['status']) }}</strong> @endif
+    @if(!empty($filters['shipment'])) | Shipment: <strong>{{ ucfirst($filters['shipment']) }}</strong> @endif
+  </p>
+@endif
+
+<table>
+  <thead>
+    <tr>
+      <th>Order ID</th>
+      <th>Shipment ID</th>
+      <th>Customer ID</th>
+      <th>Company</th>
+      <th>Origin</th>
+      <th>Destination</th>
+      <th>Order Date</th>
+      <th>Invoice No</th>
+      <th>Invoice Date</th>
+      <th>Amount</th>
+      <th>Amount + GST</th>
+      <th>Invoice Status</th>
+      <th>Shipment Status</th>
+    </tr>
+  </thead>
+  <tbody>
+    @forelse($orders as $order)
+      @php
+        $mark = $order->markList;
+        $invoice = $order->invoice;
+        $shipment = $order->shipments->first();
+      @endphp
       <tr>
-        <th>Order ID</th>
+        <td>{{ $order->order_id }}</td>
-        <th>Shipment ID</th>
+        <td>{{ $shipment?->shipment_id ?? '-' }}</td>
-        <th>Customer ID</th>
+        <td>{{ $mark?->customer_id ?? '-' }}</td>
-        <th>Company</th>
+        <td>{{ $mark?->company_name ?? '-' }}</td>
-        <th>Origin</th>
+        <td>{{ $mark?->origin ?? $order->origin ?? '-' }}</td>
-        <th>Destination</th>
+        <td>{{ $mark?->destination ?? $order->destination ?? '-' }}</td>
-        <th>Order Date</th>
+        <td>{{ $order->created_at?->format('d-m-Y') ?? '-' }}</td>
-        <th>Invoice No</th>
+        <td>{{ $invoice?->invoice_number ?? '-' }}</td>
-        <th>Invoice Date</th>
+        <td>{{ $invoice?->invoice_date ? \Carbon\Carbon::parse($invoice->invoice_date)->format('d-m-Y') : '-' }}</td>
-        <th>Amount</th>
+        <td>{{ $invoice?->final_amount !== null ? number_format($invoice->final_amount, 2) : '-' }}</td>
-        <th>Amount + GST</th>
+        <td>{{ $invoice?->final_amount_with_gst !== null ? number_format($invoice->final_amount_with_gst, 2) : '-' }}</td>
-        <th>Invoice Status</th>
+        <td>{{ ucfirst($invoice?->status ?? 'Pending') }}</td>
-        <th>Shipment Status</th>
+        <td>{{ ucfirst(str_replace('_',' ', $shipment?->status ?? 'Pending')) }}</td>
       </tr>
-    </thead>
+    @empty
-    <tbody>
+      <tr>
-      @forelse($orders as $order)
+        <td colspan="13" style="text-align:center">No orders found</td>
-        @php
+      </tr>
-          $mark = $order->markList ?? null;
+    @endforelse
-          $invoice = $order->invoice ?? null;
+  </tbody>
-          $shipment = $order->shipments->first() ?? null;
+</table>
-        @endphp
+
-        <tr>
-          <td>{{ $order->order_id }}</td>
-          <td>{{ $shipment->shipment_id ?? '-' }}</td>
-          <td>{{ $mark->customer_id ?? '-' }}</td>
-          <td>{{ $mark->company_name ?? '-' }}</td>
-          <td>{{ $mark->origin ?? $order->origin ?? '-' }}</td>
-          <td>{{ $mark->destination ?? $order->destination ?? '-' }}</td>
-          <td>{{ $order->created_at ? $order->created_at->format('d-m-Y') : '-' }}</td>
-          <td>{{ $invoice->invoice_number ?? '-' }}</td>
-          <td>{{ $invoice?->invoice_date ? \Carbon\Carbon::parse($invoice->invoice_date)->format('d-m-Y') : '-' }}</td>
-          <td>{{ $invoice?->final_amount ? number_format($invoice->final_amount, 2) : '-' }}</td>
-          <td>{{ $invoice?->final_amount_with_gst ? number_format($invoice->final_amount_with_gst, 2) : '-' }}</td>
-          <td>{{ $invoice->status ? ucfirst($invoice->status) : 'Pending' }}</td>
-          <td>{{ $shipment?->status ? ucfirst(str_replace('_',' ',$shipment->status)) : 'Pending' }}</td>
-        </tr>
-      @empty
-        <tr><td colspan="13" style="text-align:center">No orders found</td></tr>
-      @endforelse
-    </tbody>
-  </table>
 </body>
 </html>

resources/views/admin/orders_show.blade.php

@@ -13,48 +13,55 @@
       <div class="d-flex justify-content-between align-items-start">
         <div>
           <h4 class="fw-bold mb-0">Order Details</h4>
+          @php
+              $status = strtolower($order->status ?? '');
+          @endphp
+
           <small class="text-muted">Detailed view of this shipment order</small>
         </div>
 
         {{-- ADD ITEM --}}
         @can('order.create')
-        <button class="btn btn-add-item" data-bs-toggle="modal" data-bs-target="#addItemModal">
+            @if($status === 'pending')
-          <i class="fas fa-plus-circle me-2"></i>Add New Item
+                <button class="btn btn-add-item" data-bs-toggle="modal" data-bs-target="#addItemModal">
-        </button>
+                    <i class="fas fa-plus-circle me-2"></i>Add New Item
+                </button>
+            @endif
         @endcan
 
+
         <a href="{{ route('admin.dashboard') }}" class="btn-close"></a>
       </div>
 
       <!-- {{-- ACTION BUTTONS --}}
+      <div class="mt-3 d-flex gap-2">-->
+
+        
       <div class="mt-3 d-flex gap-2">
+                {{-- Edit Order --}}
+                @if($status === 'pending')
+                    <button class="btn btn-edit-order" 
+                            onclick="document.getElementById('editOrderForm').style.display='block'">
+                        <i class="fas fa-edit me-2"></i>Edit Order
+                    </button>
+                @endif
+
+                {{-- Delete Order --}}
+                @if($status === 'pending')
+                    <form action="{{ route('admin.orders.destroy', $order->id) }}" 
+                          method="POST"
+                          onsubmit="return confirm('Delete this entire order?')">
+                        @csrf
+                        @method('DELETE')
+                        <button class="btn btn-delete-order">
+                            <i class="fas fa-trash-alt me-2"></i>Delete Order
+                        </button>
+                    </form>
+                @endif
+            </div>
 
       
 
-        {{-- EDIT ORDER --}} -->
-        <!-- @if($order->status === 'pending')
-          <button class="btn btn-edit-order" onclick="document.getElementById('editOrderForm').style.display='block'">
-              <i class="fas fa-edit me-2"></i>Edit Order
-          </button>
-        @else
-          <button class="btn btn-edit-order" disabled><i class="fas fa-edit me-2"></i>Edit Order</button>
-        @endif -->
-
-        <!-- {{-- DELETE ORDER --}}
-        @if($order->status === 'pending')
-        <form action="{{ route('admin.orders.destroy', $order->id) }}"
-              method="POST"
-              onsubmit="return confirm('Delete this entire order?')">
-          @csrf
-          @method('DELETE')
-          <button class="btn btn-delete-order">
-            <i class="fas fa-trash-alt me-2"></i>Delete Order
-          </button>
-        </form>
-        @endif -->
-
-      <!-- </div> -->
-
       <hr>
 
       {{-- EDIT ORDER FORM --}}
@@ -190,32 +197,33 @@
               <td>{{ $item->ttl_kg }}</td>
               <td>{{ $item->shop_no }}</td>
 
-             <td class="d-flex justify-content-center gap-2">
+              <td class="d-flex justify-content-center gap-2">
+                    @if($status === 'pending')
+                        {{-- EDIT BUTTON --}}
+                        @can('order.edit')
+                        <button type="button" 
+                                class="btn btn-sm btn-edit-item" 
+                                data-bs-toggle="modal" 
+                                data-bs-target="#editItemModal{{ $item->id }}">
+                            <i class="fas fa-edit"></i>
+                        </button>
+                        @endcan
 
-              {{-- EDIT BUTTON --}}
+                        {{-- DELETE BUTTON --}}
-              @can('order.edit')
+                        @can('order.delete')
-              <button 
+                        <form action="{{ route('admin.orders.deleteItem', $item->id) }}" 
-                  type="button" 
+                              method="POST" 
-                  class="btn btn-sm btn-edit-item"
+                              onsubmit="return confirm('Delete this item?')">
-                  data-bs-toggle="modal"
+                            @csrf
-                  data-bs-target="#editItemModal{{ $item->id }}">
+                            @method('DELETE')
-                  <i class="fas fa-edit"></i>
+                            <button type="submit" class="btn btn-sm btn-delete-item">
-              </button>
+                                <i class="fas fa-trash"></i>
-              @endcan
+                            </button>
+                        </form>
+                        @endcan
+                    @endif
+                </td>
 
-              @can('order.delete')
-              {{-- DELETE BUTTON --}}
-              <form action="{{ route('admin.orders.deleteItem', $item->id) }}"
-                    method="POST"
-                    onsubmit="return confirm('Delete this item?')">
-                @csrf
-                @method('DELETE')
-                <button class="btn btn-sm btn-delete-item">
-                  <i class="fas fa-trash"></i>
-                </button>
-              </form>
-              @endcan
-          </td>
 
             </tr>
             @endforeach
@@ -617,7 +625,7 @@ function fillFormFromDeleted(item) {
     box-shadow: 0 4px 15px 0 rgba(102, 126, 234, 0.3);
     position: relative;
     overflow: hidden;
-     margin-right: -800px; 
+    margin-right: -650px; 
 }
 
 .btn-add-item:hover {

resources/views/admin/shipments.blade.php

@@ -1297,9 +1297,10 @@
                             </td>
                             <td>{{ \Carbon\Carbon::parse($ship->shipment_date)->format('d M Y') }}</td>
                             <td>
-                                <button type="button" class="btn-eye" onclick="openShipmentDetails({{ $ship->id }})" title="View Shipment">
+                                <a href="{{ route('admin.shipments.dummy', $ship->id) }}"
+                                class="btn-view-details">
                                     <i class="bi bi-eye"></i>
-                                </button>
+                                </a>
                             </td>
                             
                             <td>
@@ -1596,7 +1597,7 @@ function renderTable() {
             <td>${new Date(shipment.shipment_date).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })}</td>
           
             <td>
-                <a href="{{ route('admin.shipments.dummy', $ship->id) }}"
+                <a href="/admin/shipment/dummy/${shipment.id}"
                 class="btn-view-details">
                     <i class="bi bi-eye"></i>
                 </a>
@@ -1665,6 +1666,8 @@ function openShipmentDetails(id) {
         .then(data => {
             // Format date properly
             const shipmentDate = new Date(data.shipment.shipment_date);
+           // <div class="shipment-info-value">${data.shipment.shipment_id}</div>
+
             const formattedDate = shipmentDate.toLocaleDateString('en-GB', {
                 day: '2-digit',
                 month: 'short',

resources/views/admin/staff/index.blade.php

@@ -1,65 +1,896 @@
 @extends('admin.layouts.app')
 
-@section('page-title', 'Account Dashboard')
+@section('page-title', 'Staff Management Dashboard')
 
 @section('content')
 <style>
-  .top-bar { display:flex; justify-content:space-between; align-items:center; margin-bottom:1rem; }
+    :root {
-  .card { background:#fff; border:1px solid #e4e4e4; border-radius:6px; padding:1rem; box-shadow:0 1px 3px rgba(0,0,0,.03); }
+        --primary: #4361ee;
-  table { width:100%; border-collapse:collapse; }
+        --primary-dark: #3a56d4;
-  th, td { padding:.6rem .75rem; border-bottom:1px solid #f1f1f1; text-align:left; }
+        --secondary: #f72585;
-  .btn { padding:.45rem .75rem; border-radius:4px; border:1px solid #ccc; background:#f7f7f7; cursor:pointer; }
+        --success: #4cc9f0;
-  .btn.primary { background:#0b74de; color:#fff; border-color:#0b74de; }
+        --warning: #f8961e;
-  .actions a { margin-right:.5rem; color:#0b74de; text-decoration:none; }
+        --danger: #e63946;
-  .muted { color:#666; font-size:.95rem; }
+        --light: #f8f9fa;
+        --dark: #212529;
+        --gray: #6c757d;
+        --border: #e2e8f0;
+        --card-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
+        --hover-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
+        --gradient-primary: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    }
+
+    /* Search Bar - Similar to Shipment */
+    .search-staff-bar {
+        display: flex;
+        align-items: center;
+        gap: 15px;
+        padding: 20px;
+        background: var(--gradient-primary);
+        border-radius: 16px;
+        box-shadow: var(--card-shadow);
+        flex-wrap: wrap;
+        margin-bottom: 30px;
+        color: white;
+        position: relative;
+        overflow: hidden;
+    }
+    
+    .search-staff-bar::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(255,255,255,0.1);
+        z-index: 0;
+    }
+    
+    .search-staff-bar > * {
+        position: relative;
+        z-index: 1;
+    }
+    
+    .search-staff-bar input, 
+    .search-staff-bar select {
+        padding: 12px 16px;
+        border: 1px solid rgba(255,255,255,0.2);
+        border-radius: 10px;
+        flex: 1;
+        min-width: 150px;
+        background: rgba(255,255,255,0.9);
+        font-weight: 500;
+        transition: all 0.3s ease;
+        color: var(--dark);
+    }
+    
+    .search-staff-bar input:focus, 
+    .search-staff-bar select:focus {
+        background: white;
+        box-shadow: 0 0 0 3px rgba(255,255,255,0.3);
+        outline: none;
+    }
+    
+    .btn-add-staff {
+        background: rgba(255,255,255,0.2);
+        backdrop-filter: blur(10px);
+        color: white;
+        border: 1px solid rgba(255,255,255,0.3);
+        padding: 12px 24px;
+        border-radius: 10px;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        transition: all 0.3s ease;
+        white-space: nowrap;
+        font-weight: 600;
+        text-decoration: none;
+    }
+    
+    .btn-add-staff:hover {
+        background: rgba(255,255,255,0.3);
+        transform: translateY(-2px);
+        box-shadow: 0 10px 20px rgba(0,0,0,0.1);
+    }
+    
+    .search-icon {
+        font-size: 20px;
+        filter: drop-shadow(0 2px 4px rgba(0,0,0,0.1));
+    }
+    
+    .user-icon {
+        font-size: 18px;
+    }
+
+    @media (max-width: 768px) {
+        .search-staff-bar {
+            flex-direction: column;
+            align-items: stretch;
+        }
+        .search-staff-bar input, 
+        .search-staff-bar select {
+            width: 100%;
+        }
+    }
+    
+    /* Card Styles - Same as Shipment */
+    .card {
+        border: none;
+        border-radius: 16px;
+        box-shadow: var(--card-shadow);
+        transition: all 0.3s ease;
+        overflow: hidden;
+    }
+    
+    .card:hover {
+        transform: translateY(-5px);
+        box-shadow: var(--hover-shadow);
+    }
+    
+    .card-header {
+        background: var(--gradient-primary);
+        color: white;
+        border: none;
+        padding: 20px 25px;
+        border-radius: 16px 16px 0 0 !important;
+    }
+    
+    .card-header h5 {
+        margin: 0;
+        font-weight: 700;
+        display: flex;
+        align-items: center;
+        gap: 10px;
+    }
+    
+    /* Table Styles - Similar to Shipment */
+    .table-responsive {
+        border-radius: 0 0 16px 16px;
+        overflow-x: auto;
+    }
+    
+    .table {
+        margin: 0;
+        border-collapse: separate;
+        border-spacing: 0;
+        width: 100%;
+        padding: 0;
+    }
+    
+    .table thead th {
+        background: #f8f9fa;
+        border: none;
+        padding: 16px 12px;
+        font-weight: 700;
+        color: var(--dark);
+        text-align: left;
+        vertical-align: middle;
+        border-bottom: 2px solid var(--border);
+        position: relative;
+    }
+    
+    .table tbody tr {
+        transition: all 0.3s ease;
+    }
+    
+    .table tbody tr:hover {
+        background-color: #f8f9ff;
+        transform: scale(1.01);
+        box-shadow: 0 4px 12px rgba(0,0,0,0.1);
+    }
+    
+    .table tbody td {
+        padding: 14px 12px;
+        text-align: left;
+        vertical-align: middle;
+        border-bottom: 1px solid var(--border);
+        font-weight: 500;
+    }
+    
+    .table tbody tr:last-child td {
+        border-bottom: none;
+    }
+    
+    /* Status Badges - Similar Style */
+    .badge {
+        padding: 6px 12px !important;
+        border-radius: 20px !important;
+        font-weight: 600 !important;
+        font-size: 12px !important;
+        border: 2px solid transparent !important;
+        min-width: 80px !important;
+        text-align: center !important;
+        display: inline-block !important;
+        line-height: 1.2 !important;
+    }
+    
+    .badge-active {
+        background: linear-gradient(135deg, #d1fae5, #a7f3d0) !important;
+        color: #065f46 !important;
+        border-color: #10b981 !important;
+    }
+    
+    .badge-inactive {
+        background: linear-gradient(135deg, #fecaca, #fca5a5) !important;
+        color: #991b1b !important;
+        border-color: #ef4444 !important;
+    }
+    
+    .badge-pending {
+        background: linear-gradient(135deg, #fef3c7, #fde68a) !important;
+        color: #92400e !important;
+        border-color: #f59e0b !important;
+    }
+    
+    /* Employee ID Badge - Similar to Shipment ID */
+    .employee-id-badge {
+        font-family: 'Courier New', monospace;
+        background: rgba(67, 97, 238, 0.1);
+        padding: 4px 8px;
+        border-radius: 6px;
+        font-size: 0.85rem;
+        color: var(--primary);
+        border: 1px solid rgba(67, 97, 238, 0.2);
+        display: inline-block;
+    }
+    
+    /* Action Buttons - Similar Style */
+    .action-buttons {
+        display: flex;
+        gap: 8px;
+    }
+    
+    .btn-action {
+        padding: 6px 12px;
+        border-radius: 8px;
+        font-size: 13px;
+        font-weight: 600;
+        text-decoration: none;
+        transition: all 0.3s ease;
+        display: inline-flex;
+        align-items: center;
+        gap: 5px;
+        border: none;
+        cursor: pointer;
+    }
+    
+    .btn-edit {
+        background: linear-gradient(135deg, #4cc9f0, #4361ee);
+        color: white;
+    }
+    
+    .btn-edit:hover {
+        background: linear-gradient(135deg, #38bdf8, #3a56d4);
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(76, 201, 240, 0.3);
+    }
+    
+    .btn-delete {
+        background: linear-gradient(135deg, #f87171, #ef4444);
+        color: white;
+    }
+    
+    .btn-delete:hover {
+        background: linear-gradient(135deg, #ef4444, #dc2626);
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(239, 68, 68, 0.3);
+    }
+    
+    /* Success Message - Similar Style */
+    .alert-success {
+        background: linear-gradient(135deg, #e6ffed, #d1f7e5);
+        border: 1px solid #b6f0c6;
+        border-left: 4px solid var(--success);
+        color: #0f5132;
+        padding: 1rem 1.25rem;
+        border-radius: 10px;
+        margin-bottom: 1.5rem;
+        display: flex;
+        align-items: center;
+        gap: 0.75rem;
+    }
+    
+    .alert-success:before {
+        content: '✓';
+        background: var(--success);
+        color: white;
+        width: 20px;
+        height: 20px;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 0.75rem;
+    }
+    
+    /* Empty State */
+    .empty-state {
+        text-align: center;
+        padding: 3rem 1rem;
+        color: var(--gray);
+    }
+    
+    .empty-state:before {
+        content: '👤';
+        font-size: 3rem;
+        display: block;
+        margin-bottom: 1rem;
+        opacity: 0.5;
+    }
+    
+    /* Role Badges */
+    .role-badge {
+        padding: 4px 8px;
+        border-radius: 6px;
+        font-size: 11px;
+        font-weight: 600;
+        background: rgba(67, 97, 238, 0.1);
+        color: var(--primary);
+        border: 1px solid rgba(67, 97, 238, 0.2);
+    }
+    
+    /* Stats Cards - Similar to Shipment Totals */
+    .stats-cards {
+        display: flex;
+        gap: 20px;
+        margin-bottom: 30px;
+        flex-wrap: wrap;
+    }
+    
+    .stat-card {
+        flex: 1;
+        min-width: 200px;
+        background: white;
+        padding: 20px;
+        border-radius: 12px;
+        box-shadow: var(--card-shadow);
+        display: flex;
+        align-items: center;
+        gap: 15px;
+        transition: all 0.3s ease;
+    }
+    
+    .stat-card:hover {
+        transform: translateY(-3px);
+        box-shadow: var(--hover-shadow);
+    }
+    
+    .stat-icon {
+        width: 50px;
+        height: 50px;
+        border-radius: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 24px;
+    }
+    
+    .stat-icon.total {
+        background: linear-gradient(135deg, #e6f3ff, #c2d9ff);
+        color: var(--primary);
+    }
+    
+    .stat-icon.active {
+        background: linear-gradient(135deg, #d1fae5, #a7f3d0);
+        color: #10b981;
+    }
+    
+    .stat-content h3 {
+        font-size: 1.8rem;
+        font-weight: 700;
+        margin: 0;
+        color: var(--dark);
+    }
+    
+    .stat-content p {
+        color: var(--gray);
+        margin: 4px 0 0 0;
+        font-size: 0.875rem;
+    }
+
+    /* Pagination - Same as Shipment */
+    .pagination-container {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 15px;
+        padding: 12px 25px;
+        border-top: 1px solid #eef3fb;
+    }
+
+    .pagination-info {
+        font-size: 13px;
+        color: #9ba5bb;
+        font-weight: 600;
+    }
+
+    .pagination-controls {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+    }
+
+    .pagination-btn {
+        background: #fff;
+        border: 1px solid #e3eaf6;
+        color: #1a2951;
+        padding: 8px 12px;
+        border-radius: 6px;
+        font-size: 13px;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 40px;
+        height: 32px;
+    }
+
+    .pagination-btn:hover:not(:disabled) {
+        background: #1a2951;
+        color: white;
+        border-color: #1a2951;
+    }
+
+    .pagination-btn:disabled {
+        background: #f8fafc;
+        color: #cbd5e0;
+        border-color: #e2e8f0;
+        cursor: not-allowed;
+        opacity: 0.6;
+    }
+
+    .pagination-page-btn {
+        background: #fff;
+        border: 1px solid #e3eaf6;
+        color: #1a2951;
+        padding: 6px 12px;
+        border-radius: 6px;
+        font-size: 13px;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        min-width: 36px;
+        text-align: center;
+    }
+
+    .pagination-page-btn:hover {
+        background: #1a2951;
+        color: white;
+        border-color: #1a2951;
+    }
+
+    .pagination-page-btn.active {
+        background: #1a2951;
+        color: white;
+        border-color: #1a2951;
+    }
+
+    .pagination-pages {
+        display: flex;
+        gap: 4px;
+        align-items: center;
+    }
+
+    .pagination-ellipsis {
+        color: #9ba5bb;
+        font-size: 13px;
+        padding: 0 4px;
+    }
+
+    @media (max-width: 768px) {
+        .stats-cards {
+            flex-direction: column;
+        }
+        
+        .stat-card {
+            min-width: 100%;
+        }
+        
+        .pagination-container {
+            flex-direction: column;
+            gap: 10px;
+            align-items: stretch;
+        }
+        
+        .pagination-controls {
+            justify-content: center;
+        }
+    }
 </style>
 
-<div class="top-bar">
+<div class="container-fluid py-4">
-  <h2>Staff</h2>
+
-  <a href="{{ route('admin.staff.create') }}" class="btn primary">Add Staff</a>
+    @if(session('success'))
+        <div class="alert-success">
+            {{ session('success') }}
+        </div>
+    @endif
+
+    {{-- Stats Cards --}}
+    <div class="stats-cards">
+        <div class="stat-card">
+            <div class="stat-icon total">
+                👥
+            </div>
+            <div class="stat-content">
+                <h3>{{ $staff->count() }}</h3>
+                <p>Total Staff</p>
+            </div>
+        </div>
+        <div class="stat-card">
+            <div class="stat-icon active">
+                ✅
+            </div>
+            <div class="stat-content">
+                <h3>{{ $staff->where('status', 'active')->count() }}</h3>
+                <p>Active Staff</p>
+            </div>
+        </div>
+        <div class="stat-card">
+            <div class="stat-icon" style="background: linear-gradient(135deg, #f3e8ff, #e9d5ff); color: #8b5cf6;">
+                👑
+            </div>
+            <div class="stat-content">
+                <h3>{{ $staff->unique('role')->count() }}</h3>
+                <p>Unique Roles</p>
+            </div>
+        </div>
+    </div>
+
+    {{-- Search Bar --}}
+    <div class="search-staff-bar">
+        <span class="search-icon">🔍</span>
+        <input type="text" id="searchInput" placeholder="Search by name, email, or employee ID...">
+        <div class="status-filter-container">
+            <select id="statusFilter" class="status-filter-select">
+                <option value="all">All Status</option>
+                <option value="active">Active</option>
+                <option value="inactive">Inactive</option>
+                <option value="pending">Pending</option>
+            </select>
+        </div>
+        <select id="roleFilter">
+            <option value="all">All Roles</option>
+            @foreach($staff->unique('role')->pluck('role') as $role)
+                @if($role)
+                    <option value="{{ $role }}">{{ ucfirst($role) }}</option>
+                @endif
+            @endforeach
+        </select>
+        <a href="{{ route('admin.staff.create') }}" class="btn-add-staff">
+            <span class="user-icon">➕</span>
+            Add Staff
+        </a>
+    </div>
+
+    {{-- Staff Table --}}
+    <div class="card">
+        <div class="card-header">
+            <h5 class="mb-0"><i class="bi bi-people me-2"></i> Staff Management</h5>
+        </div>
+
+        <div class="card-body p-0">
+            <div class="table-responsive">
+                <table class="table table-hover mb-0">
+                    <thead>
+                        <tr>
+                            <th>#</th>
+                            <th>Employee ID</th>
+                            <th>Name</th>
+                            <th>Email</th>
+                            <th>Phone</th>
+                            <th>Role</th>
+                            <th>Status</th>
+                            <th>Actions</th>
+                        </tr>
+                    </thead>
+
+                    <tbody id="staffTableBody">
+                        @php
+                            $totalStaff = count($staff);
+                        @endphp
+                        @forelse($staff as $s)
+                        <tr class="staff-row" data-status="{{ $s->status }}" data-role="{{ $s->role ?? '' }}">
+                            <td class="fw-bold">{{ $totalStaff - $loop->index }}</td>
+                            <td>
+                                <span class="employee-id-badge">{{ $s->employee_id }}</span>
+                            </td>
+                            <td>
+                                <div class="d-flex align-items-center gap-2">
+                                    <div style="width: 36px; height: 36px; border-radius: 50%; background: linear-gradient(135deg, #667eea, #764ba2); display: flex; align-items: center; justify-content: center; color: white; font-weight: bold;">
+                                        {{ strtoupper(substr($s->name, 0, 1)) }}
+                                    </div>
+                                    <span class="fw-medium">{{ $s->name }}</span>
+                                </div>
+                            </td>
+                            <td>{{ $s->email }}</td>
+                            <td>{{ $s->phone ?? '-' }}</td>
+                            <td>
+                                @if($s->role)
+                                    <span class="role-badge">{{ $s->role }}</span>
+                                @else
+                                    <span class="text-muted">-</span>
+                                @endif
+                            </td>
+                            <td>
+                                <span class="badge badge-{{ $s->status }}">
+                                    {{ ucfirst($s->status) }}
+                                </span>
+                            </td>
+                            <td>
+                                <div class="action-buttons">
+                                    <a href="{{ route('admin.staff.edit', $s->id) }}" class="btn-action btn-edit">
+                                        <i class="bi bi-pencil"></i>
+                                        Edit
+                                    </a>
+                                    <form action="{{ route('admin.staff.destroy', $s->id) }}" method="POST" style="display:inline" onsubmit="return confirm('Are you sure you want to delete this staff member?')">
+                                        @csrf
+                                        @method('DELETE')
+                                        <button type="submit" class="btn-action btn-delete">
+                                            <i class="bi bi-trash"></i>
+                                            Delete
+                                        </button>
+                                    </form>
+                                </div>
+                            </td>
+                        </tr>
+                        @empty
+                        <tr>
+                            <td colspan="8" class="text-center py-5 text-muted">
+                                <div class="empty-state">
+                                    No staff members found
+                                </div>
+                            </td>
+                        </tr>
+                        @endforelse
+                    </tbody>
+                </table>
+            </div>
+
+            {{-- Pagination --}}
+            <div class="pagination-container">
+                <div class="pagination-info" id="pageInfo">
+                    Showing 1 to {{ $staff->count() }} of {{ $staff->count() }} entries
+                </div>
+                <div class="pagination-controls">
+                    <button class="pagination-btn" id="prevPageBtn" title="Previous page" disabled>
+                        <i class="bi bi-chevron-left"></i>
+                    </button>
+                    <div class="pagination-pages" id="paginationPages">
+                        <button class="pagination-page-btn active">1</button>
+                    </div>
+                    <button class="pagination-btn" id="nextPageBtn" title="Next page" disabled>
+                        <i class="bi bi-chevron-right"></i>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
-<div class="card">
+<script>
-  @if(session('success'))
+// Pagination state
-    <div style="padding:.5rem; background:#e6ffed; border:1px solid #b6f0c6; margin-bottom:1rem;">{{ session('success') }}</div>
+let currentPage = 1;
-  @endif
+const itemsPerPage = 10;
+let allStaff = @json($staff);
+let filteredStaff = [...allStaff];
 
-  <table>
+// Initialize on page load
-    <thead>
+document.addEventListener('DOMContentLoaded', function() {
-      <tr>
+    renderTable();
-        <th>#</th>
+    updatePaginationControls();
-        <th>Employee ID</th>
+    
-        <th>Name</th>
+    // Bind pagination events
-        <th>Email</th>
+    document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
-        <th>Phone</th>
+    document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
-        <th>Role</th>
+
-        <th>Status</th>
+    // Filter functionality
-        <th>Actions</th>
+    const statusFilter = document.getElementById('statusFilter');
-      </tr>
+    const searchInput = document.getElementById('searchInput');
-    </thead>
+    const roleFilter = document.getElementById('roleFilter');
-    <tbody>
+
-      @forelse($staff as $s)
+    function filterStaff() {
-        <tr>
+        const selectedStatus = statusFilter.value;
-          <td>{{ $s->id }}</td>
+        const searchTerm = searchInput.value.toLowerCase();
-          <td class="muted">{{ $s->employee_id }}</td>
+        const selectedRole = roleFilter.value;
-          <td>{{ $s->name }}</td>
+
-          <td>{{ $s->email }}</td>
+        filteredStaff = allStaff.filter(staff => {
-          <td>{{ $s->phone }}</td>
+            let include = true;
-          <td>{{ $s->role ?? '-' }}</td>
+
-          <td>{{ ucfirst($s->status) }}</td>
+            // Status filter
-          <td class="actions">
+            if (selectedStatus !== 'all' && staff.status !== selectedStatus) {
-            <a href="{{ route('admin.staff.edit', $s->id) }}">Edit</a>
+                include = false;
-            <form action="{{ route('admin.staff.destroy', $s->id) }}" method="POST" style="display:inline" onsubmit="return confirm('Delete this staff?')">
+            }
-              @csrf
+
-              @method('DELETE')
+            // Role filter
-              <button class="btn" type="submit">Delete</button>
+            if (selectedRole !== 'all') {
-            </form>
+                const staffRole = staff.role || '';
-          </td>
+                if (staffRole.toLowerCase() !== selectedRole.toLowerCase()) {
-        </tr>
+                    include = false;
-      @empty
+                }
-        <tr><td colspan="8" class="muted">No staff found.</td></tr>
+            }
-      @endforelse
+
-    </tbody>
+            // Search filter
-  </table>
+            if (searchTerm) {
-</div>
+                const matchesSearch = 
+                    staff.name.toLowerCase().includes(searchTerm) ||
+                    staff.email.toLowerCase().includes(searchTerm) ||
+                    (staff.employee_id && staff.employee_id.toLowerCase().includes(searchTerm)) ||
+                    (staff.phone && staff.phone.toLowerCase().includes(searchTerm));
+                if (!matchesSearch) include = false;
+            }
+
+            return include;
+        });
+
+        currentPage = 1;
+        renderTable();
+        updatePaginationControls();
+    }
+
+    // Event listeners for filters
+    statusFilter.addEventListener('change', filterStaff);
+    searchInput.addEventListener('input', filterStaff);
+    roleFilter.addEventListener('change', filterStaff);
+
+    // Initialize filter
+    filterStaff();
+});
+
+// Pagination Functions
+function goToPreviousPage() {
+    if (currentPage > 1) {
+        currentPage--;
+        renderTable();
+        updatePaginationControls();
+    }
+}
+
+function goToNextPage() {
+    const totalPages = Math.ceil(filteredStaff.length / itemsPerPage);
+    if (currentPage < totalPages) {
+        currentPage++;
+        renderTable();
+        updatePaginationControls();
+    }
+}
+
+function updatePaginationControls() {
+    const totalPages = Math.ceil(filteredStaff.length / itemsPerPage);
+    const prevBtn = document.getElementById('prevPageBtn');
+    const nextBtn = document.getElementById('nextPageBtn');
+    const pageInfo = document.getElementById('pageInfo');
+    const paginationPages = document.getElementById('paginationPages');
+    
+    prevBtn.disabled = currentPage === 1;
+    nextBtn.disabled = currentPage === totalPages || totalPages === 0;
+    
+    // Update page info text
+    const startIndex = (currentPage - 1) * itemsPerPage + 1;
+    const endIndex = Math.min(currentPage * itemsPerPage, filteredStaff.length);
+    pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${filteredStaff.length} entries`;
+    
+    // Generate page numbers
+    paginationPages.innerHTML = '';
+    
+    if (totalPages <= 7) {
+        for (let i = 1; i <= totalPages; i++) {
+            addPageButton(i, paginationPages);
+        }
+    } else {
+        addPageButton(1, paginationPages);
+        
+        if (currentPage > 3) {
+            paginationPages.innerHTML += '<span class="pagination-ellipsis">...</span>';
+        }
+        
+        const start = Math.max(2, currentPage - 1);
+        const end = Math.min(totalPages - 1, currentPage + 1);
+        
+        for (let i = start; i <= end; i++) {
+            addPageButton(i, paginationPages);
+        }
+        
+        if (currentPage < totalPages - 2) {
+            paginationPages.innerHTML += '<span class="pagination-ellipsis">...</span>';
+        }
+        
+        addPageButton(totalPages, paginationPages);
+    }
+}
+
+function addPageButton(pageNumber, container) {
+    const button = document.createElement('button');
+    button.className = 'pagination-page-btn';
+    if (pageNumber === currentPage) {
+        button.classList.add('active');
+    }
+    button.textContent = pageNumber;
+    button.addEventListener('click', () => {
+        currentPage = pageNumber;
+        renderTable();
+        updatePaginationControls();
+    });
+    container.appendChild(button);
+}
+
+// Render Table
+function renderTable() {
+    const tbody = document.getElementById('staffTableBody');
+    
+    if (filteredStaff.length === 0) {
+        tbody.innerHTML = `
+            <tr>
+                <td colspan="8" class="text-center py-5 text-muted">
+                    <div class="empty-state">
+                        No staff members found matching your criteria
+                    </div>
+                </td>
+            </tr>
+        `;
+        return;
+    }
+    
+    const startIndex = (currentPage - 1) * itemsPerPage;
+    const endIndex = startIndex + itemsPerPage;
+    const paginatedItems = filteredStaff.slice(startIndex, endIndex);
+    
+    const sortedItems = [...paginatedItems].sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+    
+    tbody.innerHTML = '';
+    sortedItems.forEach((staff, index) => {
+        const displayIndex = filteredStaff.length - (startIndex + index);
+        const row = document.createElement('tr');
+        row.className = 'staff-row';
+        row.setAttribute('data-status', staff.status);
+        row.setAttribute('data-role', staff.role || '');
+        
+        row.innerHTML = `
+            <td class="fw-bold">${displayIndex}</td>
+            <td>
+                <span class="employee-id-badge">${staff.employee_id}</span>
+            </td>
+            <td>
+                <div class="d-flex align-items-center gap-2">
+                    <div style="width: 36px; height: 36px; border-radius: 50%; background: linear-gradient(135deg, #667eea, #764ba2); display: flex; align-items: center; justify-content: center; color: white; font-weight: bold;">
+                        ${staff.name ? staff.name.charAt(0).toUpperCase() : '?'}
+                    </div>
+                    <span class="fw-medium">${staff.name}</span>
+                </div>
+            </td>
+            <td>${staff.email}</td>
+            <td>${staff.phone || '-'}</td>
+            <td>
+                ${staff.role ? `<span class="role-badge">${staff.role}</span>` : '<span class="text-muted">-</span>'}
+            </td>
+            <td>
+                <span class="badge badge-${staff.status}">
+                    ${staff.status.charAt(0).toUpperCase() + staff.status.slice(1)}
+                </span>
+            </td>
+            <td>
+                <div class="action-buttons">
+                    <a href="/admin/staff/${staff.id}/edit" class="btn-action btn-edit">
+                        <i class="bi bi-pencil"></i>
+                        Edit
+                    </a>
+                    <form action="/admin/staff/${staff.id}" method="POST" style="display:inline" onsubmit="return confirm('Are you sure you want to delete this staff member?')">
+                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                        <input type="hidden" name="_method" value="DELETE">
+                        <button type="submit" class="btn-action btn-delete">
+                            <i class="bi bi-trash"></i>
+                            Delete
+                        </button>
+                    </form>
+                </div>
+            </td>
+        `;
+        tbody.appendChild(row);
+    });
+}
+</script>
 @endsection

routes/api.php

@@ -1,12 +1,17 @@
 <?php
 
+
+use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Http\Request;
+
+
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\RequestController;
 use App\Http\Controllers\UserAuthController;
 use App\Http\Controllers\MarkListController;
 use App\Http\Controllers\User\UserOrderController;
 use App\Http\Controllers\User\UserProfileController;
-
+use App\Http\Controllers\User\ChatController;
 
 //user send request
 Route::post('/signup-request', [RequestController::class, 'usersignup']);
@@ -15,9 +20,10 @@ Route::post('/signup-request', [RequestController::class, 'usersignup']);
 Route::post('/user/login', [UserAuthController::class, 'login']);
 
 
+Route::post('/auth/refresh', [UserAuthController::class, 'refreshToken']);
+
 
 Route::middleware(['auth:api'])->group(function () {
-    //Route::post('/user/refresh', [UserAuthController::class, 'refreshToken']);
 
     Route::post('/user/logout', [UserAuthController::class, 'logout']);
 
@@ -32,9 +38,10 @@ Route::middleware(['auth:api'])->group(function () {
     Route::get('/user/order/{order_id}/shipment', [UserOrderController::class, 'orderShipment']);
     Route::get('/user/order/{order_id}/invoice', [UserOrderController::class, 'orderInvoice']);
     Route::get('/user/order/{order_id}/track', [UserOrderController::class, 'trackOrder']);
-    Route::get('/user/invoice/{invoice_id}/details', [UserOrderController::class, 'invoiceDetails']);
+
 
     // Invoice List
+    Route::get('/user/invoice/{invoice_id}/details', [UserOrderController::class, 'invoiceDetails']);
     Route::get('/user/invoices', [UserOrderController::class, 'allInvoices']);
     Route::get('/user/invoice/{invoice_id}/installments', [UserOrderController::class, 'invoiceInstallmentsById']);
 
@@ -46,4 +53,40 @@ Route::middleware(['auth:api'])->group(function () {
     Route::post('/user/profile-update-request', [UserProfileController::class, 'updateProfileRequest']);
 
     // Route::post('/user/profile/update', [UserProfileController::class, 'updateProfile']);
+
+    // ===========================
+    // CHAT SUPPORT ROUTES
+    // ===========================
+    Route::get('/user/chat/start', [ChatController::class, 'startChat']);
+    Route::get('/user/chat/messages/{ticketId}', [ChatController::class, 'getMessages']);
+    Route::post('/user/chat/send/{ticketId}', [ChatController::class, 'sendMessage']);
+
+    
 });
+
+
+
+
+
+
+Route::post('/broadcasting/auth', function (Request $request) {
+
+    $user = auth('api')->user(); // JWT user (Flutter)
+
+    if (! $user) {
+        \Log::warning('BROADCAST AUTH FAILED - NO USER');
+        return response()->json(['message' => 'Unauthorized'], 401);
+    }
+        \Log::info('BROADCAST AUTH OK', [
+        'user_id' => $user->id,
+        'channel' => $request->channel_name,
+    ]);
+
+    return Broadcast::auth(
+        $request->setUserResolver(fn () => $user)
+    );
+});
+
+
+
+

routes/channels.php

@@ -0,0 +1,78 @@
+<?php
+
+use Illuminate\Support\Facades\Broadcast;
+use App\Models\SupportTicket;
+use App\Models\Admin;
+use Illuminate\Support\Facades\Log;
+
+file_put_contents(storage_path('logs/broadcast_debug.log'), now()." CHANNELS LOADED\n", FILE_APPEND);
+
+Broadcast::routes([
+    'middleware' => ['web', 'auth:admin'],
+]);
+
+Broadcast::channel('ticket.{ticketId}', function ($user, $ticketId) {
+
+    try {
+        // Very explicit logging to see what arrives here
+        Log::info("CHANNEL AUTH CHECK (ENTER)", [
+            'user_present' => $user !== null,
+            'user_type' => is_object($user) ? get_class($user) : gettype($user),
+            'user_id' => $user->id ?? null,
+            'ticketId' => $ticketId,
+        ]);
+
+        // Find ticket and log
+        $ticket = SupportTicket::find($ticketId);
+        Log::info("CHANNEL AUTH: found ticket", [
+            'ticket_exists' => $ticket ? true : false,
+            'ticket_id' => $ticket?->id,
+            'ticket_user_id' => $ticket?->user_id,
+        ]);
+
+        if (! $ticket) {
+            Log::warning("CHANNEL AUTH: ticket not found", ['ticketId' => $ticketId]);
+            return false;
+        }
+
+        // If admin, allow
+        if ($user instanceof Admin) {
+            Log::info("CHANNEL AUTH: admin allowed", ['admin_id' => $user->id]);
+            return true;
+        }
+
+        // If normal user, check ownership
+        if (is_object($user) && isset($user->id)) {
+            $allowed = $ticket->user_id === $user->id;
+            Log::info("CHANNEL AUTH: user allowed check", [
+                'ticket_user_id' => $ticket->user_id,
+                'current_user_id' => $user->id,
+                'allowed' => $allowed
+            ]);
+            return $allowed;
+        }
+
+        Log::warning("CHANNEL AUTH: default deny");
+        return false;
+
+    } catch (\Throwable $e) {
+        Log::error("CHANNEL AUTH ERROR", [
+            'message' => $e->getMessage(),
+            'trace' => $e->getTraceAsString()
+        ]);
+        return false;
+    }
+});
+
+Broadcast::channel('admin.chat', function ($admin) {
+    return auth('admin')->check();
+});
+
+// Broadcast::channel('ticket.{ticketId}', function ($admin, $ticketId) {
+//     \Log::info('CHANNEL AUTH OK', [
+//         'admin_id' => $admin->id,
+//         'ticketId' => $ticketId,
+//     ]);
+
+//     return true;
+// });

routes/web.php

@@ -11,6 +11,11 @@ use App\Http\Controllers\Admin\AdminCustomerController;
 use App\Http\Controllers\Admin\AdminAccountController;
 use App\Http\Controllers\Admin\AdminReportController;
 use App\Http\Controllers\Admin\AdminStaffController;
+use App\Http\Controllers\Admin\AdminChatController;
+use Illuminate\Session\Middleware\StartSession;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
+use Illuminate\Http\Request;
+
 
 // ---------------------------
 // Public Front Page
@@ -23,18 +28,25 @@ Route::get('/', function () {
 // ADMIN LOGIN ROUTES
 // ---------------------------
 // login routes (public)
-Route::prefix('admin')->group(function () {
+Route::prefix('admin')->middleware('web')->group(function () {
     Route::get('/login', [AdminAuthController::class, 'showLoginForm'])->name('admin.login');
     Route::post('/login', [AdminAuthController::class, 'login'])->name('admin.login.submit');
     Route::post('/logout', [AdminAuthController::class, 'logout'])->name('admin.logout');
+    
+
 });
+Route::get('/login', function () {
+    return redirect()->route('admin.login');
+})->name('login');
+
+
 
 
 // ==========================================
 // PROTECTED ADMIN ROUTES (session protected)
 // ==========================================
 Route::prefix('admin')
-    ->middleware('auth:admin')
+    ->middleware(['web', 'auth:admin'])
     ->group(function () {
 
         // Dashboard
@@ -121,6 +133,10 @@ Route::prefix('admin')
             Route::get('/orders/view/{id}', [AdminOrderController::class, 'popup'])
                 ->name('admin.orders.popup');
 
+            // Route::get('/orders/{id}', [AdminOrderController::class, 'view'])
+            //     ->name('admin.orders.view');
+           Route::get('/orders/{order:order_id}/see', [AdminOrderController::class, 'see'])
+    ->name('admin.orders.see');
         // ---------------------------
         // ORDERS (FIXED ROUTES)
         // ---------------------------
@@ -168,10 +184,20 @@ Route::prefix('admin')
                 Route::delete('/shipments/{id}', [ShipmentController::class, 'destroy'])
                     ->name('admin.shipments.destroy');
         
+             Route::get('/shipment/dummy/{id}', [ShipmentController::class, 'dummy'])
+                ->name('admin.shipments.dummy');
+
+                // web.php
+            Route::delete('/shipments/{shipment}/orders/{order}', 
+           [ShipmentController::class, 'removeOrder']
+            )->name('admin.shipments.removeOrder');
+            
+            Route::post('/shipments/{shipment}/add-orders',
+                [ShipmentController::class, 'addOrders']
+            )->name('admin.shipments.addOrders');
                     Route::get('/shipment/dummy/{id}', [ShipmentController::class, 'dummy'])
     ->name('admin.shipments.dummy');
 
-
         // ---------------------------
         // INVOICES
         // ---------------------------
@@ -199,8 +225,8 @@ Route::prefix('admin')
         ->name('admin.invoice.installment.delete');
 
 
-                //Add New Invoice
+            //     //Add New Invoice
-            Route::get('/admin/invoices/create', [InvoiceController::class, 'create'])->name('admin.invoices.create');
+             Route::get('/admin/invoices/create', [InvoiceController::class, 'create'])->name('admin.invoices.create');
         
 
         // ---------------------------
@@ -220,13 +246,26 @@ Route::prefix('admin')
 
             Route::post('/customers/{id}/status', [AdminCustomerController::class, 'toggleStatus'])
                 ->name('admin.customers.status');
+
+
+                            // Chat list page
+            Route::get('/chat-support', [AdminChatController::class, 'index'])
+                ->name('admin.chat_support');
+
+            // Chat window (open specific user's chat)
+            Route::get('/chat-support/{ticketId}', [AdminChatController::class, 'openChat'])
+                ->name('admin.chat.open');
+
+            // Admin sending message
+            Route::post('/chat-support/{ticketId}/send', [AdminChatController::class, 'sendMessage'])
+                ->name('admin.chat.send');
         });
 
     // ==========================================
     // ADMIN ACCOUNT (AJAX) ROUTES
     // ==========================================
         Route::prefix('admin/account')
-            ->middleware('auth:admin')
+            ->middleware(['web', 'auth:admin'])
             ->name('admin.account.')
             ->group(function () {
         
@@ -285,7 +324,7 @@ Route::prefix('admin')
             ->name('admin.orders.download.excel');
 
         
-            Route::prefix('admin/account')->middleware('auth:admin')->name('admin.account.')->group(function () {
+            Route::prefix('admin/account')->middleware(['web', 'auth:admin'])->name('admin.account.')->group(function () {
                 Route::post('/toggle-payment', [AdminAccountController::class, 'togglePayment'])->name('toggle');
             });
             
@@ -293,7 +332,7 @@ Route::prefix('admin')
           //Edit Button Route
         //---------------------------
        // protected admin routes
-    Route::middleware(['auth:admin'])
+    Route::middleware(['web', 'auth:admin'])
         ->prefix('admin')
         ->name('admin.')
         ->group(function () {

vite.config.js

@@ -5,7 +5,12 @@ import tailwindcss from '@tailwindcss/vite';
 export default defineConfig({
     plugins: [
         laravel({
-            input: ['resources/css/app.css', 'resources/js/app.js'],
+            input: [
+                "resources/css/app.css",
+                "resources/js/app.js",
+                "resources/js/echo.js",
+            ],
+
             refresh: true,
         }),
         tailwindcss(),