diff --git a/app/Http/Controllers/Admin/AdminAccountController.php b/app/Http/Controllers/Admin/AdminAccountController.php
index d760951..8b5d98d 100644
--- a/app/Http/Controllers/Admin/AdminAccountController.php
+++ b/app/Http/Controllers/Admin/AdminAccountController.php
@@ -11,6 +11,71 @@ use Illuminate\Support\Facades\DB;
 
 class AdminAccountController extends Controller
 {
+    public function updateEntry(Request $request)
+{
+    try {
+        $data = $request->validate([
+            'entry_no'       => 'required|exists:entries,entry_no',
+            'description'    => 'required|string|max:255',
+            'order_quantity' => 'required|numeric|min:0',
+        ]);
+
+        $entry = Entry::where('entry_no', $data['entry_no'])->first();
+
+        if (!$entry) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Entry not found.',
+            ], 404);
+        }
+
+        $entry->description    = $data['description'];
+        $entry->order_quantity = $data['order_quantity'];
+        $entry->save();
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Entry updated successfully.',
+            'entry'   => $entry,
+        ]);
+    } catch (\Throwable $e) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Server error: '.$e->getMessage(),
+        ], 500);
+    }
+}
+
+public function deleteEntry(Request $request)
+{
+    try {
+        $data = $request->validate([
+            'entry_no' => 'required|exists:entries,entry_no',
+        ]);
+
+        $entry = Entry::where('entry_no', $data['entry_no'])->first();
+
+        if (!$entry) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Entry not found.',
+            ], 404);
+        }
+
+        $entry->delete();
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Entry deleted successfully.',
+        ]);
+    } catch (\Throwable $e) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Server error: '.$e->getMessage(),
+        ], 500);
+    }
+}
+
     /**
      * 🚀 1. Get dashboard entries
      */
@@ -245,4 +310,82 @@ class AdminAccountController extends Controller
             'pending'         => $entry->pending_amount,
         ]);
     }
+
+    //--------------------------
+        //add order Entry
+    //--------------------------
+    public function addOrdersToEntry(Request $request)
+{
+    $data = $request->validate([
+        'entry_no'    => 'required|exists:entries,entry_no',
+        'order_ids'   => 'required|array',
+        'order_ids.*' => 'integer|exists:orders,id',
+    ]);
+
+    return DB::transaction(function () use ($data) {
+        $entry = Entry::where('entry_no', $data['entry_no'])->firstOrFail();
+
+        // आधीचे orders काढू नका, फक्त नवीन add करा
+        $entry->orders()->syncWithoutDetaching($data['order_ids']);
+
+        // इथे quantity auto update
+        $entry->order_quantity = $entry->orders()->count();
+        $entry->save();
+
+        $entry->load('orders');
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Orders added successfully.',
+            'entry'   => $entry,
+        ]);
+    });
 }
+
+
+
+public function getEntryOrders($entry_no)
+{
+    $entry = Entry::where('entry_no', $entry_no)
+        ->with('orders')
+        ->first();
+
+    if (!$entry) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Entry not found.',
+        ], 404);
+    }
+
+    return response()->json([
+        'success' => true,
+        'orders'  => $entry->orders,
+    ]);
+}
+
+public function removeOrderFromEntry(Request $request)
+{
+    $data = $request->validate([
+        'entry_no' => 'required|exists:entries,entry_no',
+        'order_id' => 'required|integer|exists:orders,id',
+    ]);
+
+    return DB::transaction(function () use ($data) {
+        $entry = Entry::where('entry_no', $data['entry_no'])->firstOrFail();
+
+        // order detach करा
+        $entry->orders()->detach($data['order_id']);
+
+        // इथे quantity auto update
+        $entry->order_quantity = $entry->orders()->count();
+        $entry->save();
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Order removed successfully.',
+            'entry'   => $entry,
+        ]);
+    });
+}
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/AdminCustomerController.php b/app/Http/Controllers/Admin/AdminCustomerController.php
index 393db9a..aab2cd1 100644
--- a/app/Http/Controllers/Admin/AdminCustomerController.php
+++ b/app/Http/Controllers/Admin/AdminCustomerController.php
@@ -9,36 +9,42 @@ use Illuminate\Support\Facades\Hash;
 
 class AdminCustomerController extends Controller
 {
+
+    
     // ---------------------------------------------------------
     // LIST CUSTOMERS (with search + status filter)
     // ---------------------------------------------------------
     public function index(Request $request)
-    {
-        $search = $request->search;
-        $status = $request->status;
+{
+    $search = $request->search;
+    $status = $request->status;
 
-        $query = User::with(['marks', 'orders'])->orderBy('id', 'desc');
+    $query = User::with(['marks', 'orders'])->orderBy('id', 'desc');
 
-        // SEARCH FILTER
-        if (!empty($search)) {
-            $query->where(function ($q) use ($search) {
-                $q->where('customer_name', 'like', "%$search%")
-                    ->orWhere('email', 'like', "%$search%")
-                    ->orWhere('mobile_no', 'like', "%$search%")
-                    ->orWhere('customer_id', 'like', "%$search%");
-            });
-        }
-
-        // STATUS FILTER
-        if (!empty($status) && in_array($status, ['active', 'inactive'])) {
-            $query->where('status', $status);
-        }
-
-        $customers = $query->get();
-
-        return view('admin.customers', compact('customers', 'search', 'status'));
+    // SEARCH FILTER
+    if (!empty($search)) {
+        $query->where(function ($q) use ($search) {
+            $q->where('customer_name', 'like', "%$search%")
+                ->orWhere('email', 'like', "%$search%")
+                ->orWhere('mobile_no', 'like', "%$search%")
+                ->orWhere('customer_id', 'like', "%$search%");
+        });
     }
 
+    // STATUS FILTER
+    if (!empty($status) && in_array($status, ['active', 'inactive'])) {
+        $query->where('status', $status);
+    }
+
+    // Get all customers for statistics (without pagination)
+    $allCustomers = $query->get();
+
+    // Get paginated customers for the table (10 per page)
+    $customers = $query->paginate(10);
+
+    return view('admin.customers', compact('customers', 'allCustomers', 'search', 'status'));
+}
+
     // ---------------------------------------------------------
     // SHOW ADD CUSTOMER FORM
     // ---------------------------------------------------------
@@ -130,5 +136,6 @@ class AdminCustomerController extends Controller
 
         return back()->with('success', 'Customer status updated.');
     }
+    
 
 }
diff --git a/app/Http/Controllers/Admin/AdminOrderController.php b/app/Http/Controllers/Admin/AdminOrderController.php
index 47a1da3..ce86dfc 100644
--- a/app/Http/Controllers/Admin/AdminOrderController.php
+++ b/app/Http/Controllers/Admin/AdminOrderController.php
@@ -7,28 +7,123 @@ use Illuminate\Http\Request;
 use App\Models\Order;
 use App\Models\OrderItem;
 use App\Models\MarkList;
+use App\Models\Invoice;
+use App\Models\InvoiceItem;
+use App\Models\User;
 
 class AdminOrderController extends Controller
 {
+    // ---------------------------
+    // LIST / DASHBOARD
+    // ---------------------------
     public function index()
     {
+        // raw list for admin dashboard (simple)
         $orders = Order::latest()->get();
         $markList = MarkList::where('status', 'active')->get();
 
         return view('admin.dashboard', compact('orders', 'markList'));
     }
 
-    // -------------------------------------------------------------------------
-    // STEP 1 : ADD TEMPORARY ITEM
-    // -------------------------------------------------------------------------
+    /**
+     * Orders list (detailed)
+     */
+    // public function orderShow()
+    // {
+    //     $orders = Order::with(['markList', 'shipments', 'invoice'])
+    //         ->latest('id')
+    //         ->get();
 
-    public function addTempItem(Request $request)
+    //     return view('admin.orders', compact('orders'));
+    // }
+
+    // ---------------------------
+    // CREATE NEW ORDER (simple DB flow)
+    // ---------------------------
+    /**
+     * Show create form (you can place create UI on separate view or dashboard)
+     */
+    public function create()
     {
-        // Validate item fields
-        $item = $request->validate([
-            'mark_no' => 'required',
-            'origin' => 'required',
-            'destination' => 'required',
+        // return a dedicated create view - create it at resources/views/admin/orders_create.blade.php
+        // If you prefer create UI on dashboard, change this to redirect route('admin.orders.index') etc.
+        $markList = MarkList::where('status', 'active')->get();
+        return view('admin.orders_create', compact('markList'));
+    }
+
+    /**
+     * Store a new order and optionally create initial invoice
+     */
+    public function store(Request $request)
+    {
+        $data = $request->validate([
+            'mark_no' => 'required|string',
+            'origin' => 'nullable|string',
+            'destination' => 'nullable|string',
+            // totals optional when creating without items
+            'ctn' => 'nullable|numeric',
+            'qty' => 'nullable|numeric',
+            'ttl_qty' => 'nullable|numeric',
+            'ttl_amount' => 'nullable|numeric',
+            'cbm' => 'nullable|numeric',
+            'ttl_cbm' => 'nullable|numeric',
+            'kg' => 'nullable|numeric',
+            'ttl_kg' => 'nullable|numeric',
+        ]);
+
+        $order = Order::create([
+            'order_id' => $this->generateOrderId(),
+            'mark_no' => $data['mark_no'],
+            'origin' => $data['origin'] ?? null,
+            'destination' => $data['destination'] ?? null,
+            'ctn' => $data['ctn'] ?? 0,
+            'qty' => $data['qty'] ?? 0,
+            'ttl_qty' => $data['ttl_qty'] ?? 0,
+            'ttl_amount' => $data['ttl_amount'] ?? 0,
+            'cbm' => $data['cbm'] ?? 0,
+            'ttl_cbm' => $data['ttl_cbm'] ?? 0,
+            'kg' => $data['kg'] ?? 0,
+            'ttl_kg' => $data['ttl_kg'] ?? 0,
+            'status' => 'pending',
+        ]);
+
+        // If you want to auto-create an invoice at order creation, uncomment:
+        // $this->createInvoice($order);
+
+        return redirect()->route('admin.orders.show', $order->id)
+                         ->with('success', 'Order created successfully.');
+    }
+
+    // ---------------------------
+    // SHOW / POPUP
+    // ---------------------------
+    public function show($id)
+    {
+        $order = Order::with('items', 'markList')->findOrFail($id);
+        $user = $this->getCustomerFromOrder($order);
+
+        return view('admin.orders_show', compact('order', 'user'));
+    }
+
+    // public function popup($id)
+    // {
+    //     $order = Order::with(['items', 'markList'])->findOrFail($id);
+    //     $user = $this->getCustomerFromOrder($order);
+
+    //     return view('admin.popup', compact('order', 'user'));
+    // }
+
+    // ---------------------------
+    // ORDER ITEM MANAGEMENT (DB)
+    // ---------------------------
+    /**
+     * Add an item to an existing order
+     */
+    public function addItem(Request $request, $orderId)
+    {
+        $order = Order::findOrFail($orderId);
+
+        $data = $request->validate([
             'description' => 'required|string',
             'ctn' => 'nullable|numeric',
             'qty' => 'nullable|numeric',
@@ -43,233 +138,207 @@ class AdminOrderController extends Controller
             'shop_no' => 'nullable|string',
         ]);
 
-        // ❌ Prevent changing mark_no once first item added
-        if (session()->has('mark_no') && session('mark_no') != $request->mark_no) {
-            return redirect()->to(route('admin.orders.index') . '#createOrderForm')
-                             ->with('error', 'You must finish or clear the current order before changing Mark No.');
-        }
+        $data['order_id'] = $order->id;
 
-        // Save mark, origin, destination ONLY ONCE
-        if (!session()->has('mark_no')) {
-            session([
-                'mark_no' => $request->mark_no,
-                'origin' => $request->origin,
-                'destination' => $request->destination
+        OrderItem::create($data);
+
+        // recalc totals and save to order
+        $this->recalcTotals($order);
+
+        return redirect()->back()->with('success', 'Item added and totals updated.');
+    }
+
+    /**
+     * Soft-delete an order item and recalc totals
+     */
+    public function deleteItem($id)
+    {
+        $item = OrderItem::findOrFail($id);
+        $order = $item->order;
+
+        $item->delete(); // soft delete
+
+        // recalc totals
+        $this->recalcTotals($order);
+
+        return redirect()->back()->with('success', 'Item deleted and totals updated.');
+    }
+
+    /**
+     * Restore soft-deleted item and recalc totals
+     */
+    public function restoreItem($id)
+    {
+        $item = OrderItem::withTrashed()->findOrFail($id);
+        $order = Order::findOrFail($item->order_id);
+
+        $item->restore();
+
+        // recalc totals
+        $this->recalcTotals($order);
+
+        return redirect()->back()->with('success', 'Item restored and totals updated.');
+    }
+
+    // ---------------------------
+    // ORDER CRUD: update / destroy
+    // ---------------------------
+    public function update(Request $request, $id)
+    {
+        $order = Order::findOrFail($id);
+
+        $data = $request->validate([
+            'mark_no' => 'required|string',
+            'origin' => 'nullable|string',
+            'destination' => 'nullable|string',
+        ]);
+
+        $order->update([
+            'mark_no' => $data['mark_no'],
+            'origin' => $data['origin'] ?? null,
+            'destination' => $data['destination'] ?? null,
+        ]);
+
+        // optionally recalc totals (not necessary unless you change item-level fields here)
+        $this->recalcTotals($order);
+
+        return redirect()->route('admin.orders.show', $order->id)
+                         ->with('success', 'Order updated successfully.');
+    }
+
+    /**
+     * Soft-delete whole order and its items (soft-delete items first then order)
+     */
+    public function destroy($id)
+    {
+        $order = Order::findOrFail($id);
+
+        // soft-delete items first (so they show up in onlyTrashed for restore)
+        OrderItem::where('order_id', $order->id)->delete();
+
+        // then soft-delete order
+        $order->delete();
+
+        return redirect()->route('admin.orders.index')
+                         ->with('success', 'Order deleted successfully.');
+    }
+
+    // ---------------------------
+    // HELPERS
+    // ---------------------------
+    /**
+     * Recalculate totals for the order from current (non-deleted) items
+     */
+    private function recalcTotals(Order $order)
+    {
+        // make sure we re-query live items (non-deleted)
+        $items = $order->items()->get();
+
+        $order->update([
+            'ctn'       => (int) $items->sum(fn($i) => (int) ($i->ctn ?? 0)),
+            'qty'       => (int) $items->sum(fn($i) => (int) ($i->qty ?? 0)),
+            'ttl_qty'   => (int) $items->sum(fn($i) => (int) ($i->ttl_qty ?? 0)),
+            'ttl_amount'=> (float) $items->sum(fn($i) => (float) ($i->ttl_amount ?? 0)),
+            'cbm'       => (float) $items->sum(fn($i) => (float) ($i->cbm ?? 0)),
+            'ttl_cbm'   => (float) $items->sum(fn($i) => (float) ($i->ttl_cbm ?? 0)),
+            'kg'        => (float) $items->sum(fn($i) => (float) ($i->kg ?? 0)),
+            'ttl_kg'    => (float) $items->sum(fn($i) => (float) ($i->ttl_kg ?? 0)),
+        ]);
+    }
+
+    /**
+     * Generate order id (keeps old format)
+     */
+    private function generateOrderId()
+    {
+        $year = date('y');
+        $prefix = "KNT-$year-";
+
+        $lastOrder = Order::latest('id')->first();
+        $nextNumber = $lastOrder ? intval(substr($lastOrder->order_id, -8)) + 1 : 1;
+
+        return $prefix . str_pad($nextNumber, 8, '0', STR_PAD_LEFT);
+    }
+
+    // ---------------------------
+    // INVOICE CREATION (optional helper used by store/finish)
+    // ---------------------------
+    private function createInvoice(Order $order)
+    {
+        $invoiceNumber = $this->generateInvoiceNumber();
+        $customer = $this->getCustomerFromMarkList($order->mark_no);
+        $totalAmount = $order->ttl_amount;
+
+        $invoice = Invoice::create([
+            'order_id' => $order->id,
+            'customer_id' => $customer->id ?? null,
+            'mark_no' => $order->mark_no,
+            'invoice_number' => $invoiceNumber,
+            'invoice_date' => now(),
+            'due_date' => now()->addDays(10),
+            'payment_method' => null,
+            'reference_no' => null,
+            'status' => 'pending',
+            'final_amount' => $totalAmount,
+            'gst_percent' => 0,
+            'gst_amount' => 0,
+            'final_amount_with_gst' => $totalAmount,
+            'customer_name' => $customer->customer_name ?? null,
+            'company_name' => $customer->company_name ?? null,
+            'customer_email' => $customer->email ?? null,
+            'customer_mobile' => $customer->mobile_no ?? null,
+            'customer_address' => $customer->address ?? null,
+            'pincode' => $customer->pincode ?? null,
+            'notes' => null,
+            'pdf_path' => null,
+        ]);
+
+        // clone order items into invoice items
+        foreach ($order->items as $item) {
+            InvoiceItem::create([
+                'invoice_id' => $invoice->id,
+                'description' => $item->description,
+                'ctn' => $item->ctn,
+                'qty' => $item->qty,
+                'ttl_qty' => $item->ttl_qty,
+                'unit' => $item->unit,
+                'price' => $item->price,
+                'ttl_amount' => $item->ttl_amount,
+                'cbm' => $item->cbm,
+                'ttl_cbm' => $item->ttl_cbm,
+                'kg' => $item->kg,
+                'ttl_kg' => $item->ttl_kg,
+                'shop_no' => $item->shop_no,
             ]);
         }
-
-        // ❌ DO NOT overwrite these values again
-        // session(['mark_no' => $request->mark_no]);
-        // session(['origin' => $request->origin]);
-        // session(['destination' => $request->destination]);
-
-        // Add new sub-item into session
-        session()->push('temp_order_items', $item);
-
-        return redirect()->to(route('admin.orders.index') . '#createOrderForm')
-                         ->with('success', 'Item added.');
     }
 
-    // -------------------------------------------------------------------------
-    // STEP 2 : DELETE TEMPORARY ITEM
-    // -------------------------------------------------------------------------
-
-    public function deleteTempItem(Request $request)
+    private function generateInvoiceNumber()
     {
-        $index = $request->index;
+        $lastInvoice = Invoice::latest()->first();
+        $nextInvoice = $lastInvoice ? $lastInvoice->id + 1 : 1;
 
-        $items = session('temp_order_items', []);
+        return 'INV-' . date('Y') . '-' . str_pad($nextInvoice, 6, '0', STR_PAD_LEFT);
+    }
 
-        if (isset($items[$index])) {
-            unset($items[$index]);
-            session(['temp_order_items' => array_values($items)]);
+    private function getCustomerFromMarkList($markNo)
+    {
+        $markList = MarkList::where('mark_no', $markNo)->first();
+
+        if ($markList && $markList->customer_id) {
+            return User::where('customer_id', $markList->customer_id)->first();
         }
 
-        // If no items left → reset mark_no lock
-        if (empty($items)) {
-            session()->forget(['mark_no', 'origin', 'destination']);
-        }
-
-        return redirect()->to(route('admin.orders.index') . '#createOrderForm')
-                         ->with('success', 'Item removed successfully.');
+        return null;
     }
 
-    // -------------------------------------------------------------------------
-    // STEP 3 : FINISH ORDER
-    // -------------------------------------------------------------------------
-
-    public function finishOrder(Request $request)
-{
-    $request->validate([
-        'mark_no' => 'required',
-        'origin' => 'required',
-        'destination' => 'required',
-    ]);
-
-    $items = session('temp_order_items', []);
-
-    if (empty($items)) {
-        return redirect()->to(route('admin.orders.index') . '#createOrderForm')
-                         ->with('error', 'Add at least one item before finishing.');
-    }
-
-    // =======================
-    // GENERATE ORDER ID
-    // =======================
-    $year = date('y');
-    $prefix = "KNT-$year-";
-
-    $lastOrder = Order::latest('id')->first();
-    $nextNumber = $lastOrder ? intval(substr($lastOrder->order_id, -8)) + 1 : 1;
-
-    $orderId = $prefix . str_pad($nextNumber, 8, '0', STR_PAD_LEFT);
-
-    // =======================
-    // TOTAL SUMS
-    // =======================
-    $total_ctn = array_sum(array_column($items, 'ctn'));
-    $total_qty = array_sum(array_column($items, 'qty'));
-    $total_ttl_qty = array_sum(array_column($items, 'ttl_qty'));
-    $total_amount = array_sum(array_column($items, 'ttl_amount'));
-    $total_cbm = array_sum(array_column($items, 'cbm'));
-    $total_ttl_cbm = array_sum(array_column($items, 'ttl_cbm'));
-    $total_kg = array_sum(array_column($items, 'kg'));
-    $total_ttl_kg = array_sum(array_column($items, 'ttl_kg'));
-
-    // =======================
-    // CREATE ORDER
-    // =======================
-    $order = Order::create([
-        'order_id' => $orderId,
-        'mark_no' => $request->mark_no,
-        'origin' => $request->origin,
-        'destination' => $request->destination,
-        'ctn' => $total_ctn,
-        'qty' => $total_qty,
-        'ttl_qty' => $total_ttl_qty,
-        'ttl_amount' => $total_amount,
-        'cbm' => $total_cbm,
-        'ttl_cbm' => $total_ttl_cbm,
-        'kg' => $total_kg,
-        'ttl_kg' => $total_ttl_kg,
-        'status' => 'pending',
-    ]);
-
-    // SAVE ORDER ITEMS
-    foreach ($items as $item) {
-        OrderItem::create([
-            'order_id' => $order->id,
-            'description' => $item['description'],
-            'ctn' => $item['ctn'],
-            'qty' => $item['qty'],
-            'ttl_qty' => $item['ttl_qty'],
-            'unit' => $item['unit'],
-            'price' => $item['price'],
-            'ttl_amount' => $item['ttl_amount'],
-            'cbm' => $item['cbm'],
-            'ttl_cbm' => $item['ttl_cbm'],
-            'kg' => $item['kg'],
-            'ttl_kg' => $item['ttl_kg'],
-            'shop_no' => $item['shop_no'],
-        ]);
-    }
-
-    // =======================
-    // INVOICE CREATION START
-    // =======================
-
-    // 1. Auto-generate invoice number
-    $lastInvoice = \App\Models\Invoice::latest()->first();
-    $nextInvoice = $lastInvoice ? $lastInvoice->id + 1 : 1;
-    $invoiceNumber = 'INV-' . date('Y') . '-' . str_pad($nextInvoice, 6, '0', STR_PAD_LEFT);
-
-    // 2. Fetch customer (using mark list → customer_id)
-    $markList = MarkList::where('mark_no', $order->mark_no)->first();
-    $customer = null;
-
-    if ($markList && $markList->customer_id) {
-        $customer = \App\Models\User::where('customer_id', $markList->customer_id)->first();
-    }
-
-    // 3. Create Invoice Record
-    $invoice = \App\Models\Invoice::create([
-        'order_id' => $order->id,
-        'customer_id' => $customer->id ?? null,
-        'mark_no' => $order->mark_no,
-
-        'invoice_number' => $invoiceNumber,
-        'invoice_date' => now(),
-        'due_date' => now()->addDays(10),
-
-        'payment_method' => null,
-        'reference_no' => null,
-        'status' => 'pending',
-
-        'final_amount' => $total_amount,
-        'gst_percent' => 0,
-        'gst_amount' => 0,
-        'final_amount_with_gst' => $total_amount,
-
-        // snapshot customer fields
-        'customer_name' => $customer->customer_name ?? null,
-        'company_name' => $customer->company_name ?? null,
-        'customer_email' => $customer->email ?? null,
-        'customer_mobile' => $customer->mobile_no ?? null,
-        'customer_address' => $customer->address ?? null,
-        'pincode' => $customer->pincode ?? null,
-
-        'notes' => null,
-    ]);
-
-    // 4. Clone order items into invoice_items
-    foreach ($order->items as $item) {
-        \App\Models\InvoiceItem::create([
-            'invoice_id' => $invoice->id,
-            'description' => $item->description,
-            'ctn' => $item->ctn,
-            'qty' => $item->qty,
-            'ttl_qty' => $item->ttl_qty,
-            'unit' => $item->unit,
-            'price' => $item->price,
-            'ttl_amount' => $item->ttl_amount,
-            'cbm' => $item->cbm,
-            'ttl_cbm' => $item->ttl_cbm,
-            'kg' => $item->kg,
-            'ttl_kg' => $item->ttl_kg,
-            'shop_no' => $item->shop_no,
-        ]);
-    }
-
-    // 5. TODO: PDF generation (I will add this later)
-    $invoice->pdf_path = null; // placeholder for now
-    $invoice->save();
-
-    // =======================
-    // END INVOICE CREATION
-    // =======================
-
-    // CLEAR TEMP DATA
-    session()->forget(['temp_order_items', 'mark_no', 'origin', 'destination']);
-
-    return redirect()->route('admin.orders.index')
-                     ->with('success', 'Order + Invoice created successfully.');
-}
-
-
-    // -------------------------------------------------------------------------
-    // ORDER SHOW PAGE
-    // -------------------------------------------------------------------------
-
-    public function show($id)
+    private function getCustomerFromOrder($order)
     {
-        $order = Order::with('items', 'markList')->findOrFail($id);
-
-        $user = null;
         if ($order->markList && $order->markList->customer_id) {
-            $user = \App\Models\User::where('customer_id', $order->markList->customer_id)->first();
+            return User::where('customer_id', $order->markList->customer_id)->first();
         }
 
-        return view('admin.orders_show', compact('order', 'user'));
+        return null;
     }
 
     public function popup($id)
@@ -309,5 +378,46 @@ class AdminOrderController extends Controller
 
         return view('admin.orders', compact('orders'));
     }
+    
+public function downloadPdf(Request $request)
+{
+    $query = Order::with(['markList', 'invoice', 'shipments']);
+    
+    // Apply filters
+    if ($request->has('search') && $request->search) {
+        $search = $request->search;
+        $query->where(function($q) use ($search) {
+            $q->where('order_id', 'like', "%{$search}%")
+              ->orWhereHas('markList', function($q) use ($search) {
+                  $q->where('company_name', 'like', "%{$search}%");
+              })
+              ->orWhereHas('invoice', function($q) use ($search) {
+                  $q->where('invoice_number', 'like', "%{$search}%");
+              });
+        });
+    }
+    
+    if ($request->has('status') && $request->status) {
+        $query->whereHas('invoice', function($q) use ($request) {
+            $q->where('status', $request->status);
+        });
+    }
+    
+    if ($request->has('shipment') && $request->shipment) {
+        $query->whereHas('shipments', function($q) use ($request) {
+            $q->where('status', $request->shipment);
+        });
+    }
+    
+    $orders = $query->get();
+    
+    $pdf = PDF::loadView('admin.orders.pdf', compact('orders'));
+    return $pdf->download('orders-report-' . date('Y-m-d') . '.pdf');
+}
+
+public function downloadExcel(Request $request)
+{
+    return Excel::download(new OrdersExport($request), 'orders-report-' . date('Y-m-d') . '.xlsx');
+}
 
 }
diff --git a/app/Http/Controllers/Admin/ShipmentController.php b/app/Http/Controllers/Admin/ShipmentController.php
index c0883fd..d281059 100644
--- a/app/Http/Controllers/Admin/ShipmentController.php
+++ b/app/Http/Controllers/Admin/ShipmentController.php
@@ -14,7 +14,7 @@ class ShipmentController extends Controller
     /**
      * Show shipment page (Create Shipment + Shipment List)
      */
-   public function index()
+    public function index()
     {
         // 1) Get all used order IDs
         $usedOrderIds = ShipmentItem::pluck('order_id')->toArray();
@@ -29,8 +29,6 @@ class ShipmentController extends Controller
         return view('admin.shipments', compact('availableOrders', 'shipments'));
     }
 
-
-
     /**
      * Store new shipment
      */
@@ -115,8 +113,6 @@ class ShipmentController extends Controller
         return redirect()->back()->with('success', "Shipment $newShipmentId created successfully!");
     }
 
-
-
     /**
      * Show shipment details (for modal popup)
      */
@@ -135,8 +131,6 @@ class ShipmentController extends Controller
         ]);
     }
 
-
-
     /**
      * Update Shipment status from action button
      */
@@ -164,5 +158,55 @@ class ShipmentController extends Controller
         );
     }
 
+    /**
+     * Update shipment details
+     */
+    public function update(Request $request, $id)
+    {
+        $shipment = Shipment::findOrFail($id);
 
-}
+        $data = $request->validate([
+            'origin'        => 'required|string',
+            'destination'   => 'required|string',
+            'shipment_date' => 'required|date',
+            'status'        => 'required|string',
+        ]);
+
+        $shipment->update($data);
+
+        // If it's an AJAX request, return JSON response
+        if ($request->ajax() || $request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Shipment updated successfully.'
+            ]);
+        }
+
+        return redirect()->back()->with('success', 'Shipment updated successfully.');
+    }
+
+    /**
+     * Delete shipment permanently
+     */
+    public function destroy($id, Request $request)
+    {
+        $shipment = Shipment::findOrFail($id);
+
+        // Delete shipment items
+        ShipmentItem::where('shipment_id', $shipment->id)->delete();
+
+        // Delete shipment itself
+        $shipment->delete();
+
+        // If it's an AJAX request, return JSON response
+        if ($request->ajax() || $request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Shipment deleted successfully.'
+            ]);
+        }
+
+        return redirect()->route('admin.shipments')
+                        ->with('success', 'Shipment deleted successfully.');
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/RequestController.php b/app/Http/Controllers/RequestController.php
index 685271c..e2078c1 100644
--- a/app/Http/Controllers/RequestController.php
+++ b/app/Http/Controllers/RequestController.php
@@ -44,6 +44,8 @@ class RequestController extends Controller
             'pincode' => $request->pincode,
             'date' => Carbon::now()->toDateString(), // Auto current date
             'status' => 'pending', // Default status
+
+            
         ]);
 
         // ✅ Response
diff --git a/app/Models/Order.php b/app/Models/Order.php
index d3691c8..029cf35 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -4,11 +4,13 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
 
 class Order extends Model
 {
-    use HasFactory;
-
+    use HasFactory,SoftDeletes;
+    
     protected $fillable = [
         'order_id',
         'mark_no',
diff --git a/app/Models/OrderItem.php b/app/Models/OrderItem.php
index 75cd416..6d37939 100644
--- a/app/Models/OrderItem.php
+++ b/app/Models/OrderItem.php
@@ -4,10 +4,11 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class OrderItem extends Model
 {
-    use HasFactory;
+     use HasFactory, SoftDeletes;
 
     protected $fillable = [
         'order_id',
diff --git a/database/migrations/2025_11_24_131305_create_invoice_installments_table.php b/database/migrations/2025_11_24_131305_create_invoice_installments_table.php
index f9e33cc..d1c540f 100644
--- a/database/migrations/2025_11_24_131305_create_invoice_installments_table.php
+++ b/database/migrations/2025_11_24_131305_create_invoice_installments_table.php
@@ -8,23 +8,16 @@ return new class extends Migration
 {
     public function up(): void
     {
-        Schema::create('invoice_installments', function (Blueprint $table) {
-            $table->id();
-
-            $table->unsignedBigInteger('invoice_id');
-            $table->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
-
-            $table->date('installment_date');
-            $table->string('payment_method')->nullable(); // cash, bank, UPI, cheque, etc
-            $table->string('reference_no')->nullable();
-            $table->decimal('amount', 10, 2);
-
-            $table->timestamps();
+        // Table already exists. Add updates here if needed.
+        Schema::table('invoice_installments', function (Blueprint $table) {
+            // nothing to update
         });
     }
 
     public function down(): void
     {
-        Schema::dropIfExists('invoice_installments');
+        Schema::table('invoice_installments', function (Blueprint $table) {
+            // nothing to rollback
+        });
     }
 };
diff --git a/database/migrations/2025_11_28_182057_add_soft_deletes_to_orders_table.php b/database/migrations/2025_11_28_182057_add_soft_deletes_to_orders_table.php
new file mode 100644
index 0000000..4d837c8
--- /dev/null
+++ b/database/migrations/2025_11_28_182057_add_soft_deletes_to_orders_table.php
@@ -0,0 +1,22 @@
+<?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('order_items', function (Blueprint $table) {
+            $table->softDeletes();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('order_items', function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+    }
+};
diff --git a/database/migrations/2025_11_29_045236_add_deleted_at_to_order_items_table.php b/database/migrations/2025_11_29_045236_add_deleted_at_to_order_items_table.php
new file mode 100644
index 0000000..660229b
--- /dev/null
+++ b/database/migrations/2025_11_29_045236_add_deleted_at_to_order_items_table.php
@@ -0,0 +1,26 @@
+<?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('order_items', function (Blueprint $table) {
+            if (! Schema::hasColumn('order_items', 'deleted_at')) {
+                $table->softDeletes(); // adds deleted_at (nullable timestamp)
+            }
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('order_items', function (Blueprint $table) {
+            if (Schema::hasColumn('order_items', 'deleted_at')) {
+                $table->dropSoftDeletes(); // drops deleted_at
+            }
+        });
+    }
+};
diff --git a/public/invoices/invoice-INV-2025-000026.pdf b/public/invoices/invoice-INV-2025-000026.pdf
new file mode 100644
index 0000000..619708c
Binary files /dev/null and b/public/invoices/invoice-INV-2025-000026.pdf differ
diff --git a/resources/views/admin/account.blade.php b/resources/views/admin/account.blade.php
index 454de4c..cf3d3a3 100644
--- a/resources/views/admin/account.blade.php
+++ b/resources/views/admin/account.blade.php
@@ -66,29 +66,38 @@ body {
   color:#fff; border:none; padding:10px 16px; border-radius:10px; font-weight:600;
   cursor:pointer; transition: transform .15s ease, box-shadow .15s;
 }
-.btn.ghost { background: transparent; color:var(--primary-1); border:1px solid #dbe4f5; box-shadow:none; }
+.btn.ghost { background: transparent; color:var(--primary-1); border:1.5px solid #dbe4f5; box-shadow:none; }
 .btn:hover{ transform: translateY(-3px); box-shadow: 0 8px 26px rgba(36,58,114,0.12); }
 
 /* account panels */
 .account-panels { 
   display:flex; 
   gap:22px; 
-  align-items:flex-start; 
+  align-items:stretch;
   flex-wrap:wrap; 
 }
+
+/* Payment block with pagination */
+.payment-block {
+  flex:1; 
+  min-width:48%;
+  display: flex;
+  flex-direction: column;
+}
+
 .panel-card {
   background: var(--card-bg); 
   border-radius:12px; 
   box-shadow:0 8px 20px rgba(25,40,80,0.06);
-  flex:1; 
-  min-width:48%; 
   padding:22px; 
   box-sizing:border-box; 
   overflow-x:auto; 
   transition: transform .12s, box-shadow .12s;
-  min-height: 480px;
+  min-height: 520px;
   display: flex;
   flex-direction: column;
+  flex: 1;
+  height: 100%;
 }
 .panel-card:hover{ transform: translateY(-4px); box-shadow:0 12px 28px rgba(25,40,80,0.08); }
 .panel-title { 
@@ -139,12 +148,11 @@ tr:hover td{ background:#fbfdff; }
     text-align: center;
     box-shadow: 0 2px 8px rgba(33, 43, 90, 0.07);
     letter-spacing: 0.1px;
-    background: #6b7280; /* fallback */
+    background: #6b7280;
     transition: box-shadow 0.22s, transform 0.17s, background 0.22s;
     vertical-align: middle;
     margin: 3px 2px;
     cursor: default;
-    /* subtle glass effect */
     backdrop-filter: blur(2px);
     width: 99px;
 }
@@ -199,7 +207,7 @@ tr:hover td{ background:#fbfdff; }
     -webkit-appearance:none;
     width:60px;
     height:24px;
-    background:#f25b5b;  /* RED */
+    background:#f25b5b;
     border:2px solid #f25b5b;
     border-radius:999px;
     position:relative;
@@ -305,6 +313,7 @@ tr:hover td{ background:#fbfdff; }
     margin-top: 15px;
     padding: 12px 0;
     border-top: 1px solid #eef3fb;
+    margin-right:550px;
 }
 
 .pagination-info {
@@ -317,6 +326,8 @@ tr:hover td{ background:#fbfdff; }
     display: flex;
     align-items: center;
     gap: 8px;
+    margin-right:-1050px;
+    
 }
 
 .pagination-btn {
@@ -505,6 +516,190 @@ tr:hover td{ background:#fbfdff; }
   margin-top:16px; 
 }
 
+/* Filter section styles - FOR BOTH TABLES */
+.payment-filters, .order-filters {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+    margin-bottom: 16px;
+    flex-wrap: wrap;
+    padding: 14px 16px;
+    background: linear-gradient(90deg, #f8fbff, #f5f9ff);
+    border-radius: 10px;
+    border: 1px solid #eef3fb;
+    width: 480px;
+    max-width: 480px;
+}
+
+.filter-group {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+}
+
+.filter-label {
+    font-size: 13px;
+    font-weight: 600;
+    color: var(--primary-1);
+}
+
+.filter-control {
+    padding: 8px 12px;
+    border-radius: 8px;
+    border: 1px solid #e3eaf6;
+    background: #fff;
+    font-size: 14px;
+    min-width: 140px;
+}
+
+.filter-control:focus {
+    outline: none;
+    border-color: var(--primary-1);
+    box-shadow: 0 0 0 2px rgba(26, 41, 81, 0.1);
+}
+
+.filter-actions {
+    display: flex;
+    gap: 8px;
+    align-items: flex-end;
+}
+
+/* Action buttons in table */
+.action-btn {
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    padding: 6px 8px;
+    border-radius: 6px;
+    transition: all 0.2s ease;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.edit-btn {
+    color: var(--primary-1);
+}
+
+.edit-btn:hover {
+    background: rgba(26, 41, 81, 0.08);
+}
+
+.delete-btn {
+    color: var(--danger);
+}
+
+.delete-btn:hover {
+    background: rgba(239, 79, 79, 0.08);
+}
+
+.action-btns {
+    display: flex;
+    gap: 4px;
+    justify-content: center;
+}
+
+/* Edit modal styles */
+.edit-modal .modal-box1 {
+    max-width: 800px;
+}
+
+.edit-form-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 16px;
+    margin-bottom: 16px;
+}
+
+.edit-form-actions {
+    display: flex;
+    gap: 12px;
+    justify-content: flex-end;
+    margin-top: 20px;
+}
+
+/* Order management in edit modal */
+.order-management-section {
+    margin-top: 20px;
+    border-top: 1px solid #eef3fb;
+    padding-top: 16px;
+}
+
+.order-management-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12px;
+}
+
+.order-management-title {
+    font-weight: 700;
+    color: var(--primary-1);
+    font-size: 16px;
+}
+
+.orders-table-container {
+    max-height: 300px;
+    overflow-y: auto;
+    border: 1px solid #eef3fb;
+    border-radius: 8px;
+    margin-bottom: 12px;
+}
+
+.orders-table {
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 13px;
+}
+
+.orders-table th {
+    background: #f8fbff;
+    padding: 10px 12px;
+    text-align: left;
+    font-weight: 600;
+    color: var(--primary-1);
+    border-bottom: 1px solid #eef3fb;
+    position: sticky;
+    top: 0;
+}
+
+.orders-table td {
+    padding: 10px 12px;
+    border-bottom: 1px solid #f1f6ff;
+}
+
+.order-actions {
+    display: flex;
+    gap: 6px;
+}
+
+.remove-order-btn {
+    background: var(--danger);
+    color: white;
+    border: none;
+    border-radius: 4px;
+    padding: 4px 8px;
+    font-size: 12px;
+    cursor: pointer;
+    transition: background 0.2s;
+}
+
+.remove-order-btn:hover {
+    background: #d42c3f;
+}
+
+/* Add Order Modal */
+.add-order-modal .modal-box1 {
+    max-width: 1000px;
+}
+
+.add-order-actions {
+    display: flex;
+    justify-content: flex-end;
+    gap: 12px;
+    margin-top: 16px;
+}
+
 /* responsive */
 @media (max-width:980px){
   .create-grid { grid-template-columns: 1fr; }
@@ -514,6 +709,10 @@ tr:hover td{ background:#fbfdff; }
   .pagination-controls { justify-content: center; }
   .account-container { padding: 20px; }
   .panel-card { padding: 18px; }
+  .payment-filters, .order-filters { flex-direction: column; align-items: stretch; }
+  .filter-group { width: 100%; }
+  .filter-control { min-width: auto; }
+  .edit-form-grid { grid-template-columns: 1fr; }
 }
 
 @media (max-width:768px){
@@ -522,6 +721,27 @@ tr:hover td{ background:#fbfdff; }
   .top-actions .left { justify-content: center; }
   .entry-summary-cards { gap: 12px; }
   .entry-summary-card { min-width: 140px; }
+  .edit-form-grid { grid-template-columns: 1fr; }
+  .order-management-header { flex-direction: column; align-items: flex-start; gap: 10px; }
+}
+
+/* Table pagination wrapper */
+.table-pagination-wrapper {
+    margin-top: 20px;
+    border-top: 1px solid #eef3fb;
+    padding-top: 15px;
+}
+
+/* Modal pagination wrapper */
+.modal-pagination-wrapper {
+    margin-top: 15px;
+    border-top: 1px solid #eef3fb;
+    padding-top: 12px;
+}
+
+/* Right-aligned pagination */
+.pagination-right {
+    justify-content: flex-end;
 }
 </style>
 
@@ -540,7 +760,7 @@ tr:hover td{ background:#fbfdff; }
                 <button class="btn ghost" id="searchBtn">Search</button>
             </div>
             <div style="display:flex; align-items:center; gap:8px; margin-left:6px;">
-                <button class="btn" id="openCreateModalBtn">+ Create New Order</button>
+                <button class="btn" id="openCreateModalBtn">+ Create New Installment</button>
             </div>
         </div>
 
@@ -551,29 +771,104 @@ tr:hover td{ background:#fbfdff; }
 
     <!-- Panels -->
     <div class="account-panels" id="account-panels">
-        <div class="panel-card">
-            <div class="panel-title">
-                <span>Payment Sent to China</span>
-                <span style="font-size:13px;color:var(--muted)">Total entries: <span id="entriesCount">0</span></span>
+        <!-- Payment Sent block + pagination एकत्र -->
+        <div class="payment-block">
+            <div class="panel-card">
+                <div class="panel-title">
+                    <span>Payment Sent to China</span>
+                    <span style="font-size:13px;color:var(--muted)">Total entries: <span id="entriesCount">0</span></span>
+                </div>
+                
+                <!-- PAYMENT TABLE FILTERS -->
+                <div class="payment-filters">
+                    <div class="filter-group">
+                        <label class="filter-label">Date Filter</label>
+                        <input type="date" id="paymentDateFilter" class="filter-control">
+                    </div>
+                    
+                    <div class="filter-group">
+                        <label class="filter-label">Status Filter</label>
+                        <select id="paymentStatusFilter" class="filter-control">
+                            <option value="">All Statuses</option>
+                            <option value="paid">Paid</option>
+                            <option value="unpaid">Unpaid</option>
+                            <option value="pending">Pending</option>
+                        </select>
+                    </div>
+                    
+                    <div class="filter-actions">
+                        <button class="btn ghost" id="clearPaymentFiltersBtn">Clear Filters</button>
+                    </div>
+                </div>
+
+                <table id="main-payment-table">
+                    <thead>
+                        <tr>
+                            <th>Entry No</th><th>Date</th><th>Description</th>
+                            <th>Order Quantity</th><th>Region</th><th>Payment</th><th>Amount</th><th>Status</th>
+                            <th>Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody id="paymentTableBody">
+                        <!-- Entries will be loaded here -->
+                    </tbody>
+                </table>
+            </div>
+            nt
+            <!-- Pagination for Payment Table OUTSIDE table but SAME column -->
+            <div class="table-pagination-wrapper pagination-right">
+                <div class="pagination-container">
+                    <div class="pagination-info" id="paymentPageInfo">Showing 0 entries</div>
+                    <div class="pagination-controls">
+                        <button class="pagination-img-btn" id="paymentPrevBtn" title="Previous page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </button>
+                        <div class="pagination-pages" id="paymentPaginationPages">
+                            <!-- Page numbers will be inserted here -->
+                        </div>
+                        <button class="pagination-img-btn" id="paymentNextBtn" title="Next page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </button>
+                    </div>
+                </div>
             </div>
-            <table id="main-payment-table">
-                <thead>
-                    <tr>
-                        <th>Entry No</th><th>Date</th><th>Description</th>
-                        <th>Order Quantity</th><th>Region</th><th>Payment</th><th>Amount</th><th>Status</th>
-                    </tr>
-                </thead>
-                <tbody id="paymentTableBody">
-                    <tr><td colspan="8" class="empty-state">Loading entries...</td></tr>
-                </tbody>
-            </table>
         </div>
 
+        <!-- Order Dispatch Table -->
         <div class="panel-card">
             <div class="panel-title">
                 <span>Order Dispatch Status</span>
                 <span style="font-size:13px;color:var(--muted)">Actions: <strong>+ Add Installment</strong></span>
             </div>
+            
+            <!-- ORDER TABLE FILTERS -->
+            <div class="order-filters">
+                <div class="filter-group">
+                    <label class="filter-label">Date Filter</label>
+                    <input type="date" id="orderDateFilter" class="filter-control">
+                </div>
+                
+                <div class="filter-group">
+                    <label class="filter-label">Status Filter</label>
+                    <select id="orderStatusFilter" class="filter-control">
+                        <option value="">All Statuses</option>
+                        <option value="pending">Pending</option>
+                        <option value="loading">Loading</option>
+                        <option value="packed">Packed</option>
+                        <option value="dispatched">Dispatched</option>
+                        <option value="delivered">Delivered</option>
+                    </select>
+                </div>
+                
+                <div class="filter-actions">
+                    <button class="btn ghost" id="clearOrderFiltersBtn">Clear Filters</button>
+                </div>
+            </div>
+
             <table id="main-order-table">
                 <thead>
                     <tr>
@@ -583,9 +878,10 @@ tr:hover td{ background:#fbfdff; }
                     </tr>
                 </thead>
                 <tbody id="orderTableBody">
-                    <tr><td colspan="8" class="empty-state">Loading entries...</td></tr>
+                    <!-- Entries will be loaded here -->
                 </tbody>
             </table>
+            <!-- No pagination for second table -->
         </div>
     </div>
 </div>
@@ -594,7 +890,7 @@ tr:hover td{ background:#fbfdff; }
 <div class="create-order-modal" id="createOrderModal">
     <div class="modal-box">
         <div style="display:flex; align-items:center; justify-content:space-between; margin-bottom:16px;">
-            <div style="font-size:20px; font-weight:800; color:var(--primary-1)">Create New Order</div>
+            <div style="font-size:20px; font-weight:800; color:var(--primary-1)">Create New Installment</div>
             <button class="btn ghost" id="closeCreateModal" title="Close create form">✕</button>
         </div>
 
@@ -649,29 +945,29 @@ tr:hover td{ background:#fbfdff; }
                             </tr>
                         </thead>
                         <tbody id="consolidateOrdersBody">
-                            <tr><td colspan="14" class="empty-state">Loading available orders...</td></tr>
+                            <!-- Orders will be loaded here -->
                         </tbody>
                     </table>
                     
-                    <!-- Pagination Controls -->
-                    <div class="pagination-container">
-                        <div class="pagination-info" id="pageInfo">Showing 1 to 10 of 0 entries</div>
-                        <div class="pagination-controls">
-                            <button class="pagination-img-btn" id="prevPageBtn" title="Previous page">
-                                <!-- Left arrow SVG -->
-                                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                    <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-                                </svg>
-                            </button>
-                            <div class="pagination-pages" id="paginationPages">
-                                <!-- Page numbers will be inserted here -->
+                    <!-- Pagination for Create Order Modal -->
+                    <div class="modal-pagination-wrapper pagination-right">
+                        <div class="pagination-container">
+                            <div class="pagination-info" id="modalPageInfo">Showing 0 entries</div>
+                            <div class="pagination-controls">
+                                <button class="pagination-img-btn" id="modalPrevBtn" title="Previous page">
+                                    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                                    </svg>
+                                </button>
+                                <div class="pagination-pages" id="modalPaginationPages">
+                                    <!-- Page numbers will be inserted here -->
+                                </div>
+                                <button class="pagination-img-btn" id="modalNextBtn" title="Next page">
+                                    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                                    </svg>
+                                </button>
                             </div>
-                            <button class="pagination-img-btn" id="nextPageBtn" title="Next page">
-                                <!-- Right arrow SVG -->
-                                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                    <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-                                </svg>
-                            </button>
                         </div>
                     </div>
                 </div>
@@ -679,11 +975,9 @@ tr:hover td{ background:#fbfdff; }
 
             <div class="create-actions">
                 <button type="button" class="btn ghost" id="cancelCreateModal">Cancel</button>
-                <button type="submit" class="btn">Create Order</button>
+                <button type="submit" class="btn">Create Installment</button>
             </div>
         </form>
-
-        <div class="helper-note">Tip: Select orders from the list to include them in this consolidated entry. You can also search orders above.</div>
     </div>
 </div>
 
@@ -779,26 +1073,190 @@ tr:hover td{ background:#fbfdff; }
     </div>
 </div>
 
+<!-- Edit Entry Modal -->
+<div class="modal-fade1 edit-modal" id="editEntryModal">
+    <div class="modal-box1">
+        <div style="display:flex;align-items:center; justify-content:space-between; margin-bottom:12px;">
+            <div style="font-size:18px;font-weight:800;color:#243a72;">Edit Entry</div>
+            <button class="btn ghost" onclick="closeEditModal()">✕</button>
+        </div>
+
+        <div style="font-size:14px;color:#6f7b8f;margin-bottom:14px;">Update the description and order quantity for this entry</div>
+
+        <form id="editEntryForm" autocomplete="off">
+            <input type="hidden" id="edit_entry_no" name="entry_no">
+            
+            <div class="edit-form-grid">
+                <div>
+                    <label>Description *</label>
+                    <input type="text" id="edit_description" name="description" required class="input" placeholder="Entry description">
+                </div>
+                <div>
+                    <label>Order Quantity *</label>
+                    <input type="number" id="edit_order_quantity" name="order_quantity" min="0" required class="input" placeholder="Order quantity">
+                </div>
+                <div>
+                    <label>Payment Status</label>
+                    <select id="edit_payment_status" name="payment_status" class="input">
+                        <option value="unpaid">Unpaid</option>
+                        <option value="paid">Paid</option>
+                        <option value="pending">Pending</option>
+                    </select>
+                </div>
+                <div>
+                    <label>Region</label>
+                    <select id="edit_region" name="region" class="input" required>
+                        <option value="China">China</option>
+                        <option value="Europe">Europe</option>
+                        <option value="US">US</option>
+                    </select>
+                </div>
+                <div>
+                    <label>Amount (₹) *</label>
+                    <input type="number" id="edit_amount" name="amount" min="0" required class="input" placeholder="Entry amount">
+                </div>
+            </div>
+
+            <!-- Order Management Section -->
+            <div class="order-management-section">
+                <div class="order-management-header">
+                    <div class="order-management-title">Associated Orders</div>
+                    <button type="button" class="btn ghost" id="addOrderBtn">+ Add Orders</button>
+                </div>
+                
+                <div class="orders-table-container">
+                    <table class="orders-table">
+                        <thead>
+                            <tr>
+                                <th>Order ID</th>
+                                <th>Mark No</th>
+                                <th>Origin</th>
+                                <th>Destination</th>
+                                <th>CTN</th>
+                                <th>QTY</th>
+                                <th>Amount (₹)</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody id="editOrdersTableBody">
+                            <!-- Orders will be loaded here -->
+                        </tbody>
+                    </table>
+                </div>
+                
+                <div id="editOrdersEmptyState" class="empty-state" style="display:none;">
+                    No orders associated with this entry
+                </div>
+            </div>
+
+            <div class="edit-form-actions">
+                <button type="button" class="btn ghost" onclick="closeEditModal()">Cancel</button>
+                <button type="submit" class="btn">Update Entry</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<!-- Add Order Modal -->
+<div class="modal-fade1 add-order-modal" id="addOrderModal">
+    <div class="modal-box1">
+        <div style="display:flex;align-items:center; justify-content:space-between; margin-bottom:12px;">
+            <div style="font-size:18px;font-weight:800;color:#243a72;">Add Orders to Entry</div>
+            <button class="btn ghost" onclick="closeAddOrderModal()">✕</button>
+        </div>
+
+        <div style="font-size:14px;color:#6f7b8f;margin-bottom:14px;">Select orders to associate with this entry</div>
+
+        <div class="consolidate-area" style="min-height: 400px;">
+            <table id="addOrderTable">
+                <thead>
+                    <tr>
+                        <th></th>
+                        <th>Order ID</th>
+                        <th>Mark No</th>
+                        <th>Origin</th>
+                        <th>Destination</th>
+                        <th>CTN</th>
+                        <th>QTY</th>
+                        <th>Amount (₹)</th>
+                    </tr>
+                </thead>
+                <tbody id="addOrderTableBody">
+                    <!-- Orders will be loaded here -->
+                </tbody>
+            </table>
+            
+            <!-- Pagination for Add Order Modal -->
+            <div class="modal-pagination-wrapper pagination-right">
+                <div class="pagination-container">
+                    <div class="pagination-info" id="addOrderPageInfo">Showing 0 entries</div>
+                    <div class="pagination-controls">
+                        <button class="pagination-img-btn" id="addOrderPrevBtn" title="Previous page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </button>
+                        <div class="pagination-pages" id="addOrderPaginationPages">
+                            <!-- Page numbers will be inserted here -->
+                        </div>
+                        <button class="pagination-img-btn" id="addOrderNextBtn" title="Next page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="add-order-actions">
+            <button type="button" class="btn ghost" onclick="closeAddOrderModal()">Cancel</button>
+            <button type="button" class="btn" id="confirmAddOrdersBtn">Add Selected Orders</button>
+        </div>
+    </div>
+</div>
+
 <script>
 /* ---------- Helpers & state ---------- */
 const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
 
 function jsonFetch(url, opts = {}) {
-  opts.headers = Object.assign({'Content-Type':'application/json','X-CSRF-TOKEN': csrfToken}, opts.headers || {});
-  if(opts.body && typeof opts.body !== 'string') opts.body = JSON.stringify(opts.body);
-  return fetch(url, opts).then(r => {
-      // attempt to parse json even on non-ok to get backend message
-      return r.json().catch(() => { throw new Error('Invalid server response'); });
-  });
+    opts.headers = Object.assign(
+        { 'Content-Type': 'application/json', 'X-CSRF-TOKEN': csrfToken },
+        opts.headers || {}
+    );
+
+    if (opts.body && typeof opts.body !== 'string') {
+        opts.body = JSON.stringify(opts.body);
+    }
+
+    return fetch(url, opts).then(r =>
+        r.json().catch(() => {
+            throw new Error('Invalid server response');
+        })
+    );
 }
 
+
 let entries = [];
 let availableOrders = [];
 let currentEntry = null;
+let currentEditEntry = null;
 
-/* Pagination state */
+/* Single pagination state for both tables */
 let currentPage = 1;
-const ordersPerPage = 10;
+const entriesPerPage = 10;
+
+/* Separate pagination state for modals */
+let modalCurrentPage = 1;
+const modalOrdersPerPage = 10;
+let addOrderCurrentPage = 1;
+
+/* Filter state - SEPARATE for both tables */
+let paymentDateFilter = '';
+let paymentStatusFilter = '';
+let orderDateFilter = '';
+let orderStatusFilter = '';
 
 /* small util */
 function escapeHtml(s){ if(s === null || s === undefined) return ''; return String(s).replace(/[&<>"']/g, m => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":"&#39;"}[m])); }
@@ -810,6 +1268,9 @@ function statusClass(status){
     case 'paid': return 'status-paid';
     case 'loading': return 'status-loading';
     case 'dispatched': return 'status-dispatched';
+    case 'packed': return 'status-loading';
+    case 'delivered': return 'status-delivered';
+    case 'pending': return 'pending-badge-red';
     default: return 'status-loading';
   }
 }
@@ -828,9 +1289,19 @@ function bindUI(){
   document.getElementById('cancelCreateModal').addEventListener('click', closeCreateOrderModal);
   document.getElementById('createOrderInlineForm').addEventListener('submit', submitCreateOrderInline);
   
-  // Pagination buttons
-  document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
-  document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
+  // Payment Table Pagination (only pagination controls)
+  document.getElementById('paymentPrevBtn').addEventListener('click', () => goToPreviousPage());
+  document.getElementById('paymentNextBtn').addEventListener('click', () => goToNextPage());
+  
+  // No pagination controls for order table
+  
+  // Modal Pagination
+  document.getElementById('modalPrevBtn').addEventListener('click', () => goToModalPreviousPage());
+  document.getElementById('modalNextBtn').addEventListener('click', () => goToModalNextPage());
+  
+  // Add Order Modal Pagination
+  document.getElementById('addOrderPrevBtn').addEventListener('click', () => goToAddOrderPreviousPage());
+  document.getElementById('addOrderNextBtn').addEventListener('click', () => goToAddOrderNextPage());
   
   document.getElementById('refreshBtn').addEventListener('click', () => { loadDashboard(); });
   document.getElementById('searchBtn').addEventListener('click', handleSearch);
@@ -842,40 +1313,174 @@ function bindUI(){
 
   // Installment form submit
   document.getElementById('installmentForm').addEventListener('submit', submitInstallment);
+  
+  // Edit form submit
+  document.getElementById('editEntryForm').addEventListener('submit', submitEditEntry);
+  
+  // Add Order button in Edit Modal
+  document.getElementById('addOrderBtn').addEventListener('click', openAddOrderModal);
+  
+  // Confirm Add Orders button
+  document.getElementById('confirmAddOrdersBtn').addEventListener('click', confirmAddOrders);
+  
+  // Payment Table Filter bindings
+  document.getElementById('paymentDateFilter').addEventListener('change', (e) => {
+    paymentDateFilter = e.target.value;
+    applyPaymentFilters();
+  });
+  
+  document.getElementById('paymentStatusFilter').addEventListener('change', (e) => {
+    paymentStatusFilter = e.target.value;
+    applyPaymentFilters();
+  });
+  
+  document.getElementById('clearPaymentFiltersBtn').addEventListener('click', clearPaymentFilters);
+  
+  // Order Table Filter bindings
+  document.getElementById('orderDateFilter').addEventListener('change', (e) => {
+    orderDateFilter = e.target.value;
+    applyOrderFilters();
+  });
+  
+  document.getElementById('orderStatusFilter').addEventListener('change', (e) => {
+    orderStatusFilter = e.target.value;
+    applyOrderFilters();
+  });
+  
+  document.getElementById('clearOrderFiltersBtn').addEventListener('click', clearOrderFilters);
+}
+
+/* ---------- Filter Functions - SEPARATE FOR BOTH TABLES ---------- */
+function applyPaymentFilters() {
+  let filteredEntries = [...entries];
+  
+  // Apply date filter
+  if (paymentDateFilter) {
+    filteredEntries = filteredEntries.filter(entry => entry.entry_date === paymentDateFilter);
+  }
+  
+  // Apply status filter
+  if (paymentStatusFilter) {
+    filteredEntries = filteredEntries.filter(entry => 
+      entry.payment_status.toLowerCase() === paymentStatusFilter.toLowerCase()
+    );
+  }
+  
+  // Reset to first page when filtering
+  currentPage = 1;
+  
+  // Render filtered entries ONLY in payment table
+  renderPaymentTable(filteredEntries);
+  updatePaginationControls();
+}
+
+function applyOrderFilters() {
+  let filteredEntries = [...entries];
+  
+  // Apply date filter
+  if (orderDateFilter) {
+    filteredEntries = filteredEntries.filter(entry => entry.entry_date === orderDateFilter);
+  }
+  
+  // Apply status filter
+  if (orderStatusFilter) {
+    filteredEntries = filteredEntries.filter(entry => 
+      entry.dispatch_status.toLowerCase() === orderStatusFilter.toLowerCase()
+    );
+  }
+  
+  // Render filtered entries ONLY in order table
+  renderOrderTable(filteredEntries);
+}
+
+function clearPaymentFilters() {
+  document.getElementById('paymentDateFilter').value = '';
+  document.getElementById('paymentStatusFilter').value = '';
+  paymentDateFilter = '';
+  paymentStatusFilter = '';
+  
+  // Reset to first page and render all entries
+  currentPage = 1;
+  renderBothTables();
+  updatePaginationControls();
+}
+
+function clearOrderFilters() {
+  document.getElementById('orderDateFilter').value = '';
+  document.getElementById('orderStatusFilter').value = '';
+  orderDateFilter = '';
+  orderStatusFilter = '';
+  
+  // Render all entries in order table
+  renderOrderTable(entries);
 }
 
 /* ---------- Pagination Functions ---------- */
 function goToPreviousPage() {
     if (currentPage > 1) {
         currentPage--;
-        renderConsolidateOrders(availableOrders);
+        renderBothTables();
         updatePaginationControls();
     }
 }
 
 function goToNextPage() {
-    const totalPages = Math.ceil(availableOrders.length / ordersPerPage);
+    const totalPages = Math.ceil(entries.length / entriesPerPage);
     if (currentPage < totalPages) {
         currentPage++;
-        renderConsolidateOrders(availableOrders);
+        renderBothTables();
         updatePaginationControls();
     }
 }
 
+function goToModalPreviousPage() {
+    if (modalCurrentPage > 1) {
+        modalCurrentPage--;
+        renderConsolidateOrders(availableOrders);
+        updateModalPaginationControls();
+    }
+}
+
+function goToModalNextPage() {
+    const totalPages = Math.ceil(availableOrders.length / modalOrdersPerPage);
+    if (modalCurrentPage < totalPages) {
+        modalCurrentPage++;
+        renderConsolidateOrders(availableOrders);
+        updateModalPaginationControls();
+    }
+}
+
+function goToAddOrderPreviousPage() {
+    if (addOrderCurrentPage > 1) {
+        addOrderCurrentPage--;
+        renderAddOrderModal(availableOrders);
+        updateAddOrderPaginationControls();
+    }
+}
+
+function goToAddOrderNextPage() {
+    const totalPages = Math.ceil(availableOrders.length / modalOrdersPerPage);
+    if (addOrderCurrentPage < totalPages) {
+        addOrderCurrentPage++;
+        renderAddOrderModal(availableOrders);
+        updateAddOrderPaginationControls();
+    }
+}
+
 function updatePaginationControls() {
-    const totalPages = Math.ceil(availableOrders.length / ordersPerPage);
-    const prevBtn = document.getElementById('prevPageBtn');
-    const nextBtn = document.getElementById('nextPageBtn');
-    const pageInfo = document.getElementById('pageInfo');
-    const paginationPages = document.getElementById('paginationPages');
+    const totalPages = Math.ceil(entries.length / entriesPerPage);
+    const prevBtn = document.getElementById('paymentPrevBtn');
+    const nextBtn = document.getElementById('paymentNextBtn');
+    const pageInfo = document.getElementById('paymentPageInfo');
+    const paginationPages = document.getElementById('paymentPaginationPages');
     
     prevBtn.disabled = currentPage === 1;
     nextBtn.disabled = currentPage === totalPages || totalPages === 0;
     
     // Update page info text
-    const startIndex = (currentPage - 1) * ordersPerPage + 1;
-    const endIndex = Math.min(currentPage * ordersPerPage, availableOrders.length);
-    pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${availableOrders.length} entries`;
+    const startIndex = (currentPage - 1) * entriesPerPage + 1;
+    const endIndex = Math.min(currentPage * entriesPerPage, entries.length);
+    pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${entries.length} entries`;
     
     // Generate page numbers
     paginationPages.innerHTML = '';
@@ -908,85 +1513,224 @@ function updatePaginationControls() {
     }
 }
 
+function updateModalPaginationControls() {
+    const totalPages = Math.ceil(availableOrders.length / modalOrdersPerPage);
+    const prevBtn = document.getElementById('modalPrevBtn');
+    const nextBtn = document.getElementById('modalNextBtn');
+    const pageInfo = document.getElementById('modalPageInfo');
+    const paginationPages = document.getElementById('modalPaginationPages');
+    
+    prevBtn.disabled = modalCurrentPage === 1;
+    nextBtn.disabled = modalCurrentPage === totalPages || totalPages === 0;
+    
+    // Update page info text
+    const startIndex = (modalCurrentPage - 1) * modalOrdersPerPage + 1;
+    const endIndex = Math.min(modalCurrentPage * modalOrdersPerPage, availableOrders.length);
+    pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${availableOrders.length} orders`;
+    
+    // Generate page numbers
+    paginationPages.innerHTML = '';
+    
+    if (totalPages <= 7) {
+        // Show all pages
+        for (let i = 1; i <= totalPages; i++) {
+            addModalPageButton(i, paginationPages);
+        }
+    } else {
+        // Show first page, current page range, and last page
+        addModalPageButton(1, paginationPages);
+        
+        if (modalCurrentPage > 3) {
+            paginationPages.innerHTML += '<span class="pagination-ellipsis">...</span>';
+        }
+        
+        const start = Math.max(2, modalCurrentPage - 1);
+        const end = Math.min(totalPages - 1, modalCurrentPage + 1);
+        
+        for (let i = start; i <= end; i++) {
+            addModalPageButton(i, paginationPages);
+        }
+        
+        if (modalCurrentPage < totalPages - 2) {
+            paginationPages.innerHTML += '<span class="pagination-ellipsis">...</span>';
+        }
+        
+        addModalPageButton(totalPages, paginationPages);
+    }
+}
+
+function updateAddOrderPaginationControls() {
+    const totalPages = Math.ceil(availableOrders.length / modalOrdersPerPage);
+    const prevBtn = document.getElementById('addOrderPrevBtn');
+    const nextBtn = document.getElementById('addOrderNextBtn');
+    const pageInfo = document.getElementById('addOrderPageInfo');
+    const paginationPages = document.getElementById('addOrderPaginationPages');
+    
+    prevBtn.disabled = addOrderCurrentPage === 1;
+    nextBtn.disabled = addOrderCurrentPage === totalPages || totalPages === 0;
+    
+    // Update page info text
+    const startIndex = (addOrderCurrentPage - 1) * modalOrdersPerPage + 1;
+    const endIndex = Math.min(addOrderCurrentPage * modalOrdersPerPage, availableOrders.length);
+    pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${availableOrders.length} orders`;
+    
+    // Generate page numbers
+    paginationPages.innerHTML = '';
+    
+    if (totalPages <= 7) {
+        // Show all pages
+        for (let i = 1; i <= totalPages; i++) {
+            addAddOrderPageButton(i, paginationPages);
+        }
+    } else {
+        // Show first page, current page range, and last page
+        addAddOrderPageButton(1, paginationPages);
+        
+        if (addOrderCurrentPage > 3) {
+            paginationPages.innerHTML += '<span class="pagination-ellipsis">...</span>';
+        }
+        
+        const start = Math.max(2, addOrderCurrentPage - 1);
+        const end = Math.min(totalPages - 1, addOrderCurrentPage + 1);
+        
+        for (let i = start; i <= end; i++) {
+            addAddOrderPageButton(i, paginationPages);
+        }
+        
+        if (addOrderCurrentPage < totalPages - 2) {
+            paginationPages.innerHTML += '<span class="pagination-ellipsis">...</span>';
+        }
+        
+        addAddOrderPageButton(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;
-        renderConsolidateOrders(availableOrders);
+        renderBothTables();
         updatePaginationControls();
     });
     container.appendChild(button);
 }
 
+function addModalPageButton(pageNumber, container) {
+    const button = document.createElement('button');
+    button.className = 'pagination-page-btn';
+    
+    if (pageNumber === modalCurrentPage) {
+        button.classList.add('active');
+    }
+    
+    button.textContent = pageNumber;
+    button.addEventListener('click', () => {
+        modalCurrentPage = pageNumber;
+        renderConsolidateOrders(availableOrders);
+        updateModalPaginationControls();
+    });
+    container.appendChild(button);
+}
+
+function addAddOrderPageButton(pageNumber, container) {
+    const button = document.createElement('button');
+    button.className = 'pagination-page-btn';
+    
+    if (pageNumber === addOrderCurrentPage) {
+        button.classList.add('active');
+    }
+    
+    button.textContent = pageNumber;
+    button.addEventListener('click', () => {
+        addOrderCurrentPage = pageNumber;
+        renderAddOrderModal(availableOrders);
+        updateAddOrderPaginationControls();
+    });
+    container.appendChild(button);
+}
+
+function renderBothTables() {
+    renderPaymentTable(entries);
+    renderOrderTable(entries);
+}
+
 /* ---------- Create Order Modal Functions ---------- */
 function openCreateOrderModal(){
   const modal = document.getElementById('createOrderModal');
   modal.classList.add('modal-open');
   loadAvailableOrders();
-  // focus first input
   setTimeout(()=> document.getElementById('inline_description').focus(), 220);
 }
 
 function closeCreateOrderModal(){
   const modal = document.getElementById('createOrderModal');
   modal.classList.remove('modal-open');
-  // reset form and pagination
   document.getElementById('createOrderInlineForm').reset();
-  currentPage = 1;
+  modalCurrentPage = 1; // Reset modal pagination when closing
 }
 
 /* ---------- Loaders ---------- */
 function loadDashboard(){
-  // show loading placeholders
-  document.getElementById('paymentTableBody').innerHTML = '<tr><td colspan="8" class="empty-state">Loading entries...</td></tr>';
-  document.getElementById('orderTableBody').innerHTML = '<tr><td colspan="8" class="empty-state">Loading entries...</td></tr>';
-  jsonFetch('/admin/account/dashboard')
-  .then(res => {
-    if(!res.success) throw new Error(res.message || 'Failed to load dashboard');
-    entries = res.entries || [];
-    renderPaymentTable(entries);
-    renderOrderTable(entries);
-    document.getElementById('entriesCount').textContent = entries.length;
-  })
-  .catch(err => {
-    console.error(err);
-    document.getElementById('paymentTableBody').innerHTML = '<tr><td colspan="8" class="empty-state">Unable to load entries</td></tr>';
-    document.getElementById('orderTableBody').innerHTML = '<tr><td colspan="8" class="empty-state">Unable to load entries</td></tr>';
-  });
-}
-
-function loadAvailableOrders(){
-  const tbody = document.getElementById('consolidateOrdersBody');
-  tbody.innerHTML = '<tr><td colspan="14" class="empty-state">Loading available orders...</td></tr>';
-  jsonFetch('/admin/account/available-orders')
-  .then(res => {
-    if(!res.success) throw new Error(res.message || 'Failed to load orders');
-    availableOrders = res.orders || [];
-    currentPage = 1; // Reset to first page when loading new orders
-    renderConsolidateOrders(availableOrders);
-    updatePaginationControls();
-  })
-  .catch(err => {
-    console.error(err);
-    tbody.innerHTML = '<tr><td colspan="14" class="empty-state">Unable to load orders</td></tr>';
-    updatePaginationControls();
-  });
-}
+    jsonFetch('/admin/account/dashboard')
+    .then(res => {
+      if(!res.success) throw new Error(res.message || 'Failed to load dashboard');
+      entries = res.entries || [];
+      renderBothTables();
+      updatePaginationControls(); // Initialize pagination after loading
+      document.getElementById('entriesCount').textContent = entries.length;
+    })
+    .catch(err => {
+      console.error(err);
+      document.getElementById('paymentTableBody').innerHTML = '<tr><td colspan="9" class="empty-state">Unable to load entries</td></tr>';
+      document.getElementById('orderTableBody').innerHTML = '<tr><td colspan="8" class="empty-state">Unable to load entries</td></tr>';
+    });
+  }
+  
+  
+  function loadAvailableOrders() {
+      const tbody = document.getElementById('consolidateOrdersBody');
+      tbody.innerHTML = '<tr><td colspan="14" class="empty-state">Loading available orders...</td></tr>';
+  
+      jsonFetch('/admin/account/available-orders', { method: 'GET' })
+          .then(res => {
+              if (!res.success) throw new Error(res.message || 'Failed to load orders');
+  
+              availableOrders = res.orders || [];
+              modalCurrentPage = 1; // Reset to first page when loading new orders
+              renderConsolidateOrders(availableOrders);
+              updateModalPaginationControls();
+          })
+          .catch(err => {
+              console.error(err);
+              tbody.innerHTML = '<tr><td colspan="14" class="empty-state">Unable to load orders</td></tr>';
+              updateModalPaginationControls();
+          });
+  }
+  
 
 /* ---------- Renderers ---------- */
 function renderPaymentTable(list){
   const body = document.getElementById('paymentTableBody');
   body.innerHTML = '';
+  
   if(!list || list.length === 0){
-    body.innerHTML = '<tr><td colspan="8" class="empty-state">No entries found</td></tr>';
+    body.innerHTML = '<tr><td colspan="9" class="empty-state">No entries found</td></tr>';
     return;
   }
-  list.forEach(entry => {
+  
+  // Calculate pagination
+  const startIndex = (currentPage - 1) * entriesPerPage;
+  const endIndex = startIndex + entriesPerPage;
+  const paginatedEntries = list.slice(startIndex, endIndex);
+  
+  paginatedEntries.forEach(entry => {
     const tr = document.createElement('tr');
     tr.innerHTML = `
       <td>${escapeHtml(entry.entry_no)}</td>
@@ -999,23 +1743,52 @@ function renderPaymentTable(list){
       </td>
       <td>${formatCurrency(entry.amount)}</td>
       <td><span class="status-badge ${statusClass(entry.payment_status)}">${capitalize(entry.payment_status)}</span></td>
+      <td>
+        <div class="action-btns">
+          <button class="action-btn edit-btn" data-entry="${escapeHtml(entry.entry_no)}" title="Edit entry">
+            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path d="M11.3333 1.99996C11.5084 1.82485 11.7163 1.686 11.945 1.59124C12.1737 1.49649 12.4189 1.44775 12.6667 1.44775C12.9144 1.44775 13.1596 1.49649 13.3883 1.59124C13.617 1.686 13.8249 1.82485 14 1.99996C14.1751 2.17507 14.314 2.38297 14.4087 2.61167C14.5035 2.84037 14.5522 3.08556 14.5522 3.33329C14.5522 3.58102 14.5035 3.82621 14.4087 4.05491C14.314 4.28361 14.1751 4.49151 14 4.66663L4.99998 13.6666L1.33331 14.6666L2.33331 11L11.3333 1.99996Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+            </svg>
+          </button>
+          <button class="action-btn delete-btn" data-entry="${escapeHtml(entry.entry_no)}" title="Delete entry">
+            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path d="M2 4H3.33333H14" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+              <path d="M5.33331 4V2.66667C5.33331 2.31305 5.47379 1.97391 5.72384 1.72386C5.97389 1.47381 6.31303 1.33333 6.66665 1.33333H9.33331C9.68693 1.33333 10.0261 1.47381 10.2761 1.72386C10.5262 1.97391 10.6666 2.31305 10.6666 2.66667V4M12.6666 4V13.3333C12.6666 13.6869 12.5262 14.0261 12.2761 14.2761C12.0261 14.5262 11.6869 14.6667 11.3333 14.6667H4.66665C4.31303 14.6667 3.97389 14.5262 3.72384 14.2761C3.47379 14.0261 3.33331 13.6869 3.33331 13.3333V4H12.6666Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+            </svg>
+          </button>
+        </div>
+      </td>
     `;
     body.appendChild(tr);
 
     const btn = tr.querySelector('.toggle-switch-btn');
     setToggleVisual(btn, Number(entry.toggle_pos));
     btn.addEventListener('click', () => cycleToggle(btn));
+    
+    // Bind edit and delete buttons
+    const editBtn = tr.querySelector('.edit-btn');
+    editBtn.addEventListener('click', () => openEditModal(entry));
+    
+    const deleteBtn = tr.querySelector('.delete-btn');
+    deleteBtn.addEventListener('click', () => deleteEntry(entry.entry_no));
   });
 }
 
 function renderOrderTable(list){
   const body = document.getElementById('orderTableBody');
   body.innerHTML = '';
+  
   if(!list || list.length === 0){
     body.innerHTML = '<tr><td colspan="8" class="empty-state">No entries found</td></tr>';
     return;
   }
-  list.forEach(entry => {
+  
+  // Calculate pagination (using same currentPage as first table)
+  const startIndex = (currentPage - 1) * entriesPerPage;
+  const endIndex = startIndex + entriesPerPage;
+  const paginatedEntries = list.slice(startIndex, endIndex);
+  
+  paginatedEntries.forEach(entry => {
     const tr = document.createElement('tr');
     const pending = Number(entry.pending_amount || 0);
     const pendingHtml = pending <= 0 ? '<span class="status-badge pending-badge-green">Completed</span>' : `<span class="status-badge pending-badge-red">${formatCurrency(pending)}</span>`;
@@ -1047,12 +1820,13 @@ function renderConsolidateOrders(list){
   
   if(!list || list.length === 0){
     body.innerHTML = '<tr><td colspan="14" class="empty-state">No available orders</td></tr>';
+    updateModalPaginationControls();
     return;
   }
 
-  // Calculate pagination
-  const startIndex = (currentPage - 1) * ordersPerPage;
-  const endIndex = startIndex + ordersPerPage;
+  // Calculate pagination for modal
+  const startIndex = (modalCurrentPage - 1) * modalOrdersPerPage;
+  const endIndex = startIndex + modalOrdersPerPage;
   const paginatedOrders = list.slice(startIndex, endIndex);
 
   paginatedOrders.forEach(order => {
@@ -1076,6 +1850,37 @@ function renderConsolidateOrders(list){
   });
 }
 
+function renderAddOrderModal(list) {
+  const body = document.getElementById('addOrderTableBody');
+  body.innerHTML = '';
+  
+  if(!list || list.length === 0){
+    body.innerHTML = '<tr><td colspan="8" class="empty-state">No available orders</td></tr>';
+    updateAddOrderPaginationControls();
+    return;
+  }
+
+  // Calculate pagination for add order modal
+  const startIndex = (addOrderCurrentPage - 1) * modalOrdersPerPage;
+  const endIndex = startIndex + modalOrdersPerPage;
+  const paginatedOrders = list.slice(startIndex, endIndex);
+
+  paginatedOrders.forEach(order => {
+    const tr = document.createElement('tr');
+    tr.innerHTML = `
+      <td><input type="checkbox" value="${order.id}"></td>
+      <td>${escapeHtml(order.order_id || ('#'+order.id))}</td>
+      <td>${escapeHtml(order.mark_no || '')}</td>
+      <td>${order.origin ?? ''}</td>
+      <td>${order.destination ?? ''}</td>
+      <td>${order.ctn ?? ''}</td>
+      <td>${order.qty ?? ''}</td>
+      <td>${order.ttl_amount ?? ''}</td>
+    `;
+    body.appendChild(tr);
+  });
+}
+
 function setToggleVisual(btn, pos) {
     btn.classList.remove('mid', 'checked');
 
@@ -1116,6 +1921,237 @@ function cycleToggle(btn) {
     });
 }
 
+/* ---------- Edit Entry Functions ---------- */
+function openEditModal(entry) {
+    currentEditEntry = entry;
+    
+    document.getElementById('edit_entry_no').value = entry.entry_no;
+    document.getElementById('edit_description').value = entry.description || '';
+    document.getElementById('edit_order_quantity').value = entry.order_quantity || '';
+    document.getElementById('edit_payment_status').value = entry.payment_status || 'unpaid';
+    document.getElementById('edit_region').value = entry.region || 'China';
+    document.getElementById('edit_amount').value = entry.amount || '';
+    
+    // Load associated orders
+    loadEntryOrders(entry.entry_no);
+    
+    document.getElementById('editEntryModal').classList.add('modal-open');
+}
+
+function closeEditModal() {
+    document.getElementById('editEntryModal').classList.remove('modal-open');
+    currentEditEntry = null;
+}
+
+function loadEntryOrders(entryNo) {
+    const tbody = document.getElementById('editOrdersTableBody');
+    const emptyState = document.getElementById('editOrdersEmptyState');
+    
+    tbody.innerHTML = '<tr><td colspan="8" class="empty-state">Loading orders...</td></tr>';
+    
+    jsonFetch(`/admin/account/entry-orders/${encodeURIComponent(entryNo)}`)
+    .then(res => {
+        if (!res.success) throw new Error(res.message || 'Failed to load orders');
+        
+        tbody.innerHTML = '';
+        
+        if (!res.orders || res.orders.length === 0) {
+            emptyState.style.display = 'block';
+            return;
+        }
+        
+        emptyState.style.display = 'none';
+        
+        res.orders.forEach(order => {
+            const tr = document.createElement('tr');
+            tr.innerHTML = `
+                <td>${escapeHtml(order.order_id || ('#'+order.id))}</td>
+                <td>${escapeHtml(order.mark_no || '')}</td>
+                <td>${order.origin ?? ''}</td>
+                <td>${order.destination ?? ''}</td>
+                <td>${order.ctn ?? ''}</td>
+                <td>${order.qty ?? ''}</td>
+                <td>${order.ttl_amount ?? ''}</td>
+                <td>
+                    <div class="order-actions">
+                        <button class="remove-order-btn" data-order-id="${order.id}">Remove</button>
+                    </div>
+                </td>
+            `;
+            tbody.appendChild(tr);
+            
+            // Bind remove button
+            const removeBtn = tr.querySelector('.remove-order-btn');
+            removeBtn.addEventListener('click', () => removeOrderFromEntry(order.id, entryNo));
+        });
+    })
+    .catch(err => {
+        console.error(err);
+        tbody.innerHTML = '<tr><td colspan="8" class="empty-state">Unable to load orders</td></tr>';
+    });
+}
+
+
+async function refreshEntryHeader(entryNo) {
+    try {
+        const res = await jsonFetch('/admin/account/entry/' + encodeURIComponent(entryNo));
+        if (!res.success) return;
+
+        const entry = res.entry;
+
+        const qtyInput = document.getElementById('editorderquantity');
+        if (qtyInput) qtyInput.value = entry.order_quantity ?? 0;
+
+       
+        const idx = entries.findIndex(e => e.entry_no === entry.entry_no);
+        
+        if (idx !== -1) {
+            entries[idx].order_quantity = entry.order_quantity;
+            renderBothTables();
+            updatePaginationControls();
+        }
+    } catch (e) {
+        console.error(e);
+    }
+}
+async function removeOrderFromEntry(orderId, entryNo) {
+    if (!confirm('Are you sure you want to remove this order from the entry?')) {
+        return;
+    }
+
+    try {
+        const res = await jsonFetch('/admin/account/remove-order-from-entry', {
+            method: 'POST',
+            body: {
+                entry_no: entryNo,
+                order_id: orderId
+            }
+        });
+
+        if (!res.success) throw new Error(res.message || 'Failed to remove order');
+
+        loadEntryOrders(entryNo);
+        loadAvailableOrders();
+        await refreshEntryHeader(entryNo); // ⬅ इथे नवं
+    } catch (err) {
+        alert(err.message || 'Failed to remove order');
+        console.error(err);
+    }
+}
+
+async function submitEditEntry(e) {
+    e.preventDefault();
+    const form = e.target;
+    const payload = {
+        entry_no: form.entry_no.value,
+        description: form.description.value.trim(),
+        order_quantity: Number(form.order_quantity.value) || 0,
+        payment_status: form.payment_status.value,
+        region: form.region.value,
+        amount: Number(form.amount.value) || 0
+    };
+
+    if (!payload.description) {
+        alert('Please enter a valid description.');
+        return;
+    }
+
+    try {
+        const btn = form.querySelector('button[type="submit"]');
+        btn.disabled = true;
+        btn.textContent = 'Updating...';
+        
+        const res = await jsonFetch('/admin/account/update-entry', {
+            method: 'POST',
+            body: payload
+        });
+        
+        if (!res.success) throw new Error(res.message || 'Update failed');
+        
+        // Success
+        closeEditModal();
+        loadDashboard();
+    } catch (err) {
+        alert(err.message || 'Failed to update entry');
+        console.error(err);
+    } finally {
+        const btn = form.querySelector('button[type="submit"]');
+        if (btn) {
+            btn.disabled = false;
+            btn.textContent = 'Update Entry';
+        }
+    }
+}
+
+/* ---------- Add Order Modal Functions ---------- */
+function openAddOrderModal() {
+    if (!currentEditEntry) return;
+    
+    document.getElementById('addOrderModal').classList.add('modal-open');
+    addOrderCurrentPage = 1;
+    renderAddOrderModal(availableOrders);
+    updateAddOrderPaginationControls();
+}
+
+function closeAddOrderModal() {
+    document.getElementById('addOrderModal').classList.remove('modal-open');
+}
+async function confirmAddOrders() {
+    if (!currentEditEntry) return;
+
+    const selected = Array.from(
+        document.querySelectorAll('#addOrderTableBody input[type="checkbox"]:checked')
+    ).map(i => Number(i.value));
+
+    if (selected.length === 0) {
+        alert('Please select at least one order to add.');
+        return;
+    }
+
+    try {
+        const res = await jsonFetch('/admin/account/add-orders-to-entry', {
+            method: 'POST',
+            body: {
+                entry_no: currentEditEntry.entry_no,
+                order_ids: selected
+            }
+        });
+
+        if (!res.success) throw new Error(res.message || 'Failed to add orders');
+
+        loadEntryOrders(currentEditEntry.entry_no);
+        loadAvailableOrders();
+        await refreshEntryHeader(currentEditEntry.entry_no); // ⬅ इथे नवं
+        closeAddOrderModal();
+    } catch (err) {
+        alert(err.message || 'Failed to add orders');
+        console.error(err);
+    }
+}
+
+
+/* ---------- Delete Entry Function ---------- */
+async function deleteEntry(entryNo) {
+    if (!confirm(`Are you sure you want to delete entry ${entryNo}? This action cannot be undone.`)) {
+        return;
+    }
+
+    try {
+        const res = await jsonFetch('/admin/account/delete-entry', {
+            method: 'POST',
+            body: { entry_no: entryNo }
+        });
+
+        if (!res.success) throw new Error(res.message || 'Delete failed');
+
+        // Success
+        loadDashboard();
+    } catch (err) {
+        alert(err.message || 'Failed to delete entry');
+        console.error(err);
+    }
+}
+
 /* ---------- Create Order Inline (Now in Popup) ---------- */
 async function submitCreateOrderInline(e){
   e.preventDefault();
@@ -1149,21 +2185,27 @@ async function submitCreateOrderInline(e){
     console.error(err);
   } finally {
     const btn = form.querySelector('button[type="submit"]');
-    if(btn){ btn.disabled = false; btn.textContent = 'Create Order'; }
+    if(btn){ btn.disabled = false; btn.textContent = 'Create Installment'; }
   }
 }
 
 /* ---------- Search ---------- */
 function handleSearch(){
   const q = document.getElementById('main-search').value.trim().toLowerCase();
-  if(!q){ renderPaymentTable(entries); renderOrderTable(entries); return; }
+  if(!q){ 
+    renderBothTables(); 
+    updatePaginationControls();
+    return; 
+  }
   const filtered = entries.filter(e => {
     return String(e.entry_no || '').toLowerCase().includes(q) ||
            String(e.description || '').toLowerCase().includes(q) ||
            String(e.region || '').toLowerCase().includes(q);
   });
-  renderPaymentTable(filtered);
-  renderOrderTable(filtered);
+  entries = filtered;
+  currentPage = 1; // Reset to first page when searching
+  renderBothTables();
+  updatePaginationControls();
 }
 
 /* ---------- Entry details & installments ---------- */
@@ -1290,9 +2332,8 @@ async function submitInstallment(e){
   }
 }
 
-/* ---------- Utilities ---------- */
-// ensure consolidate area visible by default
-document.addEventListener('DOMContentLoaded', () => { document.getElementById('consolidateArea').style.display = 'block'; });
+
+
 </script>
 
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/customers.blade.php b/resources/views/admin/customers.blade.php
index dd20aef..3321dc2 100644
--- a/resources/views/admin/customers.blade.php
+++ b/resources/views/admin/customers.blade.php
@@ -5,6 +5,14 @@
 @section('content')
 
 <style>
+    /* Import Inter font */
+    @import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap');
+    
+    body {
+        font-family: 'Inter', sans-serif;
+        overflow-x: hidden; /* Prevent horizontal scroll on body */
+    }
+    
     .glass-card {
         background: rgba(255, 255, 255, 0.95);
         backdrop-filter: blur(20px);
@@ -14,71 +22,171 @@
         overflow: hidden;
     }
     
-    .stats-card {
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    /* New Stats Container */
+    .stats-container {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
+        gap: 12px;
+        margin: 20px 0;
+    }
+
+    .stat-card {
+        background: linear-gradient(135deg, #f8f9ff 0%, #f0f4ff 100%);
+        padding: 16px;
         border-radius: 12px;
-        padding: 15px;
-        color: white;
-        position: relative;
-        overflow: hidden;
+        border-left: 4px solid #4f46e5;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
         transition: transform 0.3s ease;
-        min-height: 80px;
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        min-height: 70px;
     }
-    
-    .stats-card:hover {
-        transform: translateY(-3px);
+
+    .stat-card:hover {
+        transform: translateY(-2px);
     }
-    
-    .stats-count {
-        font-size: 1.4rem;
+
+    .stat-card.warning {
+        border-left-color: #f59e0b;
+        background: linear-gradient(135deg, #fffbeb 0%, #fef3c7 100%);
+    }
+
+    .stat-card.success {
+        border-left-color: #10b981;
+        background: linear-gradient(135deg, #ecfdf5 0%, #d1fae5 100%);
+    }
+
+    .stat-card.danger {
+        border-left-color: #ef4444;
+        background: linear-gradient(135deg, #fef2f2 0%, #fee2e2 100%);
+    }
+
+    .stat-card.info {
+        border-left-color: #3b82f6;
+        background: linear-gradient(135deg, #eff6ff 0%, #dbeafe 100%);
+    }
+
+    .stat-card.secondary {
+        border-left-color: #8b5cf6;
+        background: linear-gradient(135deg, #faf5ff 0%, #f3e8ff 100%);
+    }
+
+    .stat-icon {
+        width: 45px;
+        height: 45px;
+        border-radius: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(79, 70, 229, 0.1);
+        flex-shrink: 0;
+    }
+
+    .stat-icon i {
+        font-size: 18px;
+        color: #4f46e5;
+    }
+
+    .stat-card.warning .stat-icon {
+        background: rgba(245, 158, 11, 0.1);
+    }
+
+    .stat-card.warning .stat-icon i {
+        color: #f59e0b;
+    }
+
+    .stat-card.success .stat-icon {
+        background: rgba(16, 185, 129, 0.1);
+    }
+
+    .stat-card.success .stat-icon i {
+        color: #10b981;
+    }
+
+    .stat-card.danger .stat-icon {
+        background: rgba(239, 68, 68, 0.1);
+    }
+
+    .stat-card.danger .stat-icon i {
+        color: #ef4444;
+    }
+
+    .stat-card.info .stat-icon {
+        background: rgba(59, 130, 246, 0.1);
+    }
+
+    .stat-card.info .stat-icon i {
+        color: #3b82f6;
+    }
+
+    .stat-card.secondary .stat-icon {
+        background: rgba(139, 92, 246, 0.1);
+    }
+
+    .stat-card.secondary .stat-icon i {
+        color: #8b5cf6;
+    }
+
+    .stat-content {
+        flex: 1;
+    }
+
+    .stat-value {
+        font-size: 22px;
         font-weight: 700;
+        color: #1a202c;
+        line-height: 1.2;
         margin-bottom: 2px;
     }
-    
-    .stats-label {
-        font-size: 0.75rem;
-        opacity: 0.9;
+
+    .stat-label {
+        font-size: 12px;
+        color: #718096;
         font-weight: 500;
+        line-height: 1.3;
     }
     
-    .stats-icon {
-        position: absolute;
-        top: 12px;
-        right: 12px;
-        font-size: 1.2rem;
-        opacity: 0.7;
-    }
-    
+    /* Updated Search Container - Wider with icon on left */
     .search-container {
         background: rgba(255, 255, 255, 0.9);
         border-radius: 10px;
-        padding: 8px 15px;
+        padding: 6px 12px;
         border: 1px solid rgba(0, 0, 0, 0.1);
         box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
-        width: 100%;
+        width: 350px; /* Increased width */
+        display: flex;
+        align-items: center;
     }
     
     .search-input {
         border: none;
         background: transparent;
-        padding: 5px 10px;
+        padding: 4px 8px;
         width: 100%;
-        font-size: 14px;
+        font-size: 13px;
         outline: none;
+        font-family: 'Inter', sans-serif;
+    }
+    
+    .search-input::placeholder {
+        color: #9ca3af;
+        font-size: 13px;
     }
     
     .filter-btn {
         background: rgba(102, 126, 234, 0.1);
         border: 2px solid transparent;
         color: #667eea;
-        padding: 6px 15px;
+        padding: 5px 12px;
         border-radius: 8px;
         font-weight: 600;
         transition: all 0.3s ease;
-        margin: 0 5px;
+        margin: 0 3px;
         text-decoration: none;
         display: inline-block;
-        font-size: 0.8rem;
+        font-size: 0.75rem;
+        font-family: 'Inter', sans-serif;
     }
     
     .filter-btn.active {
@@ -91,45 +199,106 @@
         background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
         border: none;
         border-radius: 8px;
-        padding: 8px 20px;
+        padding: 6px 16px;
         color: white;
         font-weight: 600;
         box-shadow: 0 4px 15px rgba(102, 126, 234, 0.4);
         transition: all 0.3s ease;
         text-decoration: none;
         display: inline-block;
-        font-size: 0.8rem;
+        font-size: 0.75rem;
+        font-family: 'Inter', sans-serif;
     }
     
+    /* Updated Table Styles - Fixed horizontal scroll */
     .table-glass {
         background: rgba(255, 255, 255, 0.9);
         border-radius: 10px;
         overflow: hidden;
         box-shadow: 0 4px 15px rgba(0, 0, 0, 0.05);
+        font-family: 'Inter', sans-serif;
     }
     
-    .table-header {
+    /* Single gradient for entire header - Blue to Purple */
+    .table thead {
         background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
+    }
+   
+    .table-header {
         color: white !important;
         font-weight: 600;
-        font-size: 0.9rem;
-        padding: 12px 15px !important;
-        position: relative;
+        font-size: 0.85rem;
+        padding: 14px 12px !important;
         border: none;
+        font-family: 'Inter', sans-serif;
+        position: relative;
+        background: linear-gradient(135deg, #667eea 0%);;
+
     }
     
-    /* Curved borders for table headers */
+    /* Remove individual curved borders */
     .table-header:first-child {
-        border-top-left-radius: 10px;
+        border-top-left-radius: 0;
     }
     
     .table-header:last-child {
+        border-top-right-radius: 0;
+    }
+    
+    /* Apply rounded corners to the entire header container */
+    .table-container thead tr:first-child th:first-child {
+        border-top-left-radius: 10px;
+    }
+    
+    .table-container thead tr:first-child th:last-child {
         border-top-right-radius: 10px;
     }
     
+    /* Updated Table Column Alignment */
     .table > :not(caption) > * > * {
-        padding: 12px 15px;
+        padding: 14px 12px;
         border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+        font-size: 14px;
+        font-family: 'Inter', sans-serif;
+        vertical-align: middle;
+    }
+
+    /* Center align specific columns */
+    .table > :not(caption) > * > *:nth-child(2), /* Customer ID */
+    .table > :not(caption) > * > *:nth-child(3), /* Orders */
+    .table > :not(caption) > * > *:nth-child(4), /* Total */
+    .table > :not(caption) > * > *:nth-child(5) { /* Create Date */
+        text-align: center;
+    }
+
+    /* Customer Info column should remain left-aligned */
+    .table > :not(caption) > * > *:first-child {
+        text-align: left;
+    }
+
+    /* Status and Actions columns should remain as is */
+    .table > :not(caption) > * > *:nth-child(6), /* Status */
+    .table > :not(caption) > * > *:nth-child(7) { /* Actions */
+        text-align: center;
+    }
+
+    /* Updated header alignment to match */
+    .table-header:nth-child(2),
+    .table-header:nth-child(3),
+    .table-header:nth-child(4),
+    .table-header:nth-child(5) {
+        text-align: center;
+    }
+
+    /* Customer Info header stays left */
+    .table-header:first-child {
+        text-align: Center;
+    }
+
+    /* Status and Actions headers stay centered */
+    .table-header:nth-child(6),
+    .table-header:nth-child(7) {
+        text-align: center;
     }
     
     .customer-avatar {
@@ -165,7 +334,7 @@
     }
     
     .status-badge {
-        padding: 4px 10px;
+        padding: 5px 10px;
         border-radius: 8px;
         font-size: 0.75rem;
         font-weight: 600;
@@ -203,15 +372,9 @@
         transform: scale(1.05);
     }
     
-    .stats-row {
-        display: grid;
-        grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
-        gap: 12px;
-        margin-bottom: 20px;
-    }
-    
     .customer-info-column {
-        min-width: 300px;
+        min-width: 220px;
+        max-width: 220px; /* Added max-width to prevent overflow */
     }
     
     .table tbody tr {
@@ -228,44 +391,28 @@
         color: #6c757d;
     }
     
-    .customer-stats {
-        font-size: 0.75rem;
-        color: #6c757d;
-    }
+    /* Remove customer-stats since we're adding columns */
     
-    /* Enhanced table styling */
+    /* Enhanced table styling - Fixed horizontal scroll */
     .table-container {
         border-radius: 10px;
         overflow: hidden;
+        width: 100%; /* Ensure container takes full width */
     }
     
-    .table-header-container {
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 10px 10px 0 0;
-        overflow: hidden;
-    }
-
-    /* Remove horizontal scroll */
+    /* Fix table responsiveness */
     .table-responsive {
-        overflow-x: visible !important;
+        overflow-x: auto;
+        -webkit-overflow-scrolling: touch;
+        width: 100%;
     }
-
-    .container-fluid {
-        overflow-x: hidden;
-    }
-
-    /* Adjust table layout to fit without scroll */
+    
+    /* Ensure table doesn't exceed container */
     .table {
         width: 100%;
-        min-width: auto;
-    }
-
-    /* Ensure proper column sizing */
-    .table th,
-    .table td {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        max-width: 100%;
+        margin-bottom: 0;
+        table-layout: auto; /* Changed to auto for better column distribution */
     }
     
     /* Fix for search and filter section */
@@ -275,91 +422,360 @@
         justify-content: space-between;
         flex-wrap: nowrap;
         gap: 15px;
+        width: 100%;
     }
     
     .search-section {
-        flex: 1;
-        min-width: 300px;
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
     }
     
     .filter-section {
         display: flex;
         align-items: center;
         flex-wrap: nowrap;
-        gap: 8px;
+        gap: 6px;
+        flex-shrink: 0;
+    }
+
+    /* New columns styling */
+    .orders-column, .total-column, .customer-id-column, .create-date-column {
+        text-align: center;
+        font-weight: 500;
+        min-width: 80px; /* Added minimum widths for consistency */
     }
     
+    .orders-count {
+        font-size: 14px;
+        color: #1a202c;
+        font-weight: 600;
+    }
+    
+    .total-amount {
+        font-size: 14px;
+        color: #10b981;
+        font-weight: 600;
+    }
+
+    /* ---------- Pagination Styles ---------- */
+    .pagination-container {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 15px;
+        padding: 12px 0;
+        border-top: 1px solid #eef3fb;
+        font-family: 'Inter', sans-serif;
+        width: 100%;
+    }
+
+    .pagination-info {
+        font-size: 13px;
+        color: #9ba5bb;
+        font-weight: 600;
+        flex-shrink: 0;
+    }
+
+    .pagination-controls {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        flex-wrap: wrap;
+        justify-content: flex-end;
+    }
+
+    .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;
+        text-decoration: none;
+        display: inline-block;
+    }
+
+    .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;
+        flex-wrap: wrap;
+    }
+
+    .pagination-ellipsis {
+        color: #9ba5bb;
+        font-size: 13px;
+        padding: 0 4px;
+    }
+
+    /* Image-based pagination buttons */
+    .pagination-img-btn {
+        background: #fff;
+        border: 1px solid #e3eaf6;
+        border-radius: 6px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 40px;
+        height: 32px;
+        padding: 0;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) {
+        background: #1a2951;
+        border-color: #1a2951;
+    }
+
+    .pagination-img-btn:disabled {
+        background: #f8fafc;
+        border-color: #e2e8f0;
+        cursor: not-allowed;
+        opacity: 0.5;
+    }
+
+    .pagination-img-btn img {
+        width: 16px;
+        height: 16px;
+        filter: brightness(0) saturate(100%) invert(26%) sepia(89%) saturate(748%) hue-rotate(201deg) brightness(93%) contrast(89%);
+        transition: filter 0.3s ease;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) img {
+        filter: brightness(0) saturate(100%) invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(106%) contrast(101%);
+    }
+
+    .pagination-img-btn:disabled img {
+        filter: brightness(0) saturate(100%) invert(84%) sepia(8%) saturate(165%) hue-rotate(179deg) brightness(89%) contrast(86%);
+    }
+
+    /* Mobile responsive fixes */
+    @media (max-width: 1200px) {
+        .table > :not(caption) > * > * {
+            padding: 12px 8px;
+            font-size: 13px;
+        }
+        
+        .customer-info-column {
+            min-width: 180px;
+            max-width: 180px;
+        }
+    }
+
+    @media (max-width: 992px) {
+        .search-container {
+            width: 280px;
+        }
+        
+        .stats-container {
+            grid-template-columns: repeat(2, 1fr);
+        }
+    }
+
     @media (max-width: 768px) {
+        .stats-container {
+            grid-template-columns: repeat(2, 1fr);
+        }
+        
         .search-filter-container {
             flex-direction: column;
             align-items: stretch;
+            gap: 10px;
         }
         
         .search-section {
-            min-width: auto;
+            justify-content: center;
+        }
+        
+        .search-container {
+            width: 100%;
         }
         
         .filter-section {
             justify-content: center;
             flex-wrap: wrap;
         }
+
+        .pagination-container {
+            flex-direction: column;
+            gap: 10px;
+            align-items: stretch;
+        }
+        
+        .pagination-controls {
+            justify-content: center;
+        }
+        
+        .table > :not(caption) > * > * {
+            padding: 10px 6px;
+            font-size: 12px;
+        }
+        
+        .customer-info-column {
+            min-width: 150px;
+            max-width: 150px;
+        }
+        
+        .customer-avatar {
+            width: 32px;
+            height: 32px;
+            font-size: 0.8rem;
+        }
+        
+        .action-btn {
+            width: 26px;
+            height: 26px;
+            font-size: 0.7rem;
+        }
+    }
+
+    @media (max-width: 576px) {
+        .stats-container {
+            grid-template-columns: 1fr;
+        }
+        
+        .table-responsive {
+            font-size: 12px;
+        }
+        
+        .customer-info-column {
+            min-width: 120px;
+            max-width: 120px;
+        }
+        
+        .premium-badge,
+        .regular-badge,
+        .status-badge {
+            font-size: 0.6rem;
+            padding: 2px 6px;
+        }
     }
 </style>
 
 <div class="container-fluid">
-    <!-- Header -->
+    <!-- Header - Removed gradient -->
     <div class="d-flex justify-content-between align-items-center mb-3">
-        <h4 style="color: #2c3e50; font-weight: 700;">Customer List</h4>
+        <h4 style="color: #2c3e50; font-weight: 700; font-family: 'Inter', sans-serif;">Customer List</h4>
     </div>
 
-    <!-- Stats Cards with REAL DATA -->
-    <div class="stats-row">
-        <div class="stats-card">
-            <div class="stats-count">{{ $customers->count() }}</div>
-            <div class="stats-label">Total Customers</div>
-            <i class="bi bi-people-fill stats-icon"></i>
+    <!-- Stats Cards with NEW DESIGN -->
+    <div class="stats-container">
+        <!-- Total Customers -->
+        <div class="stat-card">
+            <div class="stat-icon">
+                <i class="bi bi-people-fill"></i>
+            </div>
+            <div class="stat-content">
+                <div class="stat-value">{{ $allCustomers->count() }}</div>
+                <div class="stat-label">Total Customers</div>
+            </div>
         </div>
         
-        <div class="stats-card" style="background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);">
-            <div class="stats-count">
-                @php
-                    $newThisMonth = $customers->filter(function($customer) {
-                        return $customer->created_at->format('Y-m') === now()->format('Y-m');
-                    })->count();
-                @endphp
-                {{ $newThisMonth }}
+        <!-- New This Month -->
+        <div class="stat-card warning">
+            <div class="stat-icon">
+                <i class="bi bi-person-plus"></i>
+            </div>
+            <div class="stat-content">
+                <div class="stat-value">
+                    @php
+                        $newThisMonth = $allCustomers->filter(function($customer) {
+                            return $customer->created_at->format('Y-m') === now()->format('Y-m');
+                        })->count();
+                    @endphp
+                    {{ $newThisMonth }}
+                </div>
+                <div class="stat-label">New This Month</div>
             </div>
-            <div class="stats-label">New This Month</div>
-            <i class="bi bi-person-plus stats-icon"></i>
         </div>
         
-        <div class="stats-card" style="background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);">
-            <div class="stats-count">
-                @php
-                    $activeCustomers = $customers->where('status', 'active')->count();
-                @endphp
-                {{ $activeCustomers }}
+        <!-- Active Customers -->
+        <div class="stat-card success">
+            <div class="stat-icon">
+                <i class="bi bi-activity"></i>
+            </div>
+            <div class="stat-content">
+                <div class="stat-value">
+                    @php
+                        $activeCustomers = $allCustomers->where('status', 'active')->count();
+                    @endphp
+                    {{ $activeCustomers }}
+                </div>
+                <div class="stat-label">Active Customers</div>
             </div>
-            <div class="stats-label">Active Customers</div>
-            <i class="bi bi-activity stats-icon"></i>
         </div>
         
-        <div class="stats-card" style="background: linear-gradient(135deg, #43e97b 0%, #38f9d7 100%);">
-            <div class="stats-count">
-                @php
-                    $premiumCount = $customers->where('customer_type', 'premium')->count();
-                @endphp
-                {{ $premiumCount }}
+        <!-- Premium Customers -->
+        <div class="stat-card secondary">
+            <div class="stat-icon">
+                <i class="bi bi-award-fill"></i>
+            </div>
+            <div class="stat-content">
+                <div class="stat-value">
+                    @php
+                        $premiumCount = $allCustomers->where('customer_type', 'premium')->count();
+                    @endphp
+                    {{ $premiumCount }}
+                </div>
+                <div class="stat-label">Premium Customers</div>
             </div>
-            <div class="stats-label">Premium Customers</div>
-            <i class="bi bi-award-fill stats-icon"></i>
         </div>
     </div>
 
-    <!-- Search and Filter Section - FIXED LAYOUT -->
+    <!-- Search and Filter Section -->
     <div class="glass-card p-3 mb-3">
         <div class="search-filter-container">
-            <!-- Search Section -->
+            <!-- Search Section - Wider with icon on left -->
             <div class="search-section">
                 <form method="GET" action="{{ route('admin.customers.index') }}" class="d-flex align-items-center">
                     <div class="search-container">
@@ -368,7 +784,7 @@
                                name="search"
                                value="{{ $search ?? '' }}"
                                class="search-input" 
-                               placeholder="Search Customer Name, Email, or Phone...">
+                               placeholder="Search customers by name, email, or phone...">
                         @if(!empty($status))
                             <input type="hidden" name="status" value="{{ $status }}">
                         @endif
@@ -404,16 +820,18 @@
     <div class="table-container">
         <div class="table-responsive">
             <table class="table table-hover align-middle mb-0">
-                <thead>
+                <thead class="gradient-table-header">
                     <tr>
                         <th class="table-header">Customer Info</th>
                         <th class="table-header">Customer ID</th>
+                        <th class="table-header">Orders</th>
+                        <th class="table-header">Total</th>
                         <th class="table-header">Create Date</th>
                         <th class="table-header">Status</th>
-                        <th class="table-header" width="120">Actions</th>
+                        <th class="table-header" width="100">Actions</th>
                     </tr>
                 </thead>
-                <tbody>
+                <tbody id="customersTableBody">
                     @forelse($customers as $c)
                     <tr>
                         <!-- Customer Info Column -->
@@ -433,20 +851,27 @@
                                         {{ $c->email }}<br>
                                         {{ $c->mobile_no }}
                                     </div>
-                                    <div class="customer-stats mt-1">
-                                        {{ $c->orders->count() }} orders • ₹{{ number_format($c->orders->sum('ttl_amount'), 2) }} total
-                                    </div>
                                 </div>
                             </div>
                         </td>
 
                         <!-- Customer ID -->
-                        <td>
+                        <td class="customer-id-column">
                             <span class="fw-bold text-primary">{{ $c->customer_id }}</span>
                         </td>
 
+                        <!-- Orders Column -->
+                        <td class="orders-column">
+                            <span class="orders-count">{{ $c->orders->count() }}</span>
+                        </td>
+
+                        <!-- Total Column -->
+                        <td class="total-column">
+                            <span class="total-amount">₹{{ number_format($c->orders->sum('ttl_amount'), 2) }}</span>
+                        </td>
+
                         <!-- Create Date -->
-                        <td>
+                        <td class="create-date-column">
                             <span class="text-muted">{{ $c->created_at ? $c->created_at->format('d-m-Y') : '-' }}</span>
                         </td>
 
@@ -461,7 +886,7 @@
 
                         <!-- Actions -->
                         <td>
-                            <div class="d-flex">
+                            <div class="d-flex justify-content-center">
                                 <a href="{{ route('admin.customers.view', $c->id) }}"
                                    class="action-btn" title="View">
                                    <i class="bi bi-eye"></i>
@@ -479,7 +904,7 @@
                     </tr>
                     @empty
                     <tr>
-                        <td colspan="5" class="text-center py-4">
+                        <td colspan="7" class="text-center py-4">
                             <i class="bi bi-people display-4 text-muted d-block mb-2"></i>
                             <span class="text-muted">No customers found.</span>
                         </td>
@@ -489,6 +914,64 @@
             </table>
         </div>
     </div>
+
+    <!-- Pagination Controls -->
+    <div class="pagination-container">
+        <div class="pagination-info" id="pageInfo">
+            Showing {{ $customers->firstItem() ?? 0 }} to {{ $customers->lastItem() ?? 0 }} of {{ $customers->total() }} entries
+        </div>
+        <div class="pagination-controls">
+            <button class="pagination-img-btn" id="prevPageBtn" title="Previous page" {{ $customers->onFirstPage() ? 'disabled' : '' }}>
+                <!-- Left arrow SVG -->
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                </svg>
+            </button>
+            <div class="pagination-pages" id="paginationPages">
+                @for ($i = 1; $i <= $customers->lastPage(); $i++)
+                    <a href="{{ $customers->url($i) }}" 
+                       class="pagination-page-btn {{ $customers->currentPage() == $i ? 'active' : '' }}">
+                        {{ $i }}
+                    </a>
+                @endfor
+            </div>
+            <button class="pagination-img-btn" id="nextPageBtn" title="Next page" {{ $customers->hasMorePages() ? '' : 'disabled' }}>
+                <!-- Right arrow SVG -->
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                </svg>
+            </button>
+        </div>
+    </div>
 </div>
 
+<script>
+    document.addEventListener('DOMContentLoaded', function() {
+        // Add hover effects to table rows
+        const tableRows = document.querySelectorAll('.table tbody tr');
+        tableRows.forEach(row => {
+            row.addEventListener('mouseenter', function() {
+                this.style.transform = 'translateX(5px)';
+            });
+            
+            row.addEventListener('mouseleave', function() {
+                this.style.transform = 'translateX(0)';
+            });
+        });
+
+        // Pagination button handlers
+        document.getElementById('prevPageBtn').addEventListener('click', function() {
+            @if(!$customers->onFirstPage())
+                window.location.href = '{{ $customers->previousPageUrl() }}';
+            @endif
+        });
+
+        document.getElementById('nextPageBtn').addEventListener('click', function() {
+            @if($customers->hasMorePages())
+                window.location.href = '{{ $customers->nextPageUrl() }}';
+            @endif
+        });
+    });
+</script>
+
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 1dc430a..c08ec6c 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -12,6 +12,7 @@ html, body {
 
 body, .container-fluid { 
   background: #f4f7fc; 
+  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
 }
 
 .container-fluid {
@@ -34,6 +35,7 @@ body, .container-fluid {
   letter-spacing: .018em;
   color: #18213e;
   margin-bottom: 2px;
+  font-family: 'Inter', sans-serif;
 }
 
 .dash-title-desc {
@@ -42,6 +44,7 @@ body, .container-fluid {
   margin-bottom: 5px;
   font-weight: 500;
   letter-spacing: .01em;
+  font-family: 'Inter', sans-serif;
 }
 
 /* ===== STATS CARDS - RESPONSIVE GRID ===== */
@@ -127,12 +130,14 @@ body, .container-fluid {
   color:#63709b; 
   font-weight:600; 
   letter-spacing:.28px;
+  font-family: 'Inter', sans-serif;
 }
 
 .stats-value { 
   font-size:1.25rem; 
   font-weight:700; 
   color:#194073;
+  font-family: 'Inter', sans-serif;
 }
 
 .stats-card:hover .stats-icon {
@@ -170,6 +175,7 @@ body, .container-fluid {
   display: flex; 
   align-items: center; 
   gap: 11px;
+  font-family: 'Inter', sans-serif;
 }
 
 .order-mgmt-title i { 
@@ -191,6 +197,7 @@ body, .container-fluid {
   align-items: center; 
   gap: 8px; 
   font-family: inherit;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-btn:hover {
@@ -201,7 +208,7 @@ body, .container-fluid {
 .card-body, .order-mgmt-main { 
   background: #fff; 
   border-radius: 0 0 17px 17px; 
-  padding:25px; 
+  padding:20px; 
   margin-top: 15px;
 }
 
@@ -213,7 +220,7 @@ body, .container-fluid {
   margin-top: 15px;
 }
 
-/* ===== TABLE STYLES ===== */
+/* ===== IMPROVED TABLE STYLES ===== */
 .table thead tr {
   background: #feebbe !important;
   border-radius: 12px 12px 0 0;
@@ -226,9 +233,10 @@ body, .container-fluid {
   font-weight: 700; 
   color: #343535; 
   letter-spacing: 0.02em; 
-  font-size:15px;
-  padding-top: 12px; 
-  padding-bottom: 10px;
+  font-size: 15px;
+  padding: 16px 12px;
+  font-family: 'Inter', sans-serif;
+  border-bottom: 2px solid #e9ecef;
 }
 
 .table thead th:first-child  { border-radius: 9px 0 0 0;}
@@ -239,20 +247,24 @@ body, .container-fluid {
   border-radius:9px; 
   box-shadow:0 2px 12px #e2ebf941;
   border-collapse: separate;
-  border-spacing: 0 2px;
+  border-spacing: 0 8px;
+  font-family: 'Inter', sans-serif;
+  font-size: 14px;
 }
 
 .table-striped tbody tr {
   background: #fff;
-  border-radius: 6px;
-  box-shadow: 0 1px 3px rgba(0,0,0,0.04);
-  margin-bottom: 2px;
+  border-radius: 8px;
+  box-shadow: 0 2px 6px rgba(0,0,0,0.04);
+  margin-bottom: 8px;
   transition: all 0.3s ease;
+  height: 60px;
 }
 
 .table-striped tbody tr:hover {
-  box-shadow: 0 2px 6px rgba(0,0,0,0.08); 
-  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(0,0,0,0.08); 
+  transform: translateY(-2px);
+  background: #f8fafd;
 }
 
 .table-striped tbody tr:nth-of-type(odd) { 
@@ -264,39 +276,110 @@ body, .container-fluid {
 }
 
 .table td {
-  padding: 12px 6px;
+  padding: 14px 12px;
   border: none;
   position: relative;
+  vertical-align: middle;
+  font-family: 'Inter', sans-serif;
+  font-size: 14px;
+  font-weight: 500;
+  color: #495057;
+  line-height: 1.5;
+  border-bottom: 1px solid #f1f3f4;
 }
 
 .table td:first-child {
-  border-radius: 6px 0 0 6px; 
+  border-radius: 8px 0 0 8px; 
+  border-left: 3px solid transparent;
 }
 
 .table td:last-child {
-  border-radius: 0 6px 6px 0; 
+  border-radius: 0 8px 8px 0; 
 }
 
 .table-responsive { 
   border-radius:10px; 
 }
 
-.badge { 
-  font-size:13px; 
-  font-weight:600; 
-  padding:7px 17px; 
-  border-radius:12px;
+/* ===== UPDATED STATUS BADGE STYLES ===== */
+.badge {
+  padding: 7px 17px !important;
+  border-radius: 20px !important;
+  font-weight: 600 !important;
+  font-size: 13px !important;
+  border: 2px solid transparent !important;
+  min-width: 40px !important;
+  text-align: center !important;
+  display: inline-flex !important;
+  align-items: center;
+  justify-content: center;
+  line-height: 1.2 !important;
+  font-family: 'Inter', sans-serif;
+  gap: 6px;
+  width: 110px;
 }
 
-.bg-info { 
-  background-color:#22cbfa!important; 
-  color:#fff!important;
+.status-icon {
+  font-size: 13px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* Pending Status - SAME SIZE WITH CLOCK ICON */
+.badge-pending {
+  background: linear-gradient(135deg, #fef3c7, #fde68a) !important;
+  color: #d97706 !important;
+  border-color: #f59e0b !important;
+}
+
+/* In Transit Status - SAME SIZE WITH TRUCK ICON */
+.badge-in_transit {
+  background: linear-gradient(135deg, #dbeafe, #93c5fd) !important;
+  color: #1e40af !important;
+  border-color: #3b82f6 !important;
+}
+
+/* Dispatched Status - SAME SIZE WITH BOX ICON */
+.badge-dispatched {
+  background: linear-gradient(135deg, #e9d5ff, #c4b5fd) !important;
+  color: #6b21a8 !important;
+  border-color: #8b5cf6 !important;
+}
+
+/* Delivered Status - SAME SIZE WITH CHECK ICON */
+.badge-delivered {
+  background: linear-gradient(135deg, #d1fae5, #a7f3d0) !important;
+  color: #065f46 !important;
+  border-color: #10b981 !important;
+}
+
+/* Default badge styles - SAME SIZE */
+.badge.bg-info {
+  background: linear-gradient(135deg, #4cc9f0, #4361ee) !important;
+  color: white !important;
+}
+
+.badge.bg-success {
+  background: linear-gradient(135deg, #4ade80, #22c55e) !important;
+  color: white !important;
+}
+
+.badge.bg-warning {
+  background: linear-gradient(135deg, #fbbf24, #f59e0b) !important;
+  color: white !important;
+}
+
+.badge.bg-danger {
+  background: linear-gradient(135deg, #f87171, #ef4444) !important;
+  color: white !important;
 }
 
 .form-label { 
   font-weight:600; 
   color:#1d3159; 
   font-size:15px;
+  font-family: 'Inter', sans-serif;
 }
 
 .form-control, .form-select {
@@ -305,6 +388,7 @@ body, .container-fluid {
   background: #f7f9fe;
   border:1.2px solid #c7dbfa; 
   font-weight:500;
+  font-family: 'Inter', sans-serif;
 }
 
 .form-control:focus, .form-select:focus {
@@ -316,6 +400,7 @@ body, .container-fluid {
   color:#2469d6; 
   font-weight:600; 
   text-decoration:underline; 
+  font-family: 'Inter', sans-serif;
 }
 
 /* ===== HORIZONTAL SCROLL CONTAINER ===== */
@@ -327,7 +412,7 @@ body, .container-fluid {
   border-radius: 12px;
   background: #fff;
   box-shadow: 0 2px 10px rgba(0,0,0,0.08);
-  padding: 8px;
+  padding: 12px;
 }
 
 .table-wrapper::-webkit-scrollbar {
@@ -348,7 +433,7 @@ body, .container-fluid {
 }
 
 .table {
-  min-width: 1200px;
+  min-width: 2000px;
   border-radius: 10px;
 }
 
@@ -394,6 +479,7 @@ body, .container-fluid {
   font-size: 1.4rem;
   font-weight: 700;
   margin: 0;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-modal .close-btn {
@@ -425,6 +511,7 @@ body, .container-fluid {
   color: #1d3159;
   font-size: 15px;
   margin-bottom: 5px;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-modal .form-control,
@@ -435,6 +522,7 @@ body, .container-fluid {
   font-size: 15px;
   font-weight: 500;
   padding: 8px 12px;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-modal .form-control:focus,
@@ -449,6 +537,7 @@ body, .container-fluid {
   padding: 10px 20px;
   font-weight: 600;
   border-radius: 8px;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-modal .btn-info:hover {
@@ -461,6 +550,7 @@ body, .container-fluid {
   padding: 12px 30px;
   font-weight: 600;
   border-radius: 8px;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-modal .btn-success:hover {
@@ -472,6 +562,7 @@ body, .container-fluid {
   border: none;
   color: #000;
   font-weight: 600;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-modal .btn-warning:hover {
@@ -481,6 +572,7 @@ body, .container-fluid {
 .create-order-modal .btn-danger {
   background: #dc3545;
   border: none;
+  font-family: 'Inter', sans-serif;
 }
 
 .create-order-modal .btn-danger:hover {
@@ -505,6 +597,7 @@ body, .container-fluid {
   position: sticky;
   top: 0;
   z-index: 10;
+  font-family: 'Inter', sans-serif;
 }
 
 /* ===== ORDER DETAILS MODAL STYLES ===== */
@@ -536,6 +629,7 @@ body, .container-fluid {
   font-weight: 700;
   color: white;
   margin: 0;
+  font-family: 'Inter', sans-serif;
 }
 
 .modal-header .btn-close {
@@ -554,6 +648,143 @@ body, .container-fluid {
   background: #f8fafc;
   max-height: 70vh;
   overflow-y: auto;
+  font-family: 'Inter', sans-serif;
+}
+
+/* ===== PAGINATION STYLES ===== */
+.pagination-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 15px;
+    padding: 12px 0;
+    border-top: 1px solid #eef3fb;
+}
+
+.pagination-info {
+    font-size: 13px;
+    color: #9ba5bb;
+    font-weight: 600;
+    font-family: 'Inter', sans-serif;
+}
+
+.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;
+    font-family: 'Inter', sans-serif;
+}
+
+.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;
+    font-family: 'Inter', sans-serif;
+}
+
+.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;
+    font-family: 'Inter', sans-serif;
+}
+
+.pagination-img-btn {
+    background: #fff;
+    border: 1px solid #e3eaf6;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 40px;
+    height: 32px;
+    padding: 0;
+}
+
+.pagination-img-btn:hover:not(:disabled) {
+    background: #1a2951;
+    border-color: #1a2951;
+}
+
+.pagination-img-btn:disabled {
+    background: #f8fafc;
+    border-color: #e2e8f0;
+    cursor: not-allowed;
+    opacity: 0.5;
+}
+
+.pagination-img-btn img {
+    width: 16px;
+    height: 16px;
+    filter: brightness(0) saturate(100%) invert(26%) sepia(89%) saturate(748%) hue-rotate(201deg) brightness(93%) contrast(89%);
+    transition: filter 0.3s ease;
+}
+
+.pagination-img-btn:hover:not(:disabled) img {
+    filter: brightness(0) saturate(100%) invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(106%) contrast(101%);
+}
+
+.pagination-img-btn:disabled img {
+    filter: brightness(0) saturate(100%) invert(84%) sepia(8%) saturate(165%) hue-rotate(179deg) brightness(89%) contrast(86%);
 }
 
 /* ===== RESPONSIVE BREAKPOINTS ===== */
@@ -596,7 +827,17 @@ body, .container-fluid {
   
   .table th,
   .table td {
-    padding: 10px 5px;
+    padding: 12px 8px;
+  }
+
+  .pagination-container {
+    flex-direction: column;
+    gap: 10px;
+    align-items: stretch;
+  }
+  
+  .pagination-controls {
+    justify-content: center;
   }
 }
 
@@ -669,7 +910,7 @@ body, .container-fluid {
   
   .table th,
   .table td {
-    padding: 8px 4px;
+    padding: 10px 6px;
   }
   
   .badge {
@@ -771,7 +1012,7 @@ body, .container-fluid {
   
   .table th,
   .table td {
-    padding: 6px 3px;
+    padding: 8px 4px;
   }
   
   .form-control, .form-select {
@@ -900,69 +1141,107 @@ body, .container-fluid {
       <div class="card shadow-sm">
         <div class="card-header bg-light">
           <strong>Recent Orders</strong>
+          <span style="font-size:13px;color:#6577a3;margin-left:10px;">
+            Total orders: <span id="ordersCount">{{ $orders->count() }}</span>
+          </span>
         </div>
         <div class="card-body table-responsive">
-          <table class="table table-striped table-bordered align-middle text-center">
-            <thead class="table-light">
-              <tr>
-                <th>#</th>
-                <th>Order ID</th>
-                <th>Mark No</th>
-                <th>Origin</th>
-                <th>Destination</th>
-                <th>Total CTN</th>
-                <th>Total QTY</th>
-                <th>Total TTL/QTY</th>
-                <th>Total Amount (₹)</th>
-                <th>Total CBM</th>
-                <th>Total TTL CBM</th>
-                <th>Total KG</th>
-                <th>Total TTL KG</th>
-                <th>Status</th>
-                <th>Date</th>
-                <th>Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              @forelse($orders as $order)
-              <tr>
-                <td>{{ $order->id }}</td>
-                <td>
-                  <a href="javascript:void(0)"
-                    class="fw-semibold text-primary open-order-modal"
-                    data-id="{{ $order->id }}">
-                    {{ $order->order_id }}
-                  </a>
-                </td>
-
-                  <td>{{ $order->mark_no }}</td>
-                  <td>{{ $order->origin }}</td>
-                  <td>{{ $order->destination }}</td>
-                  <td>{{ $order->ctn }}</td>
-                  <td>{{ $order->qty }}</td>
-                  <td>{{ $order->ttl_qty }}</td>
-                  <td>₹{{ number_format($order->ttl_amount, 2) }}</td>
-                  <td>{{ $order->cbm }}</td>
-                  <td>{{ $order->ttl_cbm }}</td>
-                  <td>{{ $order->kg }}</td>
-                  <td>{{ $order->ttl_kg }}</td>
+          <div class="table-wrapper">
+            <table class="table table-striped table-bordered align-middle text-center">
+              <thead class="table-light">
+                <tr>
+                  <th>#</th>
+                  <th>Order ID</th>
+                  <th>Mark No</th>
+                  <th>Origin</th>
+                  <th>Destination</th>
+                  <th>Total CTN</th>
+                  <th>Total QTY</th>
+                  <th>Total TTL/QTY</th>
+                  <th>Total Amount (₹)</th>
+                  <th>Total CBM</th>
+                  <th>Total TTL CBM</th>
+                  <th>Total KG</th>
+                  <th>Total TTL KG</th>
+                  <th>Status</th>
+                  <th>Date</th>
+                  <th>Actions</th>
+                </tr>
+              </thead>
+              <tbody id="ordersTableBody">
+                @forelse($orders as $order)
+                <tr>
+                  <td>{{ $order->id }}</td>
                   <td>
-                    <span class="badge bg-info text-dark">{{ ucfirst($order->status) }}</span>
-                  </td>
-                  <td>{{ $order->created_at->format('d-m-Y') }}</td>
-                  <td>
-                    <a href="{{ route('admin.orders.show', $order->id) }}" class="btn btn-sm btn-outline-primary">
-                      <i class="bi bi-eye"></i> View
+                    <a href="javascript:void(0)"
+                      class="fw-semibold text-primary open-order-modal"
+                      data-id="{{ $order->id }}">
+                      {{ $order->order_id }}
                     </a>
                   </td>
-                </tr>
-                @empty
-                <tr>
-                  <td colspan="16" class="text-muted">No orders found</td>
-                </tr>
-                @endforelse
-              </tbody>
-            </table>
+
+                    <td>{{ $order->mark_no }}</td>
+                    <td>{{ $order->origin }}</td>
+                    <td>{{ $order->destination }}</td>
+                    <td>{{ $order->ctn }}</td>
+                    <td>{{ $order->qty }}</td>
+                    <td>{{ $order->ttl_qty }}</td>
+                    <td>₹{{ number_format($order->ttl_amount, 2) }}</td>
+                    <td>{{ $order->cbm }}</td>
+                    <td>{{ $order->ttl_cbm }}</td>
+                    <td>{{ $order->kg }}</td>
+                    <td>{{ $order->ttl_kg }}</td>
+                    <td>
+                      <span class="badge badge-{{ $order->status }}">
+                        @if($order->status == 'pending')
+                          <i class="bi bi-clock-fill status-icon"></i>
+                        @elseif($order->status == 'in_transit')
+                          <i class="bi bi-truck status-icon"></i>
+                        @elseif($order->status == 'dispatched')
+                          <i class="bi bi-box-seam status-icon"></i>
+                        @elseif($order->status == 'delivered')
+                          <i class="bi bi-check-circle-fill status-icon"></i>
+                        @endif
+                        {{ ucfirst(str_replace('_', ' ', $order->status)) }}
+                      </span>
+                    </td>
+                    <td>{{ $order->created_at->format('d-m-Y') }}</td>
+                    <td>
+                      <a href="{{ route('admin.orders.show', $order->id) }}" class="btn btn-sm btn-outline-primary">
+                        <i class="bi bi-eye"></i> View
+                      </a>
+                    </td>
+                  </tr>
+                  @empty
+                  <tr>
+                    <td colspan="16" class="text-muted">No orders found</td>
+                  </tr>
+                  @endforelse
+                </tbody>
+              </table>
+            </div>
+
+            <!-- Pagination Controls -->
+            <div class="pagination-container">
+                <div class="pagination-info" id="pageInfo">Showing 1 to 10 of {{ $orders->count() }} entries</div>
+                <div class="pagination-controls">
+                    <button class="pagination-img-btn" id="prevPageBtn" title="Previous page">
+                        <!-- Left arrow SVG -->
+                        <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                        </svg>
+                    </button>
+                    <div class="pagination-pages" id="paginationPages">
+                        <!-- Page numbers will be inserted here -->
+                    </div>
+                    <button class="pagination-img-btn" id="nextPageBtn" title="Next page">
+                        <!-- Right arrow SVG -->
+                        <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                        </svg>
+                    </button>
+                </div>
+            </div>
           </div>
         </div>
       </div>
@@ -1167,6 +1446,14 @@ document.addEventListener('DOMContentLoaded', function() {
     const closeBtn = document.getElementById('closeCreateOrderModal');
     const clearFormBtn = document.getElementById('clearForm');
 
+    // Pagination state
+    let currentPage = 1;
+    const ordersPerPage = 10;
+    let allOrders = @json($orders->values());
+
+    // Initialize pagination
+    initializePagination();
+
     // Reset temp data function
     const resetTempData = () => {
         fetch('{{ route("admin.orders.temp.reset") }}', {
@@ -1265,6 +1552,174 @@ document.addEventListener('DOMContentLoaded', function() {
                 });
         });
     });
+
+    /* ---------- Pagination Functions ---------- */
+    function initializePagination() {
+        renderOrdersTable(allOrders);
+        updatePaginationControls();
+        
+        // Bind pagination buttons
+        document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
+        document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
+    }
+
+    function goToPreviousPage() {
+        if (currentPage > 1) {
+            currentPage--;
+            renderOrdersTable(allOrders);
+            updatePaginationControls();
+        }
+    }
+
+    function goToNextPage() {
+        const totalPages = Math.ceil(allOrders.length / ordersPerPage);
+        if (currentPage < totalPages) {
+            currentPage++;
+            renderOrdersTable(allOrders);
+            updatePaginationControls();
+        }
+    }
+
+    function updatePaginationControls() {
+        const totalPages = Math.ceil(allOrders.length / ordersPerPage);
+        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) * ordersPerPage + 1;
+        const endIndex = Math.min(currentPage * ordersPerPage, allOrders.length);
+        pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${allOrders.length} entries`;
+        
+        // Generate page numbers
+        paginationPages.innerHTML = '';
+        
+        if (totalPages <= 7) {
+            // Show all pages
+            for (let i = 1; i <= totalPages; i++) {
+                addPageButton(i, paginationPages);
+            }
+        } else {
+            // Show first page, current page range, and last page
+            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;
+            renderOrdersTable(allOrders);
+            updatePaginationControls();
+        });
+        container.appendChild(button);
+    }
+
+    function renderOrdersTable(orders) {
+        const tbody = document.getElementById('ordersTableBody');
+        tbody.innerHTML = '';
+        
+        if (!orders || orders.length === 0) {
+            tbody.innerHTML = '<tr><td colspan="16" class="text-muted">No orders found</td></tr>';
+            return;
+        }
+
+        // Calculate pagination
+        const startIndex = (currentPage - 1) * ordersPerPage;
+        const endIndex = startIndex + ordersPerPage;
+        const paginatedOrders = orders.slice(startIndex, endIndex);
+
+        paginatedOrders.forEach(order => {
+            const tr = document.createElement('tr');
+            tr.innerHTML = `
+                <td>${order.id}</td>
+                <td>
+                    <a href="javascript:void(0)"
+                        class="fw-semibold text-primary open-order-modal"
+                        data-id="${order.id}">
+                        ${order.order_id}
+                    </a>
+                </td>
+                <td>${order.mark_no || ''}</td>
+                <td>${order.origin || ''}</td>
+                <td>${order.destination || ''}</td>
+                <td>${order.ctn || ''}</td>
+                <td>${order.qty || ''}</td>
+                <td>${order.ttl_qty || ''}</td>
+                <td>₹${order.ttl_amount ? Number(order.ttl_amount).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }) : '0.00'}</td>
+                <td>${order.cbm || ''}</td>
+                <td>${order.ttl_cbm || ''}</td>
+                <td>${order.kg || ''}</td>
+                <td>${order.ttl_kg || ''}</td>
+                <td>
+                    <span class="badge badge-${order.status}">
+                        ${order.status === 'pending' ? '<i class="bi bi-clock-fill status-icon"></i>' : ''}
+                        ${order.status === 'in_transit' ? '<i class="bi bi-truck status-icon"></i>' : ''}
+                        ${order.status === 'dispatched' ? '<i class="bi bi-box-seam status-icon"></i>' : ''}
+                        ${order.status === 'delivered' ? '<i class="bi bi-check-circle-fill status-icon"></i>' : ''}
+                        ${order.status ? order.status.charAt(0).toUpperCase() + order.status.slice(1).replace('_', ' ') : ''}
+                    </span>
+                </td>
+                <td>${new Date(order.created_at).toLocaleDateString('en-GB')}</td>
+                <td>
+                    <a href="/admin/orders/${order.id}" class="btn btn-sm btn-outline-primary">
+                        <i class="bi bi-eye"></i> View
+                    </a>
+                </td>
+            `;
+            tbody.appendChild(tr);
+
+            // Re-bind order details modal for newly rendered rows
+            const orderLink = tr.querySelector('.open-order-modal');
+            if (orderLink) {
+                orderLink.addEventListener('click', function() {
+                    let id = this.dataset.id;
+                    let modal = new bootstrap.Modal(document.getElementById('orderDetailsModal'));
+
+                    document.getElementById('orderDetailsBody').innerHTML =
+                        "<p class='text-center text-muted'>Loading...</p>";
+
+                    modal.show();
+
+                    fetch(`/admin/orders/view/${id}`)
+                        .then(response => response.text())
+                        .then(html => {
+                            document.getElementById('orderDetailsBody').innerHTML = html;
+                        })
+                        .catch(() => {
+                            document.getElementById('orderDetailsBody').innerHTML =
+                                "<p class='text-danger text-center'>Failed to load order details.</p>";
+                        });
+                });
+            }
+        });
+    }
 });
 </script>
 
diff --git a/resources/views/admin/invoice.blade.php b/resources/views/admin/invoice.blade.php
index 2c4e0b4..84aa37a 100644
--- a/resources/views/admin/invoice.blade.php
+++ b/resources/views/admin/invoice.blade.php
@@ -4,1210 +4,1659 @@
 
 @section('content')
 <style>
+    /* Import Inter Font */
+    @import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap');
+    
     /*Remove horizontal scroll bar*/
-  html, body {
-    overflow-x: hidden !important;
-}
-
-/* Invoice Management Styles */
-.invoice-management-box {
-  background: #fff; 
-  border-radius: 17px; 
-  box-shadow: 0 7px 38px #dde3fa77, 0 2px 9px #e5e7ff80;
-  margin-bottom: 33px; 
-  margin-top: 10px; 
-}
-
-.invoice-management-bar {
-  display: flex; 
-  justify-content: space-between; 
-  align-items: center;
-  border-radius: 17px 17px 0 0; 
-  background: #fceeb8ff;
-  min-height: 54px; 
-  padding: 15px 26px 10px 22px; 
-  border-bottom: 1.4px solid #e8e2cf;
-  box-shadow: 0 1px 13px #ffe2a888;
-}
-
-.invoice-management-title {
-  font-size: 1.32rem; 
-  font-weight: 800; 
-  color: #2451af; 
-  letter-spacing: .08em;
-  display: flex; 
-  align-items: center; 
-  gap: 11px;
-}
-
-.invoice-management-title i { 
-  font-size: 1.12em; 
-  color: #336ad3; 
-}
-
-/* Tools Row Styling */
-.invoice-tools-row {
-  background: linear-gradient(135deg, #f8fafc 0%, #edf2f7 100%);
-  padding: 20px 25px;
-  border-bottom: 1px solid #e2e8f0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  gap: 15px;
-  flex-wrap: wrap;
-}
-
-.search-box {
-  display: flex;
-  align-items: center;
-  background: white;
-  border-radius: 10px;
-  padding: 8px 15px;
-  box-shadow: 0 2px 10px rgba(0,0,0,0.05);
-  border: 1px solid #e2e8f0;
-  min-width: 300px;
-  flex: 1;
-  max-width: 400px;
-}
-
-.search-box i {
-  color: #64748b;
-  margin-right: 10px;
-  font-size: 1.1rem;
-}
-
-.search-box input {
-  border: none;
-  outline: none;
-  background: transparent;
-  width: 100%;
-  font-size: 14px;
-  color: #334155;
-}
-
-.search-box input::placeholder {
-  color: #94a3b8;
-}
-
-.filter-group {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  flex-wrap: wrap;
-}
-
-.filter-select {
-  background: white;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  padding: 8px 12px;
-  font-size: 14px;
-  color: #334155;
-  outline: none;
-  min-width: 150px;
-  box-shadow: 0 2px 5px rgba(0,0,0,0.04);
-}
-
-.filter-select:focus {
-  border-color: #3b82f6;
-  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
-}
-
-.create-invoice-btn {
-  background: linear-gradient(90deg, #226ad6, #46b4fd 123%);
-  padding: 10px 24px; 
-  font-weight: 600; 
-  border: none; 
-  border-radius: 9px; 
-  color: #fff;
-  font-size: 14px; 
-  box-shadow: 0 2px 13px #dde7fa42;
-  transition: all 0.3s ease;
-  display: flex; 
-  align-items: center; 
-  gap: 8px; 
-  font-family: inherit;
-  text-decoration: none;
-  white-space: nowrap;
-}
-
-.create-invoice-btn:hover {
-  background: linear-gradient(90deg, #3264f8, #3acfff 140%);
-  box-shadow: 0 4px 25px #5ab8f880;
-  color: #fff;
-  text-decoration: none;
-  transform: translateY(-2px);
-}
-
-.invoice-management-main { 
-  background: #fff; 
-  border-radius: 0 0 17px 17px; 
-  padding: 0;
-}
-
-/* Table Styling - CENTERED CONTENT */
-.table-container {
-  width: 100%;
-  overflow-x: auto;
-  -webkit-overflow-scrolling: touch;
-  scroll-behavior: smooth;
-  border-radius: 0 0 17px 17px;
-}
-
-.table-container::-webkit-scrollbar {
-  height: 6px;
-}
-.table-container::-webkit-scrollbar-thumb {
-  background: linear-gradient(90deg, #a7b8ff, #6c8eff);
-  border-radius: 10px;
-}
-.table-container::-webkit-scrollbar-thumb:hover {
-  background: linear-gradient(90deg, #5a78ff, #3f63e0);
-}
-.table-container::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 10px;
-}
-
-.table {
-  width: 100%;
-  min-width: 1100px;
-  border-collapse: separate;
-  border-spacing: 0 8px; /* Add gap between rows */
-  margin-bottom: 0;
-}
-
-/* Center all table content */
-.table thead tr {
-  background: #feebbe !important;
-}
-
-.table thead th:first-child {
-    border-top-left-radius: 17px;
-}
-.table thead th:last-child {
-    border-top-right-radius: 17px;
-}
-
-.table thead th {
-  background: transparent !important;
-  border: none;
-  font-weight: 700; 
-  color: #343535; 
-  letter-spacing: 0.02em; 
-  font-size: 13px;
-  padding: 16px 12px;
-  white-space: nowrap;
-  position: relative;
-  border-bottom: 2px solid #e8e2cf;
-  text-align: center !important; /* Center header text */
-  vertical-align: middle;
-}
-
-.table thead th:first-child { 
-  padding-left: 25px;
-}
-.table thead th:last-child { 
-  padding-right: 25px;
-}
-
-/* Soft blue background for ALL table rows */
-.table-striped tbody tr {
-  background: #f0f8ff !important; /* Soft blue background for all rows */
-  transition: all 0.2s ease;
-  border-radius: 12px; /* Rounded corners for each row */
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05); /* Subtle shadow for separation */
-}
-
-.table-striped tbody tr:hover {
-  background: #e6f3ff !important; /* Slightly darker blue on hover */
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); /* Enhanced shadow on hover */
-  transform: translateY(-1px); /* Lift effect on hover */
-}
-
-/* Remove striped pattern - all rows same soft blue */
-.table-striped tbody tr:nth-of-type(odd),
-.table-striped tbody tr:nth-of-type(even) { 
-  background: #f0f8ff !important; /* Same soft blue for all rows */
-}
-
-/* Center all table cells with proper spacing */
-.table td {
-  padding: 16px 12px; /* Increased vertical padding */
-  border: none;
-  vertical-align: middle;
-  white-space: nowrap;
-  font-size: 13px;
-  color: #4a5568;
-  text-align: center !important; /* Center all cell content */
-  border-top: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-}
-
-/* First and last cell rounded corners */
-.table td:first-child {
-  padding-left: 25px;
-  font-weight: 600;
-  color: #2d3748;
-  border-top-left-radius: 12px;
-  border-bottom-left-radius: 12px;
-}
-
-.table td:last-child {
-  padding-right: 25px;
-  border-top-right-radius: 12px;
-  border-bottom-right-radius: 12px;
-}
-
-/* Invoice Number with Curved Boxes */
-.invoice-number-cell {
-  display: flex;
-  align-items: center;
-  justify-content: center; /* Center the invoice number */
-  gap: 12px;
-  padding: 8px 0;
-}
-
-.invoice-icon {
-  width: 36px;
-  height: 36px;
-  border-radius: 8px; /* Curved border radius */
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  font-size: 14px;
-  flex-shrink: 0;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.2);
-  font-weight: bold;
-  border: 2px solid rgba(255,255,255,0.3); /* Subtle border */
-}
-
-/* Different curved background colors for each invoice */
-.invoice-icon-1 { 
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
-  border-radius: 8px;
-}
-.invoice-icon-2 { 
-  background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); 
-  border-radius: 8px;
-}
-.invoice-icon-3 { 
-  background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%); 
-  border-radius: 8px;
-}
-.invoice-icon-4 { 
-  background: linear-gradient(135deg, #43e97b 0%, #38f9d7 100%); 
-  border-radius: 8px;
-}
-.invoice-icon-5 { 
-  background: linear-gradient(135deg, #fa709a 0%, #fee140 100%); 
-  border-radius: 8px;
-}
-.invoice-icon-6 { 
-  background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%); 
-  border-radius: 8px;
-}
-.invoice-icon-7 { 
-  background: linear-gradient(135deg, #d299c2 0%, #fef9d7 100%); 
-  border-radius: 8px;
-}
-.invoice-icon-8 { 
-  background: linear-gradient(135deg, #89f7fe 0%, #66a6ff 100%); 
-  border-radius: 8px;
-}
-
-.invoice-number-link {
-  color: #2469d6;
-  font-weight: 600;
-  text-decoration: none;
-  transition: all 0.3s ease;
-  font-size: 13px;
-  text-align: center;
-}
-
-.invoice-number-link:hover {
-  color: #1a4fb3;
-  text-decoration: none;
-}
-
-/* Badge Styling - Centered with custom backgrounds and icons */
-.badge {
-  font-size: 11px !important;
-  font-weight: 600 !important;
-  padding: 6px 12px 6px 8px !important;
-  border-radius: 20px !important;
-  text-transform: uppercase;
-  letter-spacing: 0.3px;
-  display: inline-flex !important;
-  align-items: center;
-  justify-content: center;
-  background-size: cover !important;
-  background-position: center !important;
-  color: #fff !important;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.3);
-  border: 2px solid transparent !important;
-  min-width: 40px;
-  box-sizing: border-box;
-  line-height: 1.2;
-  gap: 6px;
-}
-
-/* Status icons */
-.status-icon {
-  font-size: 12px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-/* Custom status badge backgrounds with icons */
-.badge-paid { 
-  background: url('/images/status-bg-paid.png') !important;
-}
-
-.badge-pending { 
-  background: url('/images/status-bg-pending.png') !important;
-}
-
-.badge-overdue { 
-  background: url('/images/status-bg-overdue.png') !important;
-}
-
-/* Fallback colors if images don't load - ALL WITH SAME SIZE */
-.badge.badge-paid { 
-  background: linear-gradient(135deg, #d1fae5, #a7f3d0) !important;
-  color: #065f46 !important;
-  border-color: #10b981 !important;
-  width: 98px;
-}
-
-.badge.badge-pending { 
-  background: linear-gradient(135deg, #fef3c7, #fde68a) !important;
-  color: #d97706 !important;
-  border-color: #f59e0b !important;
-}
-
-.badge.badge-overdue { 
-  background: linear-gradient(135deg, #e9d5ff, #c4b5fd) !important;
-  color: #6b21a8 !important;
-  border-color: #8b5cf6 !important;
-}
-
-/* Entry Button - Centered */
-.btn-entry {
-  background: linear-gradient(135deg, #3492f8 55%, #1256cc 110%);
-  border: none;
-  border-radius: 6px;
-  padding: 6px 12px;
-  font-weight: 600;
-  font-size: 12px;
-  transition: all 0.3s ease;
-  box-shadow: 0 1px 4px rgba(52, 146, 248, 0.3);
-  color: white;
-  white-space: nowrap;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 4px;
-  text-decoration: none;
-}
-
-.btn-entry:hover {
-  background: linear-gradient(135deg, #46b4fd 55%, #226ad6 110%);
-  transform: translateY(-1px);
-  box-shadow: 0 2px 8px rgba(52, 146, 248, 0.4);
-  color: white;
-  text-decoration: none;
-}
-
-/* Amount Styling - Centered */
-.amount-cell {
-  font-weight: 600;
-  color: #194073;
-  font-size: 13px;
-  text-align: center !important;
-}
-
-.gst-cell {
-  font-weight: 500;
-  color: #63709b;
-  font-size: 13px;
-  text-align: center !important;
-}
-
-/* Date Styling - Centered */
-.date-cell {
-  font-size: 12.5px;
-  color: #718096;
-  font-weight: 500;
-  text-align: center !important;
-}
-
-/* Customer Name Styling - Centered */
-.customer-cell {
-  font-weight: 500;
-  color: #2d3748;
-  font-size: 13px;
-  max-width: 120px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  text-align: center !important;
-  margin: 0 auto;
-}
-
-/* Modal Styling */
-.modal.fade .modal-dialog {
-  transition: transform 0.3s ease-out;
-  transform: translate(0, -50px);
-}
-
-.modal.show .modal-dialog {
-  transform: none;
-}
-
-.modal-content {
-  border: none;
-  border-radius: 20px;
-  box-shadow: 0 25px 50px rgba(0, 0, 0, 0.3);
-  overflow: hidden;
-}
-
-.modal-header {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  border-bottom: none;
-  padding: 15px 25px;
-  border-radius: 20px 20px 0 0;
-}
-
-.modal-title {
-  font-size: 1.5rem;
-  font-weight: 700;
-  color: white;
-  margin: 0;
-}
-
-.modal-header .btn-close {
-  filter: invert(1);
-  opacity: 0.8;
-  transition: all 0.3s ease;
-}
-
-.modal-header .btn-close:hover {
-  opacity: 1;
-  transform: rotate(90deg);
-}
-
-.modal-body {
-  padding: 30px;
-  background: #f8fafc;
-  max-height: 70vh;
-  overflow-y: auto;
-}
-
-/* Date Range Picker Styles */
-.date-range-container {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.date-input {
-  background: white;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  padding: 8px 12px;
-  font-size: 14px;
-  color: #334155;
-  outline: none;
-  min-width: 130px;
-  box-shadow: 0 2px 5px rgba(0,0,0,0.04);
-}
-
-.date-input:focus {
-  border-color: #3b82f6;
-  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
-}
-
-.date-separator {
-  color: #64748b;
-  font-weight: 500;
-}
-
-/* Stats Summary - Centered */
-.stats-summary {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
-  gap: 12px;
-  margin: 20px 25px;
-  padding: 0;
-}
-
-.stat-card {
-  background: white;
-  padding: 15px;
-  border-radius: 10px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.04);
-  text-align: center;
-  border-left: 3px solid #667eea;
-}
-
-.stat-value {
-  font-size: 1.5rem;
-  font-weight: 700;
-  color: #2d3748;
-  margin-bottom: 3px;
-  text-align: center;
-}
-
-.stat-label {
-  font-size: 0.85rem;
-  color: #718096;
-  font-weight: 600;
-  text-align: center;
-}
-
-/* Column Headers - Centered */
-.column-header {
-  text-align: center !important;
-  font-weight: 600;
-  color: #2d3748;
-}
-
-/* Remove extra spacing */
-.no-extra-space {
-  margin: 0;
-  padding: 0;
-}
-
-.compact-view {
-  padding-top: 0 !important;
-  padding-bottom: 0 !important;
-}
-
-/* Ensure all content in table is centered */
-.table tbody tr td {
-  text-align: center !important;
-}
-
-.table tbody tr td .invoice-number-cell {
-  justify-content: center;
-}
-
-.table tbody tr td .btn-entry {
-  margin: 0 auto;
-}
-
-/* Empty State - Centered */
-.text-muted {
-  color: #8a9bb9 !important;
-  font-style: italic;
-  padding: 30px !important;
-  text-align: center;
-  font-size: 14px;
-}
-
-/* Card Styling */
-.card {
-  border-radius: 0 0 17px 17px; 
-  border: none; 
-  margin-bottom: 0 !important;
-  box-shadow: none;
-}
-
-.card-header {
-  background: #f8f9fa !important;
-  border-bottom: 1px solid #e9ecef;
-  border-radius: 0 !important;
-  padding: 15px 25px;
-  text-align: center;
-}
-
-.card-header h4 {
-  margin: 0;
-  color: #2451af;
-  font-weight: 700;
-  font-size: 1.3rem;
-  text-align: center;
-}
-
-/* Mobile Responsive Styles */
-.mobile-invoice-card {
-  display: none;
-  background: #f0f8ff;
-  border-radius: 12px;
-  padding: 15px;
-  margin-bottom: 12px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
-  border-left: 4px solid #667eea;
-}
-
-.mobile-invoice-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 10px;
-  padding-bottom: 8px;
-  border-bottom: 1px solid #e2e8f0;
-}
-
-.mobile-invoice-number {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.mobile-invoice-icon {
-  width: 32px;
-  height: 32px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  font-size: 12px;
-  font-weight: bold;
-}
-
-.mobile-invoice-number-text {
-  font-weight: 600;
-  color: #2469d6;
-  font-size: 14px;
-}
-
-.mobile-invoice-status {
-  font-size: 10px !important;
-  padding: 4px 8px 4px 6px !important;
-  min-width: 70px;
-}
-
-.mobile-invoice-details {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 10px;
-  margin-bottom: 12px;
-}
-
-.mobile-detail-item {
-  display: flex;
-  flex-direction: column;
-}
-
-.mobile-detail-label {
-  font-size: 11px;
-  color: #718096;
-  margin-bottom: 2px;
-}
-
-.mobile-detail-value {
-  font-size: 13px;
-  font-weight: 500;
-  color: #2d3748;
-}
-
-.mobile-invoice-actions {
-  display: flex;
-  justify-content: space-between;
-  gap: 8px;
-}
-
-.mobile-action-btn {
-  flex: 1;
-  text-align: center;
-  padding: 6px 10px;
-  font-size: 12px;
-  border-radius: 6px;
-  text-decoration: none;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 4px;
-}
-
-.mobile-action-btn.view {
-  background: #f0f8ff;
-  color: #2469d6;
-  border: 1px solid #2469d6;
-}
-
-.mobile-action-btn.entry {
-  background: linear-gradient(135deg, #3492f8 55%, #1256cc 110%);
-  color: white;
-  border: none;
-}
-
-/* Responsive Design */
-@media (max-width: 1200px) {
-  .invoice-tools-row {
-    flex-direction: column;
-    align-items: stretch;
-    gap: 15px;
-  }
-  
-  .search-box {
-    max-width: 100%;
-    min-width: auto;
-  }
-  
-  .filter-group {
-    justify-content: space-between;
-    width: 100%;
-  }
-}
-
-@media (max-width: 992px) {
-  .stats-summary {
-    grid-template-columns: repeat(2, 1fr);
-  }
-}
-
-@media (max-width: 768px) {
-  .invoice-management-bar {
-    padding: 12px 20px;
-  }
-  
-  .invoice-tools-row {
-    padding: 15px;
-  }
-  
-  .table th, .table td {
-    font-size: 12px;
-    padding: 12px 8px;
-  }
-  
-  .badge {
-    font-size: 10px !important;
-    padding: 5px 10px 5px 6px !important;
-    min-width: 70px;
-    gap: 4px;
-  }
-  
-  .status-icon {
-    font-size: 10px;
-  }
-  
-  .btn-entry {
-    padding: 4px 8px;
-    font-size: 11px;
-  }
-  
-  .filter-group {
-    flex-direction: column;
-    align-items: stretch;
-  }
-  
-  .filter-select {
-    min-width: auto;
-    width: 100%;
-  }
-  
-  .create-invoice-btn {
-    width: 100%;
-    justify-content: center;
-  }
-  
-  .invoice-icon {
-    width: 28px;
-    height: 28px;
-    font-size: 12px;
-  }
-  
-  /* Show mobile cards and hide table on small screens */
-  .desktop-table {
-    display: none;
-  }
-  
-  .mobile-invoice-card {
-    display: block;
-  }
-  
-  .date-range-container {
-    flex-direction: column;
-    width: 100%;
-  }
-  
-  .date-input {
-    width: 100%;
-  }
-  
-  .stats-summary {
-    grid-template-columns: 1fr;
-    margin: 15px;
-  }
-}
-
-@media (max-width: 576px) {
-  .invoice-management-title {
-    font-size: 1.1rem;
-  }
-  
-  .card-header h4 {
-    font-size: 1.1rem;
-  }
-  
-  .mobile-invoice-details {
-    grid-template-columns: 1fr;
-  }
-  
-  .mobile-invoice-actions {
-    flex-direction: column;
-  }
-}
+    html, body {
+        overflow-x: hidden !important;
+        font-family: 'Inter', sans-serif !important;
+    }
+
+    /* Invoice Management Styles */
+    .invoice-management-box {
+        background: #fff; 
+        border-radius: 17px; 
+        box-shadow: 0 7px 38px #dde3fa77, 0 2px 9px #e5e7ff80;
+        margin-bottom: 33px; 
+        margin-top: 10px; 
+    }
+
+    .invoice-management-bar {
+        display: flex; 
+        justify-content: space-between; 
+        align-items: center;
+        border-radius: 17px 17px 0 0; 
+        background: #fceeb8ff;
+        min-height: 54px; 
+        padding: 15px 26px 10px 22px; 
+        border-bottom: 1.4px solid #e8e2cf;
+        box-shadow: 0 1px 13px #ffe2a888;
+    }
+
+    .invoice-management-title {
+        font-size: 1.32rem; 
+        font-weight: 800; 
+        color: #2451af; 
+        letter-spacing: .08em;
+        display: flex; 
+        align-items: center; 
+        gap: 11px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .invoice-management-title i { 
+        font-size: 1.12em; 
+        color: #336ad3; 
+    }
+
+    /* Tools Row Styling */
+    .invoice-tools-row {
+        background: linear-gradient(135deg, #f8fafc 0%, #edf2f7 100%);
+        padding: 25px 30px;
+        border-bottom: 1px solid #e2e8f0;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 20px;
+        flex-wrap: wrap;
+    }
+
+    .search-box {
+        display: flex;
+        align-items: center;
+        background: white;
+        border-radius: 12px;
+        padding: 10px 18px;
+        box-shadow: 0 4px 15px rgba(0,0,0,0.08);
+        border: 1.5px solid #e2e8f0;
+        min-width: 380px;
+        flex: 1;
+        max-width: 500px;
+        transition: all 0.3s ease;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .search-box:focus-within {
+        border-color: #3b82f6;
+        box-shadow: 0 4px 20px rgba(59, 130, 246, 0.15);
+        transform: translateY(-2px);
+    }
+
+    .search-box i {
+        color: #64748b;
+        margin-right: 12px;
+        font-size: 1.2rem;
+    }
+
+    .search-box input {
+        border: none;
+        outline: none;
+        background: transparent;
+        width: 100%;
+        font-size: 15px;
+        color: #334155;
+        font-family: 'Inter', sans-serif;
+        font-weight: 400;
+    }
+
+    .search-box input::placeholder {
+        color: #94a3b8;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* .search-btn {
+        background: linear-gradient(90deg, #226ad6, #46b4fd 123%);
+        border: none;
+        border-radius: 8px;
+        padding: 5px 10px;
+        color: white;
+        font-weight: 600;
+        font-size: 14px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-left: 3px;
+        font-family: 'Inter', sans-serif;
+        white-space: nowrap;
+    } */
+
+    .search-btn:hover {
+        background: linear-gradient(90deg, #3264f8, #3acfff 140%);
+        box-shadow: 0 4px 15px rgba(59, 130, 246, 0.4);
+        transform: translateY(-1px);
+    }
+
+    .filter-group {
+        display: flex;
+        align-items: center;
+        gap: 15px;
+        flex-wrap: wrap;
+    }
+
+    .filter-select {
+        background: white;
+        border: 1.5px solid #e2e8f0;
+        border-radius: 10px;
+        padding: 10px 15px;
+        font-size: 14px;
+        color: #334155;
+        outline: none;
+        min-width: 160px;
+        box-shadow: 0 2px 8px rgba(0,0,0,0.06);
+        font-family: 'Inter', sans-serif;
+        font-weight: 400;
+        transition: all 0.3s ease;
+    }
+
+    .filter-select:focus {
+        border-color: #3b82f6;
+        box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+    }
+
+    .create-invoice-btn {
+        background: linear-gradient(90deg, #226ad6, #46b4fd 123%);
+        padding: 12px 28px; 
+        font-weight: 600; 
+        border: none; 
+        border-radius: 10px; 
+        color: #fff;
+        font-size: 15px; 
+        box-shadow: 0 2px 13px #dde7fa42;
+        transition: all 0.3s ease;
+        display: flex; 
+        align-items: center; 
+        gap: 8px; 
+        font-family: 'Inter', sans-serif;
+        text-decoration: none;
+        white-space: nowrap;
+    }
+
+    .create-invoice-btn:hover {
+        background: linear-gradient(90deg, #3264f8, #3acfff 140%);
+        box-shadow: 0 4px 25px #5ab8f880;
+        color: #fff;
+        text-decoration: none;
+        transform: translateY(-2px);
+    }
+
+    .invoice-management-main { 
+        background: #fff; 
+        border-radius: 0 0 17px 17px; 
+        padding: 0;
+    }
+
+    /* Table Styling - CENTERED CONTENT */
+    .table-container {
+        width: 100%;
+        overflow-x: auto;
+        -webkit-overflow-scrolling: touch;
+        scroll-behavior: smooth;
+        border-radius: 0 0 17px 17px;
+    }
+
+    .table-container::-webkit-scrollbar {
+        height: 8px;
+    }
+    .table-container::-webkit-scrollbar-thumb {
+        background: linear-gradient(90deg, #a7b8ff, #6c8eff);
+        border-radius: 10px;
+    }
+    .table-container::-webkit-scrollbar-thumb:hover {
+        background: linear-gradient(90deg, #5a78ff, #3f63e0);
+    }
+    .table-container::-webkit-scrollbar-track {
+        background: #f1f1f1;
+        border-radius: 10px;
+    }
+
+    .table {
+        width: 100%;
+        min-width: 1200px;
+        border-collapse: separate;
+        border-spacing: 0 12px;
+        margin-bottom: 0;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Center all table content */
+    .table thead tr {
+        background: #feebbe !important;
+    }
+
+    .table thead th:first-child {
+        border-top-left-radius: 17px;
+    }
+    .table thead th:last-child {
+        border-top-right-radius: 17px;
+    }
+
+    .table thead th {
+        background: transparent !important;
+        border: none;
+        font-weight: 700; 
+        color: #343535; 
+        letter-spacing: 0.02em; 
+        font-size: 14px;
+        padding: 20px 15px;
+        white-space: nowrap;
+        position: relative;
+        border-bottom: 2px solid #e8e2cf;
+        text-align: center !important;
+        vertical-align: middle;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .table thead th:first-child { 
+        padding-left: 30px;
+    }
+    .table thead th:last-child { 
+        padding-right: 30px;
+    }
+
+    /* Soft blue background for ALL table rows */
+    .table-striped tbody tr {
+        background: #f0f8ff !important;
+        transition: all 0.2s ease;
+        border-radius: 12px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+    }
+
+    .table-striped tbody tr:hover {
+        background: #e6f3ff !important;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+        transform: translateY(-1px);
+    }
+
+    /* Remove striped pattern - all rows same soft blue */
+    .table-striped tbody tr:nth-of-type(odd),
+    .table-striped tbody tr:nth-of-type(even) { 
+        background: #f0f8ff !important;
+    }
+
+    /* Center all table cells with proper spacing */
+    .table td {
+        padding: 18px 15px;
+        border: none;
+        vertical-align: middle;
+        white-space: nowrap;
+        font-size: 14px;
+        color: #4a5568;
+        text-align: center !important;
+        border-top: 1px solid transparent;
+        border-bottom: 1px solid transparent;
+        font-family: 'Inter', sans-serif;
+        font-weight: 400;
+    }
+
+    /* First and last cell rounded corners */
+    .table td:first-child {
+        padding-left: 30px;
+        font-weight: 600;
+        color: #2d3748;
+        border-top-left-radius: 12px;
+        border-bottom-left-radius: 12px;
+    }
+
+    .table td:last-child {
+        padding-right: 30px;
+        border-top-right-radius: 12px;
+        border-bottom-right-radius: 12px;
+    }
+
+    /* Invoice Number with Curved Boxes */
+    .invoice-number-cell {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 15px;
+        padding: 10px 0;
+    }
+
+    .invoice-icon {
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: white;
+        font-size: 16px;
+        flex-shrink: 0;
+        box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+        font-weight: bold;
+        border: 2px solid rgba(255,255,255,0.3);
+    }
+
+    /* Different curved background colors for each invoice */
+    .invoice-icon-1 { 
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
+        border-radius: 10px;
+    }
+    .invoice-icon-2 { 
+        background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); 
+        border-radius: 10px;
+    }
+    .invoice-icon-3 { 
+        background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%); 
+        border-radius: 10px;
+    }
+    .invoice-icon-4 { 
+        background: linear-gradient(135deg, #43e97b 0%, #38f9d7 100%); 
+        border-radius: 10px;
+    }
+    .invoice-icon-5 { 
+        background: linear-gradient(135deg, #fa709a 0%, #fee140 100%); 
+        border-radius: 10px;
+    }
+    .invoice-icon-6 { 
+        background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%); 
+        border-radius: 10px;
+    }
+    .invoice-icon-7 { 
+        background: linear-gradient(135deg, #d299c2 0%, #fef9d7 100%); 
+        border-radius: 10px;
+    }
+    .invoice-icon-8 { 
+        background: linear-gradient(135deg, #89f7fe 0%, #66a6ff 100%); 
+        border-radius: 10px;
+    }
+
+    .invoice-number-link {
+        color: #2469d6;
+        font-weight: 600;
+        text-decoration: none;
+        transition: all 0.3s ease;
+        font-size: 14px;
+        text-align: center;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .invoice-number-link:hover {
+        color: #1a4fb3;
+        text-decoration: none;
+    }
+
+    /* Badge Styling - Centered with custom backgrounds and icons */
+    .badge {
+        font-size: 12px !important;
+        font-weight: 600 !important;
+        padding: 8px 15px 8px 12px !important;
+        border-radius: 20px !important;
+        text-transform: uppercase;
+        letter-spacing: 0.3px;
+        display: inline-flex !important;
+        align-items: center;
+        justify-content: center;
+        background-size: cover !important;
+        background-position: center !important;
+        color: #fff !important;
+        text-shadow: 0 1px 2px rgba(0,0,0,0.3);
+        border: 2px solid transparent !important;
+        min-width: 45px;
+        box-sizing: border-box;
+        line-height: 1.2;
+        gap: 6px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Status icons */
+    .status-icon {
+        font-size: 13px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    /* Custom status badge backgrounds with icons */
+    .badge-paid { 
+        background: url('/images/status-bg-paid.png') !important;
+    }
+
+    .badge-pending { 
+        background: url('/images/status-bg-pending.png') !important;
+    }
+
+    .badge-overdue { 
+        background: url('/images/status-bg-overdue.png') !important;
+    }
+
+    /* Fallback colors if images don't load - ALL WITH SAME SIZE */
+    .badge.badge-paid { 
+        background: linear-gradient(135deg, #d1fae5, #a7f3d0) !important;
+        color: #065f46 !important;
+        border-color: #10b981 !important;
+        width: 98px;
+    }
+
+    .badge.badge-pending { 
+        background: linear-gradient(135deg, #fef3c7, #fde68a) !important;
+        color: #d97706 !important;
+        border-color: #f59e0b !important;
+    }
+
+    .badge.badge-overdue { 
+        background: linear-gradient(135deg, #e9d5ff, #c4b5fd) !important;
+        color: #6b21a8 !important;
+        border-color: #8b5cf6 !important;
+    }
+
+    /* Entry Button - Centered */
+    .btn-entry {
+        background: linear-gradient(135deg, #3492f8 55%, #1256cc 110%);
+        border: none;
+        border-radius: 8px;
+        padding: 8px 16px;
+        font-weight: 600;
+        font-size: 13px;
+        transition: all 0.3s ease;
+        box-shadow: 0 1px 4px rgba(52, 146, 248, 0.3);
+        color: white;
+        white-space: nowrap;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        gap: 5px;
+        text-decoration: none;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .btn-entry:hover {
+        background: linear-gradient(135deg, #46b4fd 55%, #226ad6 110%);
+        transform: translateY(-1px);
+        box-shadow: 0 2px 8px rgba(52, 146, 248, 0.4);
+        color: white;
+        text-decoration: none;
+    }
+
+    /* Amount Styling - Centered */
+    .amount-cell {
+        font-weight: 600;
+        color: #194073;
+        font-size: 14px;
+        text-align: center !important;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .gst-cell {
+        font-weight: 500;
+        color: #63709b;
+        font-size: 14px;
+        text-align: center !important;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Date Styling - Centered */
+    .date-cell {
+        font-size: 13px;
+        color: #718096;
+        font-weight: 500;
+        text-align: center !important;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Customer Name Styling - Centered */
+    .customer-cell {
+        font-weight: 500;
+        color: #2d3748;
+        font-size: 14px;
+        max-width: 120px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        text-align: center !important;
+        margin: 0 auto;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Modal Styling */
+    .modal.fade .modal-dialog {
+        transition: transform 0.3s ease-out;
+        transform: translate(0, -50px);
+    }
+
+    .modal.show .modal-dialog {
+        transform: none;
+    }
+
+    .modal-content {
+        border: none;
+        border-radius: 20px;
+        box-shadow: 0 25px 50px rgba(0, 0, 0, 0.3);
+        overflow: hidden;
+    }
+
+    .modal-header {
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        border-bottom: none;
+        padding: 15px 25px;
+        border-radius: 20px 20px 0 0;
+    }
+
+    .modal-title {
+        font-size: 1.5rem;
+        font-weight: 700;
+        color: white;
+        margin: 0;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .modal-header .btn-close {
+        filter: invert(1);
+        opacity: 0.8;
+        transition: all 0.3s ease;
+    }
+
+    .modal-header .btn-close:hover {
+        opacity: 1;
+        transform: rotate(90deg);
+    }
+
+    .modal-body {
+        padding: 30px;
+        background: #f8fafc;
+        max-height: 70vh;
+        overflow-y: auto;
+    }
+
+    /* Date Range Picker Styles */
+    .date-range-container {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+    }
+
+    .date-input {
+        background: white;
+        border: 1.5px solid #e2e8f0;
+        border-radius: 8px;
+        padding: 10px 12px;
+        font-size: 14px;
+        color: #334155;
+        outline: none;
+        min-width: 140px;
+        box-shadow: 0 2px 5px rgba(0,0,0,0.04);
+        font-family: 'Inter', sans-serif;
+    }
+
+    .date-input:focus {
+        border-color: #3b82f6;
+        box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+    }
+
+    .date-separator {
+        color: #64748b;
+        font-weight: 500;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Stats Summary - Centered */
+    .stats-summary {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+        gap: 15px;
+        margin: 25px 30px;
+        padding: 0;
+    }
+
+    .stat-card {
+        background: white;
+        padding: 18px;
+        border-radius: 12px;
+        box-shadow: 0 2px 8px rgba(0,0,0,0.04);
+        text-align: center;
+        border-left: 3px solid #667eea;
+    }
+
+    .stat-value {
+        font-size: 1.6rem;
+        font-weight: 700;
+        color: #2d3748;
+        margin-bottom: 5px;
+        text-align: center;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .stat-label {
+        font-size: 0.9rem;
+        color: #718096;
+        font-weight: 600;
+        text-align: center;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Column Headers - Centered */
+    .column-header {
+        text-align: center !important;
+        font-weight: 600;
+        color: #2d3748;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Remove extra spacing */
+    .no-extra-space {
+        margin: 0;
+        padding: 0;
+    }
+
+    .compact-view {
+        padding-top: 0 !important;
+        padding-bottom: 0 !important;
+    }
+
+    /* Ensure all content in table is centered */
+    .table tbody tr td {
+        text-align: center !important;
+    }
+
+    .table tbody tr td .invoice-number-cell {
+        justify-content: center;
+    }
+
+    .table tbody tr td .btn-entry {
+        margin: 0 auto;
+    }
+
+    /* Empty State - Centered */
+    .text-muted {
+        color: #8a9bb9 !important;
+        font-style: italic;
+        padding: 30px !important;
+        text-align: center;
+        font-size: 14px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Card Styling */
+    .card {
+        border-radius: 0 0 17px 17px; 
+        border: none; 
+        margin-bottom: 0 !important;
+        box-shadow: none;
+    }
+
+    .card-header {
+        background: #f8f9fa !important;
+        border-bottom: 1px solid #e9ecef;
+        border-radius: 0 !important;
+        padding: 18px 30px;
+        text-align: center;
+    }
+
+    .card-header h4 {
+        margin: 0;
+        color: #2451af;
+        font-weight: 700;
+        font-size: 1.3rem;
+        text-align: center;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Mobile Responsive Styles */
+    .mobile-invoice-card {
+        display: none;
+        background: #f0f8ff;
+        border-radius: 12px;
+        padding: 18px;
+        margin-bottom: 15px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+        border-left: 4px solid #667eea;
+    }
+
+    .mobile-invoice-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 12px;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #e2e8f0;
+    }
+
+    .mobile-invoice-number {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+    }
+
+    .mobile-invoice-icon {
+        width: 36px;
+        height: 36px;
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: white;
+        font-size: 14px;
+        font-weight: bold;
+    }
+
+    .mobile-invoice-number-text {
+        font-weight: 600;
+        color: #2469d6;
+        font-size: 15px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .mobile-invoice-status {
+        font-size: 11px !important;
+        padding: 6px 12px 6px 8px !important;
+        min-width: 80px;
+    }
+
+    .mobile-invoice-details {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 12px;
+        margin-bottom: 15px;
+    }
+
+    .mobile-detail-item {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .mobile-detail-label {
+        font-size: 12px;
+        color: #718096;
+        margin-bottom: 3px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .mobile-detail-value {
+        font-size: 14px;
+        font-weight: 500;
+        color: #2d3748;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .mobile-invoice-actions {
+        display: flex;
+        justify-content: space-between;
+        gap: 10px;
+    }
+
+    .mobile-action-btn {
+        flex: 1;
+        text-align: center;
+        padding: 8px 12px;
+        font-size: 13px;
+        border-radius: 8px;
+        text-decoration: none;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 5px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .mobile-action-btn.view {
+        background: #f0f8ff;
+        color: #2469d6;
+        border: 1px solid #2469d6;
+    }
+
+    .mobile-action-btn.entry {
+        background: linear-gradient(135deg, #3492f8 55%, #1256cc 110%);
+        color: white;
+        border: none;
+    }
+
+    /* ---------- Pagination Styles ---------- */
+    .pagination-container {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 20px;
+        padding: 15px 30px;
+        border-top: 1px solid #eef3fb;
+    }
+
+    .pagination-info {
+        font-size: 14px;
+        color: #9ba5bb;
+        font-weight: 600;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .pagination-controls {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+    }
+
+    .pagination-btn {
+        background: #fff;
+        border: 1px solid #e3eaf6;
+        color: #1a2951;
+        padding: 10px 15px;
+        border-radius: 8px;
+        font-size: 14px;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 45px;
+        height: 38px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .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: 8px 15px;
+        border-radius: 8px;
+        font-size: 14px;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        min-width: 40px;
+        text-align: center;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .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: 6px;
+        align-items: center;
+    }
+
+    .pagination-ellipsis {
+        color: #9ba5bb;
+        font-size: 14px;
+        padding: 0 6px;
+        font-family: 'Inter', sans-serif;
+    }
+
+    /* Image-based pagination buttons */
+    .pagination-img-btn {
+        background: #fff;
+        border: 1px solid #e3eaf6;
+        border-radius: 8px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 45px;
+        height: 38px;
+        padding: 0;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) {
+        background: #1a2951;
+        border-color: #1a2951;
+    }
+
+    .pagination-img-btn:disabled {
+        background: #f8fafc;
+        border-color: #e2e8f0;
+        cursor: not-allowed;
+        opacity: 0.5;
+    }
+
+    .pagination-img-btn img {
+        width: 18px;
+        height: 18px;
+        filter: brightness(0) saturate(100%) invert(26%) sepia(89%) saturate(748%) hue-rotate(201deg) brightness(93%) contrast(89%);
+        transition: filter 0.3s ease;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) img {
+        filter: brightness(0) saturate(100%) invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(106%) contrast(101%);
+    }
+
+    .pagination-img-btn:disabled img {
+        filter: brightness(0) saturate(100%) invert(84%) sepia(8%) saturate(165%) hue-rotate(179deg) brightness(89%) contrast(86%);
+    }
+
+    /* Responsive Design */
+    @media (max-width: 1200px) {
+        .invoice-tools-row {
+            flex-direction: column;
+            align-items: stretch;
+            gap: 20px;
+        }
+        
+        .search-box {
+            max-width: 100%;
+            min-width: auto;
+        }
+        
+        .filter-group {
+            justify-content: space-between;
+            width: 100%;
+        }
+    }
+
+    @media (max-width: 992px) {
+        .stats-summary {
+            grid-template-columns: repeat(2, 1fr);
+        }
+    }
+
+    @media (max-width: 768px) {
+        .invoice-management-bar {
+            padding: 15px 20px;
+        }
+        
+        .invoice-tools-row {
+            padding: 20px;
+        }
+        
+        .table th, .table td {
+            font-size: 13px;
+            padding: 15px 10px;
+        }
+        
+        .badge {
+            font-size: 11px !important;
+            padding: 6px 12px 6px 8px !important;
+            min-width: 75px;
+            gap: 4px;
+        }
+        
+        .status-icon {
+            font-size: 11px;
+        }
+        
+        .btn-entry {
+            padding: 6px 12px;
+            font-size: 12px;
+        }
+        
+        .filter-group {
+            flex-direction: column;
+            align-items: stretch;
+        }
+        
+        .filter-select {
+            min-width: auto;
+            width: 100%;
+        }
+        
+        .create-invoice-btn {
+            width: 100%;
+            justify-content: center;
+        }
+        
+        .invoice-icon {
+            width: 32px;
+            height: 32px;
+            font-size: 14px;
+        }
+        
+        /* Show mobile cards and hide table on small screens */
+        .desktop-table {
+            display: none;
+        }
+        
+        .mobile-invoice-card {
+            display: block;
+        }
+        
+        .date-range-container {
+            flex-direction: column;
+            width: 100%;
+        }
+        
+        .date-input {
+            width: 100%;
+        }
+        
+        .stats-summary {
+            grid-template-columns: 1fr;
+            margin: 20px;
+        }
+
+        .pagination-container {
+            flex-direction: column;
+            gap: 12px;
+            align-items: stretch;
+        }
+        
+        .pagination-controls {
+            justify-content: center;
+        }
+    }
+
+    @media (max-width: 576px) {
+        .invoice-management-title {
+            font-size: 1.1rem;
+        }
+        
+        .card-header h4 {
+            font-size: 1.1rem;
+        }
+        
+        .mobile-invoice-details {
+            grid-template-columns: 1fr;
+        }
+        
+        .mobile-invoice-actions {
+            flex-direction: column;
+        }
+        
+        .search-box {
+            min-width: auto;
+            padding: 10px 15px;
+        }
+        
+        .search-btn {
+            padding: 8px 15px;
+            font-size: 13px;
+        }
+    }
 </style>
 
 <div class="container-fluid py-3">
-  <!-- INVOICE MANAGEMENT -->
-  <div class="invoice-management-box">
-    <div class="invoice-management-bar">
-      <span class="invoice-management-title">
-        <i class="bi bi-receipt"></i> Invoice Management
-      </span>
-    </div>
-
-    <!-- TOOLS ROW - Search, Filter, Create Button -->
-    <div class="invoice-tools-row">
-      <!-- Search Box -->
-      <div class="search-box">
-        <i class="bi bi-search"></i>
-        <input type="text" id="invoiceSearch" placeholder="Search by invoice number, customer name...">
-      </div>
-
-      <!-- Filter Group -->
-      <div class="filter-group">
-        <select class="filter-select" id="statusFilter">
-          <option value="">All Status</option>
-          <option value="paid">Paid</option>
-          <option value="pending">Pending</option>
-          <option value="overdue">Overdue</option>
-        </select>
-
-        <!-- Date Range Picker -->
-        <div class="date-range-container">
-          <input type="date" class="date-input" id="startDate">
-          <span class="date-separator">to</span>
-          <input type="date" class="date-input" id="endDate">
+    <!-- INVOICE MANAGEMENT -->
+    <div class="invoice-management-box">
+        <div class="invoice-management-bar">
+            <span class="invoice-management-title">
+                <i class="bi bi-receipt"></i> Invoice Management
+            </span>
         </div>
-      </div>
 
-      <!-- Create Invoice Button
-      <a href="{{ route('admin.invoices.create') }}" class="create-invoice-btn">
-        <i class="bi bi-plus-circle"></i> Create Invoice
-      </a> -->
-    </div>
+        <!-- TOOLS ROW - Search, Filter, Create Button -->
+        <div class="invoice-tools-row">
+            <!-- Search Box with Button -->
+            <div style="display: flex; align-items: center; flex: 1; max-width: 500px; min-width: 380px;">
+                <div class="search-box">
+                    <i class="bi bi-search"></i>
+                    <input type="text" id="invoiceSearch" placeholder="Search by invoice number, customer name...">
+                </div>
+                
+                </button>
+            </div>
 
-    <div class="invoice-management-main no-extra-space">
-      <!-- Quick Stats Summary -->
-      <div class="stats-summary">
-        <div class="stat-card">
-          <div class="stat-value">{{ $invoices->count() }}</div>
-          <div class="stat-label">Total Invoices</div>
-        </div>
-        <div class="stat-card">
-          <div class="stat-value">₹{{ number_format($invoices->sum('final_amount_with_gst'), 2) }}</div>
-          <div class="stat-label">Total Revenue</div>
-        </div>
-        <div class="stat-card">
-          <div class="stat-value">{{ $invoices->where('status', 'paid')->count() }}</div>
-          <div class="stat-label">Paid Invoices</div>
-        </div>
-        <div class="stat-card">
-          <div class="stat-value">{{ $invoices->where('status', 'pending')->count() }}</div>
-          <div class="stat-label">Pending Invoices</div>
-        </div>
-      </div>
+            <!-- Filter Group -->
+            <div class="filter-group">
+                <select class="filter-select" id="statusFilter">
+                    <option value="">All Status</option>
+                    <option value="paid">Paid</option>
+                    <option value="pending">Pending</option>
+                    <option value="overdue">Overdue</option>
+                </select>
 
-      <!-- ALL INVOICES - Desktop Table -->
-      <div class="card shadow-sm desktop-table">
-        <div class="card-header bg-light d-flex justify-content-between align-items-center compact-view">
-          <h4 class="mb-0">All Invoices</h4>
-          <span class="text-muted" style="font-size: 12px;">
-            {{ $invoices->count() }} invoices
-          </span>
-        </div>
-        
-        <div class="card-body p-0">
-          <div class="table-container">
-            <table class="table table-striped align-middle" id="invoicesTable">
-              <thead class="table-light">
-                <tr>
-                  <th class="column-header">#</th>
-                  <th class="column-header">Invoice Number</th>
-                  <th class="column-header">Customer</th>
-                  <th class="column-header">Final Amount</th>
-                  <th class="column-header">GST %</th>
-                  <th class="column-header">Total w/GST</th>
-                  <th class="column-header">Status</th>
-                  <th class="column-header">Invoice Date</th>
-                  <th class="column-header">Due Date</th>
-                  <th class="column-header">Action</th>
-                </tr>
-              </thead>
+                <!-- Date Range Picker -->
+                <div class="date-range-container">
+                    <input type="date" class="date-input" id="startDate">
+                    <span class="date-separator">to</span>
+                    <input type="date" class="date-input" id="endDate">
+                </div>
+            </div>
 
-              <tbody>
+            <!-- Create Invoice Button -->
+            <!-- <a href="{{ route('admin.invoices.create') }}" class="create-invoice-btn">
+                <i class="bi bi-plus-circle"></i> Create Invoice
+            </a> -->
+        </div>
+
+        <div class="invoice-management-main no-extra-space">
+            <!-- Quick Stats Summary -->
+            <div class="stats-summary">
+                <div class="stat-card">
+                    <div class="stat-value">{{ $invoices->count() }}</div>
+                    <div class="stat-label">Total Invoices</div>
+                </div>
+                <div class="stat-card">
+                    <div class="stat-value">₹{{ number_format($invoices->sum('final_amount_with_gst'), 2) }}</div>
+                    <div class="stat-label">Total Revenue</div>
+                </div>
+                <div class="stat-card">
+                    <div class="stat-value">{{ $invoices->where('status', 'paid')->count() }}</div>
+                    <div class="stat-label">Paid Invoices</div>
+                </div>
+                <div class="stat-card">
+                    <div class="stat-value">{{ $invoices->where('status', 'pending')->count() }}</div>
+                    <div class="stat-label">Pending Invoices</div>
+                </div>
+            </div>
+
+            <!-- ALL INVOICES - Desktop Table -->
+            <div class="card shadow-sm desktop-table">
+                <div class="card-header bg-light d-flex justify-content-between align-items-center compact-view">
+                    <h4 class="mb-0">All Invoices</h4>
+                    <span class="text-muted" style="font-size: 13px;">
+                        {{ $invoices->count() }} invoices
+                    </span>
+                </div>
+                
+                <div class="card-body p-0">
+                    <div class="table-container">
+                        <table class="table table-striped align-middle" id="invoicesTable">
+                            <thead class="table-light">
+                                <tr>
+                                    <th class="column-header">#</th>
+                                    <th class="column-header">Invoice Number</th>
+                                    <th class="column-header">Customer</th>
+                                    <th class="column-header">Final Amount</th>
+                                    <th class="column-header">GST %</th>
+                                    <th class="column-header">Total w/GST</th>
+                                    <th class="column-header">Status</th>
+                                    <th class="column-header">Invoice Date</th>
+                                    <th class="column-header">Due Date</th>
+                                    <th class="column-header">Action</th>
+                                </tr>
+                            </thead>
+
+                            <tbody id="invoicesTableBody">
+                                @php
+                                    $totalInvoices = $invoices->count();
+                                    $sortedInvoices = $invoices->sortByDesc('created_at'); // Latest first
+                                @endphp
+                                
+                                @forelse($sortedInvoices as $i => $invoice)
+                                <tr>
+                                    <td>{{ $totalInvoices - $i }}</td>
+
+                                    <td>
+                                        <div class="invoice-number-cell">
+                                            <div class="invoice-icon invoice-icon-{{ (($totalInvoices - $i) % 8) + 1 }}">
+                                                <i class="bi bi-file-earmark-text"></i>
+                                            </div>
+                                            <a href="#" class="invoice-number-link open-invoice-popup" data-id="{{ $invoice->id }}">
+                                                {{ $invoice->invoice_number }}
+                                            </a>
+                                        </div>
+                                    </td>
+
+                                    <td class="customer-cell">{{ $invoice->customer_name }}</td>
+
+                                    <td class="amount-cell">₹{{ number_format($invoice->final_amount, 2) }}</td>
+                                    <td class="gst-cell">{{ $invoice->gst_percent }}%</td>
+                                    <td class="amount-cell">₹{{ number_format($invoice->final_amount_with_gst, 2) }}</td>
+
+                                    <td>
+                                        <span class="badge badge-{{ $invoice->status }}">
+                                            @if($invoice->status == 'paid')
+                                                <i class="bi bi-check-circle-fill status-icon"></i>
+                                            @elseif($invoice->status == 'pending')
+                                                <i class="bi bi-clock-fill status-icon"></i>
+                                            @elseif($invoice->status == 'overdue')
+                                                <i class="bi bi-exclamation-triangle-fill status-icon"></i>
+                                            @endif
+                                            {{ ucfirst($invoice->status) }}
+                                        </span>
+                                    </td>
+
+                                    <td class="date-cell">{{ $invoice->invoice_date }}</td>
+                                    <td class="date-cell">{{ $invoice->due_date }}</td>
+
+                                    <td>
+                                        <a href="{{ route('admin.invoices.edit', $invoice->id) }}" 
+                                        class="btn-entry">
+                                            <i class="bi bi-pencil"></i> Entry
+                                        </a>
+                                    </td>
+                                </tr>
+                                @empty
+                                <tr>
+                                    <td colspan="10" class="text-muted">No invoices found</td>
+                                </tr>
+                                @endforelse
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+            <!-- ALL INVOICES - Mobile Cards -->
+            <div class="mobile-invoices-container" id="mobileInvoicesContainer">
                 @php
                     $totalInvoices = $invoices->count();
                     $sortedInvoices = $invoices->sortByDesc('created_at'); // Latest first
                 @endphp
                 
                 @forelse($sortedInvoices as $i => $invoice)
-                <tr>
-                  <td>{{ $totalInvoices - $i }}</td>
-
-                  <td>
-                    <div class="invoice-number-cell">
-                      <div class="invoice-icon invoice-icon-{{ (($totalInvoices - $i) % 8) + 1 }}">
-                        <i class="bi bi-file-earmark-text"></i>
-                      </div>
-                      <a href="#" class="invoice-number-link open-invoice-popup" data-id="{{ $invoice->id }}">
-                        {{ $invoice->invoice_number }}
-                      </a>
+                <div class="mobile-invoice-card" data-invoice-id="{{ $invoice->id }}">
+                    <div class="mobile-invoice-header">
+                        <div class="mobile-invoice-number">
+                            <div class="mobile-invoice-icon invoice-icon-{{ (($totalInvoices - $i) % 8) + 1 }}">
+                                <i class="bi bi-file-earmark-text"></i>
+                            </div>
+                            <span class="mobile-invoice-number-text">{{ $invoice->invoice_number }}</span>
+                        </div>
+                        <span class="badge badge-{{ $invoice->status }} mobile-invoice-status">
+                            @if($invoice->status == 'paid')
+                                <i class="bi bi-check-circle-fill status-icon"></i>
+                            @elseif($invoice->status == 'pending')
+                                <i class="bi bi-clock-fill status-icon"></i>
+                            @elseif($invoice->status == 'overdue')
+                                <i class="bi bi-exclamation-triangle-fill status-icon"></i>
+                            @endif
+                            {{ ucfirst($invoice->status) }}
+                        </span>
                     </div>
-                  </td>
-
-                  <td class="customer-cell">{{ $invoice->customer_name }}</td>
-
-                  <td class="amount-cell">₹{{ number_format($invoice->final_amount, 2) }}</td>
-                  <td class="gst-cell">{{ $invoice->gst_percent }}%</td>
-                  <td class="amount-cell">₹{{ number_format($invoice->final_amount_with_gst, 2) }}</td>
-
-                  <td>
-                    <span class="badge badge-{{ $invoice->status }}">
-                      @if($invoice->status == 'paid')
-                        <i class="bi bi-check-circle-fill status-icon"></i>
-                      @elseif($invoice->status == 'pending')
-                        <i class="bi bi-clock-fill status-icon"></i>
-                      @elseif($invoice->status == 'overdue')
-                        <i class="bi bi-exclamation-triangle-fill status-icon"></i>
-                      @endif
-                      {{ ucfirst($invoice->status) }}
-                    </span>
-                  </td>
-
-                  <td class="date-cell">{{ $invoice->invoice_date }}</td>
-                  <td class="date-cell">{{ $invoice->due_date }}</td>
-
-                  <td>
-                    <a href="{{ route('admin.invoices.edit', $invoice->id) }}" 
-                       class="btn-entry">
-                      <i class="bi bi-pencil"></i> Entry
-                    </a>
-                  </td>
-                </tr>
+                    
+                    <div class="mobile-invoice-details">
+                        <div class="mobile-detail-item">
+                            <span class="mobile-detail-label">Customer</span>
+                            <span class="mobile-detail-value">{{ $invoice->customer_name }}</span>
+                        </div>
+                        <div class="mobile-detail-item">
+                            <span class="mobile-detail-label">Amount</span>
+                            <span class="mobile-detail-value">₹{{ number_format($invoice->final_amount, 2) }}</span>
+                        </div>
+                        <div class="mobile-detail-item">
+                            <span class="mobile-detail-label">GST</span>
+                            <span class="mobile-detail-value">{{ $invoice->gst_percent }}%</span>
+                        </div>
+                        <div class="mobile-detail-item">
+                            <span class="mobile-detail-label">Total</span>
+                            <span class="mobile-detail-value">₹{{ number_format($invoice->final_amount_with_gst, 2) }}</span>
+                        </div>
+                        <div class="mobile-detail-item">
+                            <span class="mobile-detail-label">Invoice Date</span>
+                            <span class="mobile-detail-value">{{ $invoice->invoice_date }}</span>
+                        </div>
+                        <div class="mobile-detail-item">
+                            <span class="mobile-detail-label">Due Date</span>
+                            <span class="mobile-detail-value">{{ $invoice->due_date }}</span>
+                        </div>
+                    </div>
+                    
+                    <div class="mobile-invoice-actions">
+                        <a href="#" class="mobile-action-btn view open-invoice-popup" data-id="{{ $invoice->id }}">
+                            <i class="bi bi-eye"></i> View
+                        </a>
+                        <a href="{{ route('admin.invoices.edit', $invoice->id) }}" class="mobile-action-btn entry">
+                            <i class="bi bi-pencil"></i> Entry
+                        </a>
+                    </div>
+                </div>
                 @empty
-                <tr>
-                  <td colspan="10" class="text-muted">No invoices found</td>
-                </tr>
+                <div class="text-muted text-center py-4">No invoices found</div>
                 @endforelse
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
+            </div>
 
-      <!-- ALL INVOICES - Mobile Cards -->
-      <div class="mobile-invoices-container">
-        @php
-            $totalInvoices = $invoices->count();
-            $sortedInvoices = $invoices->sortByDesc('created_at'); // Latest first
-        @endphp
-        
-        @forelse($sortedInvoices as $i => $invoice)
-        <div class="mobile-invoice-card" data-invoice-id="{{ $invoice->id }}">
-          <div class="mobile-invoice-header">
-            <div class="mobile-invoice-number">
-              <div class="mobile-invoice-icon invoice-icon-{{ (($totalInvoices - $i) % 8) + 1 }}">
-                <i class="bi bi-file-earmark-text"></i>
-              </div>
-              <span class="mobile-invoice-number-text">{{ $invoice->invoice_number }}</span>
+            <!-- Pagination Controls -->
+            <div class="pagination-container">
+                <div class="pagination-info" id="pageInfo">Showing 1 to {{ $invoices->count() }} of {{ $invoices->count() }} entries</div>
+                <div class="pagination-controls">
+                    <button class="pagination-img-btn" id="prevPageBtn" title="Previous page" disabled>
+                        <!-- Left arrow SVG -->
+                        <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                        </svg>
+                    </button>
+                    <div class="pagination-pages" id="paginationPages">
+                        <!-- Page numbers will be inserted here -->
+                    </div>
+                    <button class="pagination-img-btn" id="nextPageBtn" title="Next page" disabled>
+                        <!-- Right arrow SVG -->
+                        <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                        </svg>
+                    </button>
+                </div>
             </div>
-            <span class="badge badge-{{ $invoice->status }} mobile-invoice-status">
-              @if($invoice->status == 'paid')
-                <i class="bi bi-check-circle-fill status-icon"></i>
-              @elseif($invoice->status == 'pending')
-                <i class="bi bi-clock-fill status-icon"></i>
-              @elseif($invoice->status == 'overdue')
-                <i class="bi bi-exclamation-triangle-fill status-icon"></i>
-              @endif
-              {{ ucfirst($invoice->status) }}
-            </span>
-          </div>
-          
-          <div class="mobile-invoice-details">
-            <div class="mobile-detail-item">
-              <span class="mobile-detail-label">Customer</span>
-              <span class="mobile-detail-value">{{ $invoice->customer_name }}</span>
-            </div>
-            <div class="mobile-detail-item">
-              <span class="mobile-detail-label">Amount</span>
-              <span class="mobile-detail-value">₹{{ number_format($invoice->final_amount, 2) }}</span>
-            </div>
-            <div class="mobile-detail-item">
-              <span class="mobile-detail-label">GST</span>
-              <span class="mobile-detail-value">{{ $invoice->gst_percent }}%</span>
-            </div>
-            <div class="mobile-detail-item">
-              <span class="mobile-detail-label">Total</span>
-              <span class="mobile-detail-value">₹{{ number_format($invoice->final_amount_with_gst, 2) }}</span>
-            </div>
-            <div class="mobile-detail-item">
-              <span class="mobile-detail-label">Invoice Date</span>
-              <span class="mobile-detail-value">{{ $invoice->invoice_date }}</span>
-            </div>
-            <div class="mobile-detail-item">
-              <span class="mobile-detail-label">Due Date</span>
-              <span class="mobile-detail-value">{{ $invoice->due_date }}</span>
-            </div>
-          </div>
-          
-          <div class="mobile-invoice-actions">
-            <a href="#" class="mobile-action-btn view open-invoice-popup" data-id="{{ $invoice->id }}">
-              <i class="bi bi-eye"></i> View
-            </a>
-            <a href="{{ route('admin.invoices.edit', $invoice->id) }}" class="mobile-action-btn entry">
-              <i class="bi bi-pencil"></i> Entry
-            </a>
-          </div>
         </div>
-        @empty
-        <div class="text-muted text-center py-4">No invoices found</div>
-        @endforelse
-      </div>
     </div>
-  </div>
 </div>
 
 {{-- POPUP MODAL --}}
 <div class="modal fade" id="invoiceModal" tabindex="-1">
-  <div class="modal-dialog modal-xl modal-dialog-scrollable">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Invoice Details</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-      </div>
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Invoice Details</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            </div>
 
-      <div class="modal-body" id="invoiceModalBody">
-        <p class="text-center text-muted">Loading...</p>
-      </div>
+            <div class="modal-body" id="invoiceModalBody">
+                <p class="text-center text-muted">Loading...</p>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-  // Invoice popup functionality
-  document.addEventListener('click', function(e) {
-    if (e.target.closest('.open-invoice-popup')) {
-      e.preventDefault();
-      const id = e.target.closest('.open-invoice-popup').dataset.id;
-      const modal = new bootstrap.Modal(document.getElementById('invoiceModal'));
+    // Pagination state
+    let currentPage = 1;
+    const itemsPerPage = 10;
+    let allInvoices = @json($invoices);
+    let filteredInvoices = [...allInvoices];
 
-      document.getElementById('invoiceModalBody').innerHTML =
-        "<div class='text-center py-4'><div class='spinner-border text-primary' role='status'></div><p class='mt-2 text-muted'>Loading invoice details...</p></div>";
+    // Initialize pagination
+    renderTable();
+    updatePaginationControls();
+    
+    // Bind pagination events
+    document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
+    document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
 
-      modal.show();
+    // Invoice popup functionality
+    document.addEventListener('click', function(e) {
+        if (e.target.closest('.open-invoice-popup')) {
+            e.preventDefault();
+            const id = e.target.closest('.open-invoice-popup').dataset.id;
+            const modal = new bootstrap.Modal(document.getElementById('invoiceModal'));
 
-      fetch(`/admin/invoices/${id}/popup`)
-        .then(res => {
-          if (!res.ok) {
-            throw new Error('Network response was not ok');
-          }
-          return res.text();
-        })
-        .then(html => {
-          document.getElementById('invoiceModalBody').innerHTML = html;
-        })
-        .catch(error => {
-          console.error('Error loading invoice details:', error);
-          document.getElementById('invoiceModalBody').innerHTML = 
-            "<div class='text-center py-4 text-danger'><i class='bi bi-exclamation-triangle fs-1'></i><p class='mt-2'>Failed to load invoice details. Please try again.</p></div>";
+            document.getElementById('invoiceModalBody').innerHTML =
+                "<div class='text-center py-4'><div class='spinner-border text-primary' role='status'></div><p class='mt-2 text-muted'>Loading invoice details...</p></div>";
+
+            modal.show();
+
+            fetch(`/admin/invoices/${id}/popup`)
+                .then(res => {
+                    if (!res.ok) {
+                        throw new Error('Network response was not ok');
+                    }
+                    return res.text();
+                })
+                .then(html => {
+                    document.getElementById('invoiceModalBody').innerHTML = html;
+                })
+                .catch(error => {
+                    console.error('Error loading invoice details:', error);
+                    document.getElementById('invoiceModalBody').innerHTML = 
+                        "<div class='text-center py-4 text-danger'><i class='bi bi-exclamation-triangle fs-1'></i><p class='mt-2'>Failed to load invoice details. Please try again.</p></div>";
+                });
+        }
+    });
+
+    // Search and filter functionality for both desktop and mobile
+    const searchInput = document.getElementById('invoiceSearch');
+    const statusFilter = document.getElementById('statusFilter');
+    const startDateInput = document.getElementById('startDate');
+    const endDateInput = document.getElementById('endDate');
+    const searchButton = document.getElementById('searchButton');
+
+    function filterInvoices() {
+        const searchTerm = searchInput.value.toLowerCase();
+        const statusValue = statusFilter.value;
+        const startDate = startDateInput.value;
+        const endDate = endDateInput.value;
+
+        filteredInvoices = allInvoices.filter(invoice => {
+            let include = true;
+
+            // Search filter
+            if (searchTerm) {
+                const matchesSearch = 
+                    invoice.invoice_number.toLowerCase().includes(searchTerm) ||
+                    invoice.customer_name.toLowerCase().includes(searchTerm);
+                if (!matchesSearch) include = false;
+            }
+
+            // Status filter
+            if (statusValue && invoice.status !== statusValue) {
+                include = false;
+            }
+
+            // Date filter
+            if (startDate || endDate) {
+                const invoiceDate = new Date(invoice.invoice_date);
+                const start = startDate ? new Date(startDate) : null;
+                const end = endDate ? new Date(endDate) : null;
+                
+                if (start && invoiceDate < start) include = false;
+                if (end && invoiceDate > end) include = false;
+            }
+
+            return include;
+        });
+
+        currentPage = 1;
+        renderTable();
+        updatePaginationControls();
+    }
+
+    // Add event listeners for filtering
+    searchInput.addEventListener('input', filterInvoices);
+    searchButton.addEventListener('click', filterInvoices);
+    statusFilter.addEventListener('change', filterInvoices);
+    startDateInput.addEventListener('change', filterInvoices);
+    endDateInput.addEventListener('change', filterInvoices);
+
+    // Also trigger search on Enter key in search input
+    searchInput.addEventListener('keypress', function(e) {
+        if (e.key === 'Enter') {
+            filterInvoices();
+        }
+    });
+
+    // Pagination Functions
+    function goToPreviousPage() {
+        if (currentPage > 1) {
+            currentPage--;
+            renderTable();
+            updatePaginationControls();
+        }
+    }
+
+    function goToNextPage() {
+        const totalPages = Math.ceil(filteredInvoices.length / itemsPerPage);
+        if (currentPage < totalPages) {
+            currentPage++;
+            renderTable();
+            updatePaginationControls();
+        }
+    }
+
+    function updatePaginationControls() {
+        const totalPages = Math.ceil(filteredInvoices.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, filteredInvoices.length);
+        pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${filteredInvoices.length} entries`;
+        
+        // Generate page numbers
+        paginationPages.innerHTML = '';
+        
+        if (totalPages <= 7) {
+            // Show all pages
+            for (let i = 1; i <= totalPages; i++) {
+                addPageButton(i, paginationPages);
+            }
+        } else {
+            // Show first page, current page range, and last page
+            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
+    function renderTable() {
+        const tbody = document.getElementById('invoicesTableBody');
+        const mobileContainer = document.getElementById('mobileInvoicesContainer');
+        
+        if (filteredInvoices.length === 0) {
+            tbody.innerHTML = '<tr><td colspan="10" class="text-muted">No invoices found</td></tr>';
+            mobileContainer.innerHTML = '<div class="text-muted text-center py-4">No invoices found</div>';
+            return;
+        }
+        
+        // Calculate pagination
+        const startIndex = (currentPage - 1) * itemsPerPage;
+        const endIndex = startIndex + itemsPerPage;
+        const paginatedItems = filteredInvoices.slice(startIndex, endIndex);
+        
+        // Sort by creation date (newest first)
+        const sortedItems = [...paginatedItems].sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+        
+        // Render desktop table
+        tbody.innerHTML = '';
+        sortedItems.forEach((invoice, index) => {
+            const displayIndex = filteredInvoices.length - (startIndex + index);
+            const row = document.createElement('tr');
+            row.innerHTML = `
+                <td>${displayIndex}</td>
+                <td>
+                    <div class="invoice-number-cell">
+                        <div class="invoice-icon invoice-icon-${(displayIndex % 8) + 1}">
+                            <i class="bi bi-file-earmark-text"></i>
+                        </div>
+                        <a href="#" class="invoice-number-link open-invoice-popup" data-id="${invoice.id}">
+                            ${invoice.invoice_number}
+                        </a>
+                    </div>
+                </td>
+                <td class="customer-cell">${invoice.customer_name}</td>
+                <td class="amount-cell">₹${parseFloat(invoice.final_amount).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
+                <td class="gst-cell">${invoice.gst_percent}%</td>
+                <td class="amount-cell">₹${parseFloat(invoice.final_amount_with_gst).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
+                <td>
+                    <span class="badge badge-${invoice.status}">
+                        ${invoice.status === 'paid' ? '<i class="bi bi-check-circle-fill status-icon"></i>' : ''}
+                        ${invoice.status === 'pending' ? '<i class="bi bi-clock-fill status-icon"></i>' : ''}
+                        ${invoice.status === 'overdue' ? '<i class="bi bi-exclamation-triangle-fill status-icon"></i>' : ''}
+                        ${invoice.status.charAt(0).toUpperCase() + invoice.status.slice(1)}
+                    </span>
+                </td>
+                <td class="date-cell">${invoice.invoice_date}</td>
+                <td class="date-cell">${invoice.due_date}</td>
+                <td>
+                    <a href="/admin/invoices/${invoice.id}/edit" class="btn-entry">
+                        <i class="bi bi-pencil"></i> Entry
+                    </a>
+                </td>
+            `;
+            tbody.appendChild(row);
+        });
+        
+        // Render mobile cards
+        mobileContainer.innerHTML = '';
+        sortedItems.forEach((invoice, index) => {
+            const displayIndex = filteredInvoices.length - (startIndex + index);
+            const card = document.createElement('div');
+            card.className = 'mobile-invoice-card';
+            card.setAttribute('data-invoice-id', invoice.id);
+            card.innerHTML = `
+                <div class="mobile-invoice-header">
+                    <div class="mobile-invoice-number">
+                        <div class="mobile-invoice-icon invoice-icon-${(displayIndex % 8) + 1}">
+                            <i class="bi bi-file-earmark-text"></i>
+                        </div>
+                        <span class="mobile-invoice-number-text">${invoice.invoice_number}</span>
+                    </div>
+                    <span class="badge badge-${invoice.status} mobile-invoice-status">
+                        ${invoice.status === 'paid' ? '<i class="bi bi-check-circle-fill status-icon"></i>' : ''}
+                        ${invoice.status === 'pending' ? '<i class="bi bi-clock-fill status-icon"></i>' : ''}
+                        ${invoice.status === 'overdue' ? '<i class="bi bi-exclamation-triangle-fill status-icon"></i>' : ''}
+                        ${invoice.status.charAt(0).toUpperCase() + invoice.status.slice(1)}
+                    </span>
+                </div>
+                <div class="mobile-invoice-details">
+                    <div class="mobile-detail-item">
+                        <span class="mobile-detail-label">Customer</span>
+                        <span class="mobile-detail-value">${invoice.customer_name}</span>
+                    </div>
+                    <div class="mobile-detail-item">
+                        <span class="mobile-detail-label">Amount</span>
+                        <span class="mobile-detail-value">₹${parseFloat(invoice.final_amount).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</span>
+                    </div>
+                    <div class="mobile-detail-item">
+                        <span class="mobile-detail-label">GST</span>
+                        <span class="mobile-detail-value">${invoice.gst_percent}%</span>
+                    </div>
+                    <div class="mobile-detail-item">
+                        <span class="mobile-detail-label">Total</span>
+                        <span class="mobile-detail-value">₹${parseFloat(invoice.final_amount_with_gst).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</span>
+                    </div>
+                    <div class="mobile-detail-item">
+                        <span class="mobile-detail-label">Invoice Date</span>
+                        <span class="mobile-detail-value">${invoice.invoice_date}</span>
+                    </div>
+                    <div class="mobile-detail-item">
+                        <span class="mobile-detail-label">Due Date</span>
+                        <span class="mobile-detail-value">${invoice.due_date}</span>
+                    </div>
+                </div>
+                <div class="mobile-invoice-actions">
+                    <a href="#" class="mobile-action-btn view open-invoice-popup" data-id="${invoice.id}">
+                        <i class="bi bi-eye"></i> View
+                    </a>
+                    <a href="/admin/invoices/${invoice.id}/edit" class="mobile-action-btn entry">
+                        <i class="bi bi-pencil"></i> Entry
+                    </a>
+                </div>
+            `;
+            mobileContainer.appendChild(card);
         });
     }
-  });
 
-  // Search and filter functionality for both desktop and mobile
-  const searchInput = document.getElementById('invoiceSearch');
-  const statusFilter = document.getElementById('statusFilter');
-  const startDateInput = document.getElementById('startDate');
-  const endDateInput = document.getElementById('endDate');
-  
-  // Desktop table elements
-  const table = document.getElementById('invoicesTable');
-  const tableRows = table ? table.getElementsByTagName('tbody')[0].getElementsByTagName('tr') : [];
-  
-  // Mobile card elements
-  const mobileCards = document.querySelectorAll('.mobile-invoice-card');
-
-  function filterInvoices() {
-    const searchTerm = searchInput.value.toLowerCase();
-    const statusValue = statusFilter.value;
-    const startDate = startDateInput.value;
-    const endDate = endDateInput.value;
-
-    // Filter desktop table rows
-    for (let row of tableRows) {
-      const cells = row.getElementsByTagName('td');
-      if (cells.length < 9) continue;
-      
-      const invoiceNumber = cells[1].textContent.toLowerCase();
-      const customerName = cells[2].textContent.toLowerCase();
-      const status = cells[6].textContent.toLowerCase();
-      const invoiceDate = cells[7].textContent;
-      
-      const matchesSearch = invoiceNumber.includes(searchTerm) || customerName.includes(searchTerm);
-      const matchesStatus = !statusValue || status.includes(statusValue);
-      
-      // Date filtering
-      let matchesDate = true;
-      if (startDate || endDate) {
-        const cellDate = new Date(invoiceDate);
-        const start = startDate ? new Date(startDate) : null;
-        const end = endDate ? new Date(endDate) : null;
-        
-        if (start && cellDate < start) matchesDate = false;
-        if (end && cellDate > end) matchesDate = false;
-      }
-
-      row.style.display = matchesSearch && matchesStatus && matchesDate ? '' : 'none';
-    }
-
-    // Filter mobile cards
-    for (let card of mobileCards) {
-      const invoiceNumber = card.querySelector('.mobile-invoice-number-text').textContent.toLowerCase();
-      const customerName = card.querySelector('.mobile-detail-item:nth-child(1) .mobile-detail-value').textContent.toLowerCase();
-      const status = card.querySelector('.badge').textContent.toLowerCase();
-      const invoiceDate = card.querySelector('.mobile-detail-item:nth-child(5) .mobile-detail-value').textContent;
-      
-      const matchesSearch = invoiceNumber.includes(searchTerm) || customerName.includes(searchTerm);
-      const matchesStatus = !statusValue || status.includes(statusValue);
-      
-      // Date filtering
-      let matchesDate = true;
-      if (startDate || endDate) {
-        const cellDate = new Date(invoiceDate);
-        const start = startDate ? new Date(startDate) : null;
-        const end = endDate ? new Date(endDate) : null;
-        
-        if (start && cellDate < start) matchesDate = false;
-        if (end && cellDate > end) matchesDate = false;
-      }
-
-      card.style.display = matchesSearch && matchesStatus && matchesDate ? '' : 'none';
-    }
-  }
-
-  // Add event listeners for filtering
-  searchInput.addEventListener('input', filterInvoices);
-  statusFilter.addEventListener('change', filterInvoices);
-  startDateInput.addEventListener('change', filterInvoices);
-  endDateInput.addEventListener('change', filterInvoices);
-
-  // Add hover effects to table rows
-  for (let row of tableRows) {
-    row.addEventListener('mouseenter', function() {
-      this.style.cursor = 'pointer';
+    // Add hover effects to table rows
+    document.addEventListener('mouseover', function(e) {
+        if (e.target.closest('tr')) {
+            const row = e.target.closest('tr');
+            if (row.parentElement.tagName === 'TBODY') {
+                row.style.cursor = 'pointer';
+            }
+        }
     });
-  }
 });
 </script>
 
diff --git a/resources/views/admin/mark_list.blade.php b/resources/views/admin/mark_list.blade.php
index 82249bb..7ff94f2 100644
--- a/resources/views/admin/mark_list.blade.php
+++ b/resources/views/admin/mark_list.blade.php
@@ -277,6 +277,139 @@
         from { box-shadow: 0 0 0px #b4a02455 inset; }
         to { box-shadow: 0 0 10px #b4a024aa inset; }
       }
+
+      /* ---------- Pagination Styles ---------- */
+      .pagination-container {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-top: 15px;
+          padding: 12px 0;
+          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;
+      }
+
+      /* Image-based pagination buttons */
+      .pagination-img-btn {
+          background: #fff;
+          border: 1px solid #e3eaf6;
+          border-radius: 6px;
+          cursor: pointer;
+          transition: all 0.3s ease;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          min-width: 40px;
+          height: 32px;
+          padding: 0;
+      }
+
+      .pagination-img-btn:hover:not(:disabled) {
+          background: #1a2951;
+          border-color: #1a2951;
+      }
+
+      .pagination-img-btn:disabled {
+          background: #f8fafc;
+          border-color: #e2e8f0;
+          cursor: not-allowed;
+          opacity: 0.5;
+      }
+
+      .pagination-img-btn img {
+          width: 16px;
+          height: 16px;
+          filter: brightness(0) saturate(100%) invert(26%) sepia(89%) saturate(748%) hue-rotate(201deg) brightness(93%) contrast(89%);
+          transition: filter 0.3s ease;
+      }
+
+      .pagination-img-btn:hover:not(:disabled) img {
+          filter: brightness(0) saturate(100%) invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(106%) contrast(101%);
+      }
+
+      .pagination-img-btn:disabled img {
+          filter: brightness(0) saturate(100%) invert(84%) sepia(8%) saturate(165%) hue-rotate(179deg) brightness(89%) contrast(86%);
+      }
     </style>
 
     @if(session('success'))
@@ -304,63 +437,207 @@
             <th>Action</th>
           </tr>
         </thead>
-        <tbody>
-          @foreach($markList as $mark)
-          <tr>
-            <td>{{ $mark->id }}</td>
-            <td>{{ $mark->mark_no }}</td>
-            <td>{{ $mark->origin }}</td>
-            <td>{{ $mark->destination }}</td>
-            <td>{{ $mark->customer_name }}</td>
-            <td>{{ $mark->customer_id }}</td>
-            <td>{{ $mark->mobile_no }}</td>
-            <td>{{ \Carbon\Carbon::parse($mark->date)->format('d-m-Y') }}</td>
-            <td>
-              @if($mark->status == 'active')
-                <span class="badge badge-active">
-                  <i class="bi bi-check-circle-fill status-icon"></i>
-                  Active
-                </span>
-              @else
-                <span class="badge badge-inactive">
-                  <i class="bi bi-exclamation-triangle-fill status-icon"></i>
-                  In-Active
-                </span>
-              @endif
-            </td>
-            <td>
-              @if($mark->status == 'active')
-                <a href="{{ route('admin.marklist.toggle', $mark->id) }}" class="btn-action btn-action-deactivate">
-                  <i class="bi bi-power btn-icon"></i>
-                  Deactivate
-                </a>
-              @else
-                <a href="{{ route('admin.marklist.toggle', $mark->id) }}" class="btn-action btn-action-activate">
-                  <i class="bi bi-play-circle btn-icon"></i>
-                  Activate
-                </a>
-              @endif
-            </td>
-          </tr>
-          @endforeach
+        <tbody id="markListTableBody">
+          <!-- Data will be loaded dynamically -->
         </tbody>
       </table>
 
-      @if($markList->isEmpty())
-        <div class="py-4 text-center text-muted fst-italic">No mark numbers found.</div>
-      @endif
+      <!-- Pagination Controls -->
+      <div class="pagination-container">
+          <div class="pagination-info" id="pageInfo">Showing 0 entries</div>
+          <div class="pagination-controls">
+              <button class="pagination-img-btn" id="prevPageBtn" title="Previous page" disabled>
+                  <!-- Left arrow SVG -->
+                  <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                  </svg>
+              </button>
+              <div class="pagination-pages" id="paginationPages">
+                  <!-- Page numbers will be inserted here -->
+              </div>
+              <button class="pagination-img-btn" id="nextPageBtn" title="Next page" disabled>
+                  <!-- Right arrow SVG -->
+                  <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                  </svg>
+              </button>
+          </div>
+      </div>
+
+      <div id="noResults" class="py-4 text-center text-muted fst-italic" style="display: none;">No mark numbers found.</div>
     </div>
 
     <script>
-      document.getElementById('globalSearch').addEventListener('input', function () {
-        const filter = this.value.toLowerCase();
-        const rows = document.querySelectorAll('#markListTable tbody tr');
+      // Pagination state
+      let currentPage = 1;
+      const itemsPerPage = 10;
+      let allMarkList = @json($markList);
+      let filteredMarkList = [...allMarkList];
 
-        rows.forEach(row => {
-          const text = row.textContent.toLowerCase();
-          row.style.display = text.includes(filter) ? '' : 'none';
-        });
+      // Initialize pagination
+      document.addEventListener('DOMContentLoaded', function() {
+          renderTable();
+          updatePaginationControls();
+          
+          // Bind pagination events
+          document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
+          document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
+          
+          // Bind search event
+          document.getElementById('globalSearch').addEventListener('input', handleSearch);
       });
+
+      // Pagination Functions
+      function goToPreviousPage() {
+          if (currentPage > 1) {
+              currentPage--;
+              renderTable();
+              updatePaginationControls();
+          }
+      }
+
+      function goToNextPage() {
+          const totalPages = Math.ceil(filteredMarkList.length / itemsPerPage);
+          if (currentPage < totalPages) {
+              currentPage++;
+              renderTable();
+              updatePaginationControls();
+          }
+      }
+
+      function updatePaginationControls() {
+          const totalPages = Math.ceil(filteredMarkList.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, filteredMarkList.length);
+          pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${filteredMarkList.length} entries`;
+          
+          // Generate page numbers
+          paginationPages.innerHTML = '';
+          
+          if (totalPages <= 7) {
+              // Show all pages
+              for (let i = 1; i <= totalPages; i++) {
+                  addPageButton(i, paginationPages);
+              }
+          } else {
+              // Show first page, current page range, and last page
+              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);
+      }
+
+      // Search Function
+      function handleSearch() {
+          const filter = this.value.toLowerCase();
+          filteredMarkList = allMarkList.filter(mark => {
+              return Object.values(mark).some(value => 
+                  String(value).toLowerCase().includes(filter)
+              );
+          });
+          
+          currentPage = 1;
+          renderTable();
+          updatePaginationControls();
+      }
+
+      // Render Table Function - FIXED: Using direct URL construction
+      function renderTable() {
+          const tbody = document.getElementById('markListTableBody');
+          const noResults = document.getElementById('noResults');
+          tbody.innerHTML = '';
+          
+          if (filteredMarkList.length === 0) {
+              tbody.innerHTML = '';
+              noResults.style.display = 'block';
+              return;
+          }
+          
+          noResults.style.display = 'none';
+          
+          // Calculate pagination
+          const startIndex = (currentPage - 1) * itemsPerPage;
+          const endIndex = startIndex + itemsPerPage;
+          const paginatedItems = filteredMarkList.slice(startIndex, endIndex);
+          
+          paginatedItems.forEach(mark => {
+              const row = document.createElement('tr');
+              row.innerHTML = `
+                  <td>${mark.id}</td>
+                  <td>${mark.mark_no}</td>
+                  <td>${mark.origin}</td>
+                  <td>${mark.destination}</td>
+                  <td>${mark.customer_name}</td>
+                  <td>${mark.customer_id}</td>
+                  <td>${mark.mobile_no}</td>
+                  <td>${new Date(mark.date).toLocaleDateString('en-GB')}</td>
+                  <td>
+                      ${mark.status == 'active' 
+                          ? `<span class="badge badge-active">
+                                <i class="bi bi-check-circle-fill status-icon"></i>
+                                Active
+                             </span>`
+                          : `<span class="badge badge-inactive">
+                                <i class="bi bi-exclamation-triangle-fill status-icon"></i>
+                                In-Active
+                             </span>`
+                      }
+                  </td>
+                  <td>
+                      ${mark.status == 'active'
+                          ? `<a href="/admin/mark-list/status/${mark.id}" class="btn-action btn-action-deactivate">
+                                <i class="bi bi-power btn-icon"></i>
+                                Deactivate
+                             </a>`
+                          : `<a href="/admin/mark-list/status/${mark.id}" class="btn-action btn-action-activate">
+                                <i class="bi bi-play-circle btn-icon"></i>
+                                Activate
+                             </a>`
+                      }
+                  </td>
+              `;
+              tbody.appendChild(row);
+          });
+      }
     </script>
   </div>
 </div>
diff --git a/resources/views/admin/orders.blade.php b/resources/views/admin/orders.blade.php
index 9d421ba..865844d 100644
--- a/resources/views/admin/orders.blade.php
+++ b/resources/views/admin/orders.blade.php
@@ -5,250 +5,1090 @@
 @section('content')
 <style>
   /* ===== GLOBAL RESPONSIVE STYLES ===== */
-html, body {
-  overflow-x: hidden !important;
-  max-width: 100%;
-}
-    /* VARIABLES AND BASE STYLES */
-    :root {
-        --primary-color: #3b82f6; /* Blue 500 */
-        --primary-hover: #2563eb; /* Blue 600 */
-        --border-light: #e5e7eb; /* Gray 200 */
-        --bg-container: #ffffff;
-        --bg-light: #f9fafb; /* Gray 50 */
-        --bg-hover: #f3f4f6; /* Gray 100 */
-        --text-dark: #1f2937; /* Gray 800 */
-        --text-muted: #6b7280; /* Gray 500 */
-        --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
-    }
+  html, body {
+    overflow-x: hidden !important;
+    max-width: 100%;
+  }
 
-    .orders-container {
-        background: var(--bg-container);
-        padding: 24px;
-        border-radius: 12px;
-        box-shadow: var(--shadow-lg);
-        margin-top: 28px;
-        font-family: 'Inter', sans-serif; /* A modern, clean font */
-    
-    }
+  /* Use Inter globally */
+  @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
+  :root { 
+    --admin-font: 'Inter', sans-serif; 
+    --primary-gradient: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    --success-gradient: linear-gradient(135deg, #10b981, #34d399);
+    --warning-gradient: linear-gradient(135deg, #fef3c7, #fde68a);
+    --danger-gradient: linear-gradient(135deg, #fef2f2, #fecaca);
+    --info-gradient: linear-gradient(135deg, #dbeafe, #bfdbfe);
+    --purple-gradient: linear-gradient(135deg, #e9d5ff, #d8b4fe);
+  }
+  
+  body, input, select, textarea, button, table, th, td, .orders-container {
+    font-family: var(--admin-font);
+  }
 
+  /* VARIABLES AND BASE STYLES */
+  :root {
+    --primary-color: #3b82f6;
+    --primary-hover: #2563eb;
+    --border-light: #e5e7eb;
+    --bg-container: #ffffff;
+    --bg-light: #f9fafb;
+    --bg-hover: #f3f4f6;
+    --text-dark: #1f2937;
+    --text-muted: #6b7280;
+    --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
+    --shadow-sm: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
+  }
+
+  .orders-container {
+    background: var(--bg-container);
+    padding: 24px;
+    border-radius: 16px;
+    box-shadow: var(--shadow-lg);
+    margin-top: 28px;
+    border: 1px solid rgba(0,0,0,0.05);
+  }
+
+  .orders-title {
+    font-size: 28px;
+    font-weight: 700;
+    margin-bottom: 24px;
+    color: var(--text-dark);
+    display: flex;
+    align-items: center;
+    gap: 12px;
+  }
+
+  .orders-title i {
+    background: var(--primary-gradient);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    font-size: 32px;
+  }
+
+  /* HEADER STATS CARDS */
+  .stats-container {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+    gap: 16px;
+    margin-bottom: 24px;
+  }
+
+  .stat-card {
+    background: white;
+    border-radius: 12px;
+    padding: 20px;
+    box-shadow: var(--shadow-sm);
+    border-left: 4px solid;
+    display: flex;
+    flex-direction: column;
+    transition: transform 0.3s ease, box-shadow 0.3s ease;
+  }
+
+  .stat-card:hover {
+    transform: translateY(-5px);
+    box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1);
+  }
+
+  .stat-card.total { border-left-color: #667eea; }
+  .stat-card.paid { border-left-color: #10b981; }
+  .stat-card.pending { border-left-color: #f59e0b; }
+  .stat-card.overdue { border-left-color: #ef4444; }
+
+  .stat-value {
+    font-size: 28px;
+    font-weight: 700;
+    margin-bottom: 8px;
+  }
+
+  .stat-label {
+    font-size: 14px;
+    color: var(--text-muted);
+    font-weight: 500;
+  }
+
+  /* ===== DOWNLOAD BUTTONS STYLES ===== */
+  .download-section {
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 20px;
+    gap: 12px;
+  }
+
+  .download-btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    padding: 12px 20px;
+    border: none;
+    border-radius: 10px;
+    font-size: 14px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    text-decoration: none;
+    box-shadow: var(--shadow-sm);
+  }
+
+  .download-btn i {
+    font-size: 16px;
+  }
+
+  .download-btn.pdf {
+    background: linear-gradient(135deg, #ef4444, #dc2626);
+    color: white;
+  }
+
+  .download-btn.pdf:hover {
+    background: linear-gradient(135deg, #dc2626, #b91c1c);
+    transform: translateY(-2px);
+    box-shadow: 0 4px 12px rgba(239, 68, 68, 0.3);
+  }
+
+  .download-btn.excel {
+    background: linear-gradient(135deg, #10b981, #059669);
+    color: white;
+  }
+
+  .download-btn.excel:hover {
+    background: linear-gradient(135deg, #059669, #047857);
+    transform: translateY(-2px);
+    box-shadow: 0 4px 12px rgba(16, 185, 129, 0.3);
+  }
+
+  .download-btn:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+    transform: none !important;
+  }
+
+  /* TABLE STRUCTURE & WRAPPER FOR RESPONSIVENESS */
+  .table-wrapper {
+    overflow-x: auto;
+    max-width: 100%;
+    border-radius: 12px;
+    border: 1px solid var(--border-light);
+    box-shadow: var(--shadow-sm);
+    background: white;
+  }
+
+  .orders-table {
+    width: 100%;
+    min-width: 1300px;
+    border-collapse: separate;
+    border-spacing: 0;
+    font-size: 14px;
+    color: var(--text-dark);
+  }
+
+  /* GRADIENT HEADER STYLES */
+  .orders-table thead {
+    background: var(--primary-gradient);
+    position: sticky;
+    top: 0;
+    z-index: 10;
+  }
+
+  .orders-table th {
+    padding: 16px 20px;
+    text-align: center;
+    font-size: 14px;
+    font-weight: 600;
+    color: white;
+    border-bottom: none;
+    white-space: nowrap;
+    position: relative;
+    transition: background 0.3s ease;
+  }
+
+  .orders-table th:hover {
+    background: rgba(255, 255, 255, 0.1);
+  }
+
+  .orders-table th:not(:last-child)::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 1px;
+    height: 16px;
+    background: rgba(255, 255, 255, 0.3);
+  }
+
+  .orders-table td {
+    padding: 14px 20px;
+    border-bottom: 1px solid var(--border-light);
+    white-space: nowrap;
+    text-align: center;
+    transition: background 0.2s ease;
+  }
+
+  .orders-table tbody tr:last-child td {
+    border-bottom: none;
+  }
+
+  .orders-table tbody tr:hover td {
+    background: var(--bg-hover);
+  }
+
+  /* ===== ENHANCED STATUS BADGES ===== */
+  .status-badge {
+    font-size: 11px !important;
+    font-weight: 600 !important;
+    padding: 8px 14px 8px 10px !important;
+    border-radius: 20px !important;
+    text-transform: uppercase;
+    letter-spacing: 0.3px;
+    display: inline-flex !important;
+    align-items: center;
+    justify-content: center;
+    color: #fff !important;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+    border: 2px solid transparent !important;
+    min-width: 40px;
+    box-sizing: border-box;
+    line-height: 1.2;
+    gap: 6px;
+    position: relative;
+    overflow: hidden;
+    white-space: nowrap;
+    margin: 0 auto;
+    transition: all 0.3s ease;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+  }
+
+  .status-badge:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 4px 8px rgba(0,0,0,0.15);
+  }
+
+  .status-badge::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: inherit;
+    opacity: 0.9;
+    z-index: -1;
+  }
+
+  /* Status icons */
+  .status-icon {
+    font-size: 11px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    z-index: 1;
+  }
+
+  /* Invoice Status Badges */
+  .status-paid {
+    background: var(--success-gradient) !important;
+    color: white !important;
+    border-color: #059669 !important;
+    width: 99px;
+  }
+
+  .status-pending {
+    background: var(--warning-gradient) !important;
+    color: #d97706 !important;
+    border-color: #f59e0b !important;
+    width: 99px;
+  }
+
+  .status-overdue {
+    background: var(--danger-gradient) !important;
+    color: #dc2626 !important;
+    border-color: #ef4444 !important;
+    width: 99px;
+  }
+
+  /* Shipment Status Badges */
+  .ship-pending {
+    background: var(--warning-gradient) !important;
+    color: #d97706 !important;
+    border-color: #f59e0b !important;
+    width: 99px;
+  }
+
+  .ship-in_transit {
+    background: var(--info-gradient) !important;
+    color: #1e40af !important;
+    border-color: #3b82f6 !important;
+    width: 99px;
+  }
+
+  .ship-dispatched {
+    background: var(--purple-gradient) !important;
+    color: #7e22ce !important;
+    border-color: #8b5cf6 !important;
+    width: 99px;
+  }
+
+  .ship-delivered {
+    background: var(--success-gradient) !important;
+    color: #065f46 !important;
+    border-color: #10b981 !important;
+    width: 99px;
+  }
+
+  /* ACTION BUTTON */
+  .action-btn {
+    color: var(--text-muted);
+    cursor: pointer;
+    transition: all 0.3s ease;
+    font-size: 18px;
+    background: #f8fafc;
+    padding: 8px;
+    border-radius: 8px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .action-btn:hover {
+    color: var(--primary-color);
+    transform: scale(1.1);
+    background: #e0f2fe;
+    box-shadow: 0 2px 8px rgba(59, 130, 246, 0.2);
+  }
+
+  /* EMPTY STATE */
+  .no-data {
+    padding: 60px 40px;
+    text-align: center;
+    font-size: 16px;
+    color: var(--text-muted);
+    background: var(--bg-light);
+    border-radius: 12px;
+    margin-top: 10px;
+    border: 1px solid var(--border-light);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 16px;
+  }
+
+  .no-data i {
+    font-size: 48px;
+    color: #d1d5db;
+  }
+
+  /* RESPONSIVE ADJUSTMENTS */
+  @media(max-width: 768px) {
     .orders-title {
-        font-size: 28px;
-        font-weight: 700;
-        margin-bottom: 24px;
-        color: var(--text-dark);
-        border-bottom: 1px solid var(--border-light);
-        padding-bottom: 16px;
+      font-size: 24px;
+    }
+    
+    .orders-container {
+      padding: 16px;
+    }
+    
+    .stats-container {
+      grid-template-columns: 1fr;
+    }
+    
+    .stat-card {
+      padding: 16px;
+    }
+    
+    .stat-value {
+      font-size: 24px;
     }
 
-    /* TABLE STRUCTURE & WRAPPER FOR RESPONSIVENESS */
-    .table-wrapper {
-        overflow-x: auto; /* Enables horizontal scrollbar */
-        max-width: 100%;
-        border-radius: 8px;
-        border: 1px solid var(--border-light);
+    .download-section {
+      justify-content: stretch;
     }
-
-    .orders-table {
-        width: 100%;
-        min-width: 1300px; /* Minimum width to prevent excessive squeezing of columns */
-        border-collapse: separate; /* Required for border-radius on cells in the future */
-        border-spacing: 0;
-        font-size: 14px;
-        color: var(--text-dark);
+    
+    .download-btn {
+      flex: 1;
+      justify-content: center;
     }
+  }
 
-    .orders-table thead {
-        background: var(--bg-light);
+  /* ---------- Enhanced Pagination Styles ---------- */
+  .pagination-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 20px;
+    padding: 16px 0;
+    border-top: 1px solid #eef3fb;
+  }
+
+  .pagination-info {
+    font-size: 14px;
+    color: #6b7280;
+    font-weight: 500;
+  }
+
+  .pagination-controls {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  .pagination-img-btn {
+    background: white;
+    border: 1px solid #e3eaf6;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 40px;
+    height: 40px;
+    padding: 0;
+    box-shadow: var(--shadow-sm);
+  }
+
+  .pagination-img-btn:hover:not(:disabled) {
+    background: var(--primary-color);
+    border-color: var(--primary-color);
+    transform: translateY(-2px);
+    box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3);
+  }
+
+  .pagination-img-btn:disabled {
+    background: #f8fafc;
+    border-color: #e2e8f0;
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
+
+  .pagination-page-btn {
+    background: white;
+    border: 1px solid #e3eaf6;
+    color: #1a2951;
+    padding: 8px 12px;
+    border-radius: 8px;
+    font-size: 14px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    min-width: 40px;
+    text-align: center;
+    box-shadow: var(--shadow-sm);
+  }
+
+  .pagination-page-btn:hover {
+    background: var(--primary-color);
+    color: white;
+    border-color: var(--primary-color);
+    transform: translateY(-2px);
+  }
+
+  .pagination-page-btn.active {
+    background: var(--primary-color);
+    color: white;
+    border-color: var(--primary-color);
+    box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3);
+  }
+
+  .pagination-pages {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+  }
+
+  .pagination-ellipsis {
+    color: #9ba5bb;
+    font-size: 14px;
+    padding: 0 8px;
+  }
+
+  /* Search and Filter Bar */
+  .filter-bar {
+    display: flex;
+    gap: 16px;
+    margin-bottom: 24px;
+    flex-wrap: wrap;
+    align-items: center;
+  }
+
+  .search-box {
+    flex: 1;
+    min-width: 300px;
+    position: relative;
+  }
+
+  .search-input {
+    width: 100%;
+    padding: 12px 16px 12px 44px;
+    border: 1px solid var(--border-light);
+    border-radius: 10px;
+    font-size: 14px;
+    transition: all 0.3s ease;
+    background: white;
+    box-shadow: var(--shadow-sm);
+  }
+
+  .search-input:focus {
+    outline: none;
+    border-color: var(--primary-color);
+    box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+  }
+
+  .search-icon {
+    position: absolute;
+    left: 16px;
+    top: 50%;
+    transform: translateY(-50%);
+    color: var(--text-muted);
+  }
+
+  .filter-select {
+    padding: 12px 16px;
+    border: 1px solid var(--border-light);
+    border-radius: 10px;
+    font-size: 14px;
+    background: white;
+    box-shadow: var(--shadow-sm);
+    cursor: pointer;
+    min-width: 160px;
+  }
+
+  @media (max-width: 768px) {
+    .filter-bar {
+      flex-direction: column;
+      align-items: stretch;
     }
-
-    .orders-table th {
-        padding: 16px 20px;
-        font-weight: 600;
-        color: var(--text-muted);
-        text-align: left;
-        white-space: nowrap;
-        border-bottom: 2px solid var(--border-light);
-        text-transform: uppercase;
-        letter-spacing: 0.05em;
+    
+    .search-box {
+      min-width: 100%;
     }
-
-    .orders-table td {
-        padding: 14px 20px;
-        border-bottom: 1px solid var(--border-light);
-        white-space: nowrap;
+    
+    .filter-select {
+      width: 100%;
     }
-
-    .orders-table tbody tr:last-child td {
-        border-bottom: none;
-    }
-
-    .orders-table tbody tr:hover {
-        background: var(--bg-hover);
-        transition: background 0.2s ease;
-    }
-
-    /* STATUS BADGES */
-    .status-badge {
-        padding: 6px 10px;
-        border-radius: 9999px; /* Pill shape */
-        font-size: 12px;
-        font-weight: 600;
-        display: inline-flex;
-        align-items: center;
-        text-transform: capitalize;
-        white-space: nowrap;
-    }
-
-    .shipstatus{
-      
-    }
-
-    /* INVOICE STATUS STYLES */
-    .status-paid { background: #d1fae5; color: #059669; } /* Green */
-    .status-pending { background: #fffbeb; color: #d97706; } /* Yellow */
-
-    /* SHIPMENT STATUS STYLES */
-    .status-delivered { background: #e0f2fe; color: #0284c7; } /* Sky Blue */
-    .status-in_transit { background: #fef3c7; color: #b45309; } /* Amber */
-
-    /* ACTION BUTTON */
-    .action-btn {
-        color: var(--text-muted);
-        cursor: pointer;
-        transition: color 0.2s ease, transform 0.2s ease;
-        font-size: 18px;
-    }
-
-    .action-btn:hover {
-        color: var(--primary-color);
-        transform: scale(1.15);
-    }
-
-    /* EMPTY STATE */
-    .no-data {
-        padding: 40px;
-        text-align: center;
-        font-size: 16px;
-        color: var(--text-muted);
-        background: var(--bg-light);
-        border-radius: 8px;
-        margin-top: 10px;
-        border: 1px solid var(--border-light);
-    }
-
-    /* RESPONSIVE ADJUSTMENTS */
-    @media(max-width: 768px) {
-        .orders-title {
-            font-size: 24px;
-        }
-        .orders-container {
-            padding: 16px;
-        }
+    
+    .pagination-container {
+      flex-direction: column;
+      gap: 16px;
     }
+  }
 </style>
 
-{{-- Make sure you include Font Awesome CDN in your main layout file, e.g., in <head>:
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
---}}
-
 <div class="orders-container">
-    <div class="orders-title">
-        <i class="fas fa-box-open mr-2"></i> Orders List
+  <div class="orders-title">
+    <i class="fas fa-box-open"></i> Orders Management
+  </div>
+
+  <!-- Stats Cards -->
+  <div class="stats-container">
+    <div class="stat-card total">
+      <div class="stat-value">{{ $orders->count() }}</div>
+      <div class="stat-label">Total Orders</div>
     </div>
+    <div class="stat-card paid">
+      <div class="stat-value">{{ $orders->where('invoice.status', 'paid')->count() }}</div>
+      <div class="stat-label">Paid Invoices</div>
+    </div>
+    <div class="stat-card pending">
+      <div class="stat-value">{{ $orders->where('invoice.status', 'pending')->count() }}</div>
+      <div class="stat-label">Pending Invoices</div>
+    </div>
+    <div class="stat-card overdue">
+      <div class="stat-value">{{ $orders->where('invoice.status', 'overdue')->count() }}</div>
+      <div class="stat-label">Overdue Invoices</div>
+    </div>
+  </div>
 
-    @if(isset($orders) && $orders->count() > 0)
-        <div class="table-wrapper">
-            <table class="orders-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>
-                        <th>Action</th>
-                    </tr>
-                </thead>
+  <!-- Download Buttons -->
+  <div class="download-section">
+    <button class="download-btn pdf" id="downloadPdf" {{ $orders->count() == 0 ? 'disabled' : '' }}>
+      <i class="fas fa-file-pdf"></i>
+      Download PDF
+    </button>
+    <button class="download-btn excel" id="downloadExcel" {{ $orders->count() == 0 ? 'disabled' : '' }}>
+      <i class="fas fa-file-excel"></i>
+      Download Excel
+    </button>
+  </div>
 
-                <tbody>
-                    @foreach($orders as $order)
+  <!-- Filter Bar -->
+  <div class="filter-bar">
+    <div class="search-box">
+      <i class="fas fa-search search-icon"></i>
+      <input type="text" class="search-input" placeholder="Search orders..." id="searchInput">
+    </div>
+    <select class="filter-select" id="statusFilter">
+      <option value="">All Status</option>
+      <option value="paid">Paid</option>
+      <option value="pending">Pending</option>
+      <option value="overdue">Overdue</option>
+    </select>
+    <select class="filter-select" id="shipmentFilter">
+      <option value="">All Shipments</option>
+      <option value="pending">Pending</option>
+      <option value="in_transit">In Transit</option>
+      <option value="dispatched">Dispatched</option>
+      <option value="delivered">Delivered</option>
+    </select>
+  </div>
 
-                        @php
-                            $mark = $order->markList ?? null;
-                            $invoice = $order->invoice ?? null;
-                            $shipment = $order->shipments->first() ?? null;
-                            $invoiceStatus = strtolower($invoice->status ?? '');
-                            $shipmentStatus = strtolower(str_replace('_', ' ', $shipment->status ?? ''));
-                        @endphp
+  @if(isset($orders) && $orders->count() > 0)
+    <div class="table-wrapper">
+      <table class="orders-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>
+            <th>Action</th>
+          </tr>
+        </thead>
 
-                        <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>
+        <tbody id="ordersTableBody">
+          @foreach($orders as $order)
+            @php
+              $mark = $order->markList ?? null;
+              $invoice = $order->invoice ?? null;
+              $shipment = $order->shipments->first() ?? null;
+              $invoiceStatus = strtolower($invoice->status ?? '');
+              $shipmentStatus = strtolower(str_replace('_', ' ', $shipment->status ?? ''));
+            @endphp
 
-                            <td>{{ $invoice->invoice_number ?? '-' }}</td>
+            <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_date ? date('d-m-Y', strtotime($invoice->invoice_date)) : '-' }}
-                            </td>
+              <td>{{ $invoice->invoice_number ?? '-' }}</td>
 
-                            <td>
-                                {{ $invoice?->final_amount ? '₹'.number_format($invoice->final_amount, 2) : '-' }}
-                            </td>
+              <td>
+                {{ $invoice?->invoice_date ? date('d-m-Y', strtotime($invoice->invoice_date)) : '-' }}
+              </td>
 
-                            <td>
-                                {{ $invoice?->final_amount_with_gst ? '₹'.number_format($invoice->final_amount_with_gst, 2) : '-' }}
-                            </td>
+              <td>
+                {{ $invoice?->final_amount ? '₹'.number_format($invoice->final_amount, 2) : '-' }}
+              </td>
 
-                            <td>
-                                @if($invoice?->status)
-                                    <span class="status-badge status-{{ $invoiceStatus }}">
-                                        {{ ucfirst($invoice->status) }}
-                                    </span>
-                                @else
-                                    <span class="status-badge status-pending">Pending</span>
-                                @endif
-                            </td>
+              <td>
+                {{ $invoice?->final_amount_with_gst ? '₹'.number_format($invoice->final_amount_with_gst, 2) : '-' }}
+              </td>
 
-                            <td>
-                                @if($shipment?->status)
-                                    <span class="status-badge status-{{ str_replace(' ', '_', $shipmentStatus) }}">
-                                        {{ ucfirst($shipmentStatus) }}
-                                    </span>
-                                @else
-                                    <span class="shipstatus">-</span>
-                                @endif
-                            </td>
+              <td>
+                @if($invoice?->status)
+                  <span class="status-badge status-{{ $invoiceStatus }}">
+                    {{ ucfirst($invoice->status) }}
+                  </span>
+                @else
+                  <span class="status-badge status-pending">Pending</span>
+                @endif
+              </td>
 
-                            <td class="text-center">
-                                <a href="{{ route('admin.orders.show', $order->id) }}" title="View Details">
-                                    <i class="fas fa-eye action-btn"></i>
-                                </a>
-                            </td>
-                        </tr>
+              <td>
+                @if($shipment?->status)
+                  <span class="status-badge ship-{{ str_replace(' ', '_', $shipmentStatus) }}">
+                    {{ ucfirst($shipmentStatus) }}
+                  </span>
+                @else
+                  <span class="status-badge ship-pending">Pending</span>
+                @endif
+              </td>
 
-                    @endforeach
-                </tbody>
-            </table>
-        </div> {{-- End table-wrapper --}}
-    @else
-        <p class="no-data">
-            <i class="fas fa-info-circle mr-2"></i> No orders found.
-        </p>
-    @endif
+              <td class="text-center">
+                <a href="{{ route('admin.orders.show', $order->id) }}" title="View Details">
+                  <i class="fas fa-eye action-btn"></i>
+                </a>
+              </td>
+            </tr>
+          @endforeach
+        </tbody>
+      </table>
+    </div> {{-- End table-wrapper --}}
+
+    <!-- Pagination Controls -->
+    <div class="pagination-container">
+      <div class="pagination-info" id="pageInfo">Showing 1 to {{ min(10, count($orders)) }} of {{ count($orders) }} entries</div>
+      <div class="pagination-controls">
+        <button class="pagination-img-btn" id="prevPageBtn" title="Previous page" disabled>
+          <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+          </svg>
+        </button>
+        <div class="pagination-pages" id="paginationPages">
+          <!-- Page numbers will be inserted here -->
+        </div>
+        <button class="pagination-img-btn" id="nextPageBtn" title="Next page" {{ count($orders) > 10 ? '' : 'disabled' }}>
+          <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+          </svg>
+        </button>
+      </div>
+    </div>
+  @else
+    <div class="no-data">
+      <i class="fas fa-inbox"></i>
+      <div>No orders found</div>
+      <p class="text-muted">There are currently no orders in the system.</p>
+    </div>
+  @endif
 </div>
 
+<script>
+  // Pagination state
+  let currentPage = 1;
+  const itemsPerPage = 10;
+  let allOrders = @json($orders);
+  let filteredOrders = [...allOrders];
+
+  // Status icon helper functions
+  function getInvoiceStatusIcon(status) {
+    switch(status) {
+      case 'paid':
+        return '<i class="fas fa-check-circle status-icon"></i>';
+      case 'pending':
+        return '<i class="fas fa-clock status-icon"></i>';
+      case 'overdue':
+        return '<i class="fas fa-exclamation-triangle status-icon"></i>';
+      default:
+        return '';
+    }
+  }
+
+  function getShipmentStatusIcon(status) {
+    switch(status) {
+      case 'pending':
+        return '<i class="fas fa-clock status-icon"></i>';
+      case 'in_transit':
+        return '<i class="fas fa-truck status-icon"></i>';
+      case 'dispatched':
+        return '<i class="fas fa-paper-plane status-icon"></i>';
+      case 'delivered':
+        return '<i class="fas fa-check-circle status-icon"></i>';
+      default:
+        return '';
+    }
+  }
+
+  // Initialize pagination and filters
+  document.addEventListener('DOMContentLoaded', function() {
+    renderTable();
+    updatePaginationControls();
+    
+    // Bind pagination events
+    document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
+    document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
+    
+    // Bind filter events
+    document.getElementById('searchInput').addEventListener('input', handleSearch);
+    document.getElementById('statusFilter').addEventListener('change', handleFilter);
+    document.getElementById('shipmentFilter').addEventListener('change', handleFilter);
+    
+    // Bind download events
+    document.getElementById('downloadPdf').addEventListener('click', downloadPdf);
+    document.getElementById('downloadExcel').addEventListener('click', downloadExcel);
+  });
+
+  // Download Functions
+  function downloadPdf() {
+    if (filteredOrders.length === 0) {
+      showNotification('No data available to download', 'warning');
+      return;
+    }
+
+    showNotification('Preparing PDF download...', 'info');
+    
+    // Get current filters for the download
+    const searchTerm = document.getElementById('searchInput').value;
+    const statusFilter = document.getElementById('statusFilter').value;
+    const shipmentFilter = document.getElementById('shipmentFilter').value;
+    
+    // Create download URL with filters
+    let downloadUrl = "{{ route('admin.orders.download.pdf') }}";
+    let params = new URLSearchParams();
+    
+    if (searchTerm) params.append('search', searchTerm);
+    if (statusFilter) params.append('status', statusFilter);
+    if (shipmentFilter) params.append('shipment', shipmentFilter);
+    
+    if (params.toString()) {
+      downloadUrl += '?' + params.toString();
+    }
+    
+    // Trigger download
+    window.location.href = downloadUrl;
+  }
+
+  function downloadExcel() {
+    if (filteredOrders.length === 0) {
+      showNotification('No data available to download', 'warning');
+      return;
+    }
+
+    showNotification('Preparing Excel download...', 'info');
+    
+    // Get current filters for the download
+    const searchTerm = document.getElementById('searchInput').value;
+    const statusFilter = document.getElementById('statusFilter').value;
+    const shipmentFilter = document.getElementById('shipmentFilter').value;
+    
+    // Create download URL with filters
+    let downloadUrl = "{{ route('admin.orders.download.excel') }}";
+    let params = new URLSearchParams();
+    
+    if (searchTerm) params.append('search', searchTerm);
+    if (statusFilter) params.append('status', statusFilter);
+    if (shipmentFilter) params.append('shipment', shipmentFilter);
+    
+    if (params.toString()) {
+      downloadUrl += '?' + params.toString();
+    }
+    
+    // Trigger download
+    window.location.href = downloadUrl;
+  }
+
+  // Notification function
+  function showNotification(message, type = 'info') {
+    // Remove existing notification
+    const existingNotification = document.querySelector('.download-notification');
+    if (existingNotification) {
+      existingNotification.remove();
+    }
+
+    const notification = document.createElement('div');
+    notification.className = `download-notification alert alert-${type}`;
+    notification.style.cssText = `
+      position: fixed;
+      top: 20px;
+      right: 20px;
+      z-index: 10000;
+      padding: 12px 20px;
+      border-radius: 8px;
+      color: white;
+      font-weight: 500;
+      box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+      animation: slideIn 0.3s ease;
+    `;
+    
+    if (type === 'info') {
+      notification.style.background = 'linear-gradient(135deg, #3b82f6, #1d4ed8)';
+    } else if (type === 'warning') {
+      notification.style.background = 'linear-gradient(135deg, #f59e0b, #d97706)';
+    } else if (type === 'success') {
+      notification.style.background = 'linear-gradient(135deg, #10b981, #059669)';
+    }
+    
+    notification.textContent = message;
+    document.body.appendChild(notification);
+    
+    setTimeout(() => {
+      notification.style.animation = 'slideOut 0.3s ease';
+      setTimeout(() => notification.remove(), 300);
+    }, 3000);
+  }
+
+  // Add CSS for notifications
+  const style = document.createElement('style');
+  style.textContent = `
+    @keyframes slideIn {
+      from { transform: translateX(100%); opacity: 0; }
+      to { transform: translateX(0); opacity: 1; }
+    }
+    @keyframes slideOut {
+      from { transform: translateX(0); opacity: 1; }
+      to { transform: translateX(100%); opacity: 0; }
+    }
+  `;
+  document.head.appendChild(style);
+
+  // Search functionality
+  function handleSearch(e) {
+    const searchTerm = e.target.value.toLowerCase();
+    filterOrders();
+  }
+
+  // Filter functionality
+  function handleFilter() {
+    filterOrders();
+  }
+
+  function filterOrders() {
+    const searchTerm = document.getElementById('searchInput').value.toLowerCase();
+    const statusFilter = document.getElementById('statusFilter').value;
+    const shipmentFilter = document.getElementById('shipmentFilter').value;
+    
+    filteredOrders = allOrders.filter(order => {
+      const matchesSearch = !searchTerm || 
+        (order.order_id && order.order_id.toLowerCase().includes(searchTerm)) ||
+        (order.markList?.company_name && order.markList.company_name.toLowerCase().includes(searchTerm)) ||
+        (order.invoice?.invoice_number && order.invoice.invoice_number.toLowerCase().includes(searchTerm));
+      
+      const matchesStatus = !statusFilter || 
+        (order.invoice?.status && order.invoice.status.toLowerCase() === statusFilter);
+      
+      const matchesShipment = !shipmentFilter || 
+        (order.shipments?.[0]?.status && order.shipments[0].status.toLowerCase() === shipmentFilter);
+      
+      return matchesSearch && matchesStatus && matchesShipment;
+    });
+    
+    currentPage = 1;
+    renderTable();
+    updatePaginationControls();
+    
+    // Update download buttons state
+    document.getElementById('downloadPdf').disabled = filteredOrders.length === 0;
+    document.getElementById('downloadExcel').disabled = filteredOrders.length === 0;
+  }
+
+  // Pagination Functions
+  function goToPreviousPage() {
+    if (currentPage > 1) {
+      currentPage--;
+      renderTable();
+      updatePaginationControls();
+    }
+  }
+
+  function goToNextPage() {
+    const totalPages = Math.ceil(filteredOrders.length / itemsPerPage);
+    if (currentPage < totalPages) {
+      currentPage++;
+      renderTable();
+      updatePaginationControls();
+    }
+  }
+
+  function updatePaginationControls() {
+    const totalPages = Math.ceil(filteredOrders.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, filteredOrders.length);
+    pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${filteredOrders.length} entries`;
+    
+    // Generate page numbers
+    paginationPages.innerHTML = '';
+    
+    if (totalPages <= 7) {
+      // Show all pages
+      for (let i = 1; i <= totalPages; i++) {
+        addPageButton(i, paginationPages);
+      }
+    } else {
+      // Show first page, current page range, and last page
+      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
+  function renderTable() {
+    const tbody = document.getElementById('ordersTableBody');
+    tbody.innerHTML = '';
+    
+    if (filteredOrders.length === 0) {
+      tbody.innerHTML = '<tr><td colspan="14" class="text-center py-4 text-muted">No orders found matching your criteria.</td></tr>';
+      return;
+    }
+    
+    // Calculate pagination
+    const startIndex = (currentPage - 1) * itemsPerPage;
+    const endIndex = startIndex + itemsPerPage;
+    const paginatedItems = filteredOrders.slice(startIndex, endIndex);
+    
+    paginatedItems.forEach(order => {
+      const mark = order.markList || null;
+      const invoice = order.invoice || null;
+      const shipment = order.shipments?.[0] || null;
+      const invoiceStatus = (invoice?.status || '').toLowerCase();
+      const shipmentStatus = (shipment?.status || '').toLowerCase().replace('_', ' ');
+      
+      const row = document.createElement('tr');
+      row.innerHTML = `
+        <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 ? new Date(order.created_at).toLocaleDateString('en-GB') : '-'}</td>
+        <td>${invoice?.invoice_number || '-'}</td>
+        <td>${invoice?.invoice_date ? new Date(invoice.invoice_date).toLocaleDateString('en-GB') : '-'}</td>
+        <td>${invoice?.final_amount ? '₹' + Number(invoice.final_amount).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2}) : '-'}</td>
+        <td>${invoice?.final_amount_with_gst ? '₹' + Number(invoice.final_amount_with_gst).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2}) : '-'}</td>
+        <td>
+          ${invoice?.status 
+            ? `<span class="status-badge status-${invoiceStatus}">${getInvoiceStatusIcon(invoiceStatus)}${invoice.status.charAt(0).toUpperCase() + invoice.status.slice(1)}</span>`
+            : '<span class="status-badge status-pending"><i class="fas fa-clock status-icon"></i>Pending</span>'
+          }
+        </td>
+        <td>
+          ${shipment?.status
+            ? `<span class="status-badge ship-${shipmentStatus.replace(' ', '_')}">${getShipmentStatusIcon(shipmentStatus.replace(' ', '_'))}${shipment.status.charAt(0).toUpperCase() + shipment.status.slice(1)}</span>`
+            : '<span class="status-badge ship-pending"><i class="fas fa-clock status-icon"></i>Pending</span>'
+          }
+        </td>
+        <td class="text-center">
+          <a href="/admin/orders/${order.id}" title="View Details">
+            <i class="fas fa-eye action-btn"></i>
+          </a>
+        </td>
+      `;
+      tbody.appendChild(row);
+    });
+  }
+</script>
+
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/orders_show.blade.php b/resources/views/admin/orders_show.blade.php
index e9c1d8e..2810649 100644
--- a/resources/views/admin/orders_show.blade.php
+++ b/resources/views/admin/orders_show.blade.php
@@ -5,28 +5,96 @@
 @section('content')
 <div class="container py-4">
 
-  {{-- Header --}}
+  {{-- HEADER --}}
   <div class="card shadow-sm rounded-3 border-0">
     <div class="card-body">
+
+      {{-- TOP BAR --}}
       <div class="d-flex justify-content-between align-items-start">
         <div>
-          <h4 class="fw-bold mb-0">Order Details</Details></h4>
+          <h4 class="fw-bold mb-0">Order Details</h4>
           <small class="text-muted">Detailed view of this shipment order</small>
         </div>
         <a href="{{ route('admin.dashboard') }}" class="btn-close"></a>
       </div>
 
+      {{-- ACTION BUTTONS --}}
+      <div class="mt-3 d-flex gap-2">
+
+        {{-- ADD ITEM --}}
+        <button class="btn btn-add-item" data-bs-toggle="modal" data-bs-target="#addItemModal">
+          <i class="fas fa-plus-circle me-2"></i>Add New Item
+        </button>
+
+        {{-- 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>
 
-      {{-- Customer Info --}}
+      {{-- EDIT ORDER FORM --}}
+      <div id="editOrderForm" class="p-3 bg-light rounded mb-4 shadow-sm" style="display:none;">
+        <h5 class="fw-bold mb-3">Edit Order</h5>
+
+        <form action="{{ route('admin.orders.update', $order->id) }}" method="POST">
+          @csrf
+
+          <div class="row">
+            <div class="col-md-4 mb-3">
+              <label>Mark No</label>
+              <input type="text" name="mark_no" value="{{ $order->mark_no }}" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-4 mb-3">
+              <label>Origin</label>
+              <input type="text" name="origin" value="{{ $order->origin }}" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-4 mb-3">
+              <label>Destination</label>
+              <input type="text" name="destination" value="{{ $order->destination }}" class="form-control custom-input">
+            </div>
+          </div>
+
+          <button class="btn btn-save-changes">Save Changes</button>
+          <button type="button"
+                  class="btn btn-cancel"
+                  onclick="document.getElementById('editOrderForm').style.display='none'">
+            Cancel
+          </button>
+        </form>
+      </div>
+
+      {{-- CUSTOMER INFO --}}
       <div class="row mb-4">
         <div class="col-md-8 d-flex">
           <div class="me-3">
-            <div class="rounded-circle bg-secondary text-white d-flex align-items-center justify-content-center" 
+            <div class="rounded-circle bg-secondary text-white d-flex align-items-center justify-content-center"
                  style="width:60px; height:60px; font-size:20px;">
               {{ strtoupper(substr($user->customer_name ?? 'U', 0, 1)) }}
             </div>
           </div>
+
           <div>
             <h5 class="mb-0">{{ $user->customer_name ?? 'Unknown Customer' }}</h5>
             <p class="mb-0">{{ $user->company_name ?? 'N/A' }}</p>
@@ -34,13 +102,14 @@
             <p class="mb-0 text-muted">{{ $user->mobile_no ?? '' }}</p>
           </div>
         </div>
+
         <div class="col-md-4 text-end">
           <p class="mb-0">{{ $user->address ?? '' }}</p>
           <small class="text-muted">{{ $user->pincode ?? '' }}</small>
         </div>
       </div>
 
-      {{-- Order Summary --}}
+      {{-- ORDER SUMMARY --}}
       <div class="bg-light rounded p-3 mb-3">
         <div class="row text-center">
           <div class="col-md-3 border-end">
@@ -65,7 +134,7 @@
         </div>
       </div>
 
-      {{-- Origin - Destination --}}
+      {{-- ORIGIN / DESTINATION --}}
       <div class="row text-center mb-4">
         <div class="col-md-6">
           <p class="mb-1 fw-semibold text-muted">Origin</p>
@@ -77,7 +146,7 @@
         </div>
       </div>
 
-      {{-- Order Items Table --}}
+      {{-- ITEMS TABLE --}}
       <div class="table-responsive">
         <table class="table table-bordered align-middle text-center">
           <thead class="table-light">
@@ -88,15 +157,17 @@
               <th>QTY</th>
               <th>TTL/QTY</th>
               <th>Unit</th>
-              <th>Price (₹)</th>
-              <th>TTL Amount (₹)</th>
+              <th>Price</th>
+              <th>Total Amount</th>
               <th>CBM</th>
               <th>TTL CBM</th>
               <th>KG</th>
               <th>TTL KG</th>
               <th>Shop No</th>
+              <th>Actions</th>
             </tr>
           </thead>
+
           <tbody>
             @foreach($order->items as $index => $item)
             <tr>
@@ -113,38 +184,531 @@
               <td>{{ $item->kg }}</td>
               <td>{{ $item->ttl_kg }}</td>
               <td>{{ $item->shop_no }}</td>
+
+              <td>
+                <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>
+              </td>
             </tr>
             @endforeach
           </tbody>
         </table>
       </div>
 
-      {{-- Totals --}}
+      {{-- TOTALS --}}
       <div class="row text-center mt-4">
         <div class="col-md-3">
           <h6 class="fw-bold text-primary">{{ $order->ctn }}</h6>
-          <small class="text-muted">Total CTN</small>
+          <small>Total CTN</small>
         </div>
 
         <div class="col-md-3">
           <h6 class="fw-bold text-primary">{{ $order->qty }}</h6>
-          <small class="text-muted">Total QTY</small>
+          <small>Total QTY</small>
         </div>
 
         <div class="col-md-3">
           <h6 class="fw-bold text-success">{{ $order->ttl_kg }}</h6>
-          <small class="text-muted">Total TTL KG</small>
+          <small>Total KG</small>
         </div>
 
         <div class="col-md-3">
           <h6 class="fw-bold text-danger">₹{{ number_format($order->ttl_amount, 2) }}</h6>
-          <small class="text-muted">Total Amount</small>
+          <small>Total Amount</small>
         </div>
       </div>
 
     </div>
   </div>
-
 </div>
-@endsection
 
+{{-- ADD ITEM MODAL --}}
+<div class="modal fade" id="addItemModal" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content custom-modal">
+
+      <div class="modal-header modal-gradient-header">
+        <h5 class="modal-title text-white"><i class="fas fa-cube me-2"></i>Add Item To Order</h5>
+        <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+      </div>
+
+      <form action="{{ route('admin.orders.addItem', $order->id) }}" method="POST">
+        @csrf
+
+        <div class="modal-body">
+
+          {{-- DELETED ITEMS --}}
+          @php
+              $deletedItems = \App\Models\OrderItem::onlyTrashed()
+                  ->where('order_id', $order->id)
+                  ->get();
+          @endphp
+
+          <h5 class="section-title">Deleted Items (Use / Restore)</h5>
+
+          <ul class="list-group mb-3">
+
+            @forelse($deletedItems as $deleted)
+              <li class="list-group-item">
+
+                <div class="d-flex justify-content-between">
+
+                    <div>
+                        <strong>{{ $deleted->description }}</strong><br>
+                        <small>
+                          CTN: {{ $deleted->ctn }},
+                          QTY: {{ $deleted->qty }},
+                          TTL/QTY: {{ $deleted->ttl_qty }},
+                          Unit: {{ $deleted->unit }},
+                          Price: ₹{{ $deleted->price }},
+                          TTL Amt: ₹{{ $deleted->ttl_amount }},
+                          CBM: {{ $deleted->cbm }},
+                          TTL CBM: {{ $deleted->ttl_cbm }},
+                          KG: {{ $deleted->kg }},
+                          TTL KG: {{ $deleted->ttl_kg }},
+                          Shop: {{ $deleted->shop_no }}
+                        </small>
+                    </div>
+
+                    <div class="d-flex gap-2">
+
+                        {{-- Auto-fill button --}}
+                        <button type="button" class="btn btn-sm btn-use-item"
+                          onclick="fillFormFromDeleted({{ json_encode($deleted) }})">
+                          Use This
+                        </button>
+
+                        {{-- Restore --}}
+                        <form action="{{ route('admin.orders.restoreItem', $deleted->id) }}" method="POST">
+                          @csrf
+                          <button class="btn btn-sm btn-restore">Restore</button>
+                        </form>
+
+                    </div>
+
+                </div>
+
+              </li>
+            @empty
+              <li class="list-group-item text-muted">No deleted items.</li>
+            @endforelse
+
+          </ul>
+
+          {{-- ADD FORM --}}
+          <div class="row g-3">
+
+            <div class="col-md-6">
+              <label class="form-label">Description</label>
+              <input type="text" name="description" class="form-control custom-input" required>
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">CTN</label>
+              <input type="number" name="ctn" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">QTY</label>
+              <input type="number" name="qty" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">TTL QTY</label>
+              <input type="number" name="ttl_qty" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">Unit</label>
+              <input type="text" name="unit" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">Price</label>
+              <input type="number" name="price" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">Total Amount</label>
+              <input type="number" name="ttl_amount" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">CBM</label>
+              <input type="number" name="cbm" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">TTL CBM</label>
+              <input type="number" name="ttl_cbm" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">KG</label>
+              <input type="number" name="kg" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">TTL KG</label>
+              <input type="number" name="ttl_kg" class="form-control custom-input">
+            </div>
+
+            <div class="col-md-3">
+              <label class="form-label">Shop No</label>
+              <input type="text" name="shop_no" class="form-control custom-input">
+            </div>
+
+          </div>
+
+        </div>
+
+        <div class="modal-footer">
+          <button class="btn btn-modal-close" data-bs-dismiss="modal">Close</button>
+          <button class="btn btn-modal-add">Add Item</button>
+        </div>
+
+      </form>
+
+    </div>
+  </div>
+</div>
+
+{{-- AUTO-FILL SCRIPT --}}
+<script>
+function fillFormFromDeleted(item) {
+    document.querySelector('input[name="description"]').value = item.description;
+    document.querySelector('input[name="ctn"]').value = item.ctn;
+    document.querySelector('input[name="qty"]').value = item.qty;
+    document.querySelector('input[name="ttl_qty"]').value = item.ttl_qty;
+    document.querySelector('input[name="unit"]').value = item.unit;
+    document.querySelector('input[name="price"]').value = item.price;
+    document.querySelector('input[name="ttl_amount"]').value = item.ttl_amount;
+    document.querySelector('input[name="cbm"]').value = item.cbm;
+    document.querySelector('input[name="ttl_cbm"]').value = item.ttl_cbm;
+    document.querySelector('input[name="kg"]').value = item.kg;
+    document.querySelector('input[name="ttl_kg"]').value = item.ttl_kg;
+    document.querySelector('input[name="shop_no"]').value = item.shop_no;
+}
+</script>
+
+<style>
+/* Custom Button Styles */
+.btn-add-item {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    border: none;
+    color: white;
+    padding: 12px 24px;
+    border-radius: 10px;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    box-shadow: 0 4px 15px 0 rgba(102, 126, 234, 0.3);
+    position: relative;
+    overflow: hidden;
+}
+
+.btn-add-item:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 8px 25px 0 rgba(102, 126, 234, 0.4);
+    color: white;
+}
+
+.btn-add-item::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.2), transparent);
+    transition: 0.5s;
+}
+
+.btn-add-item:hover::before {
+    left: 100%;
+}
+
+.btn-edit-order {
+    background: linear-gradient(135deg, #4776E6 0%, #8E54E9 100%);
+    border: none;
+    color: white;
+    padding: 12px 24px;
+    border-radius: 10px;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    box-shadow: 0 4px 15px 0 rgba(71, 118, 230, 0.3);
+}
+
+.btn-edit-order:hover:not(:disabled) {
+    transform: translateY(-2px);
+    box-shadow: 0 8px 25px 0 rgba(71, 118, 230, 0.4);
+    color: white;
+}
+
+.btn-edit-order:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+}
+
+.btn-delete-order {
+    background: linear-gradient(135deg, #ff416c 0%, #ff4b2b 100%);
+    border: none;
+    color: white;
+    padding: 12px 24px;
+    border-radius: 10px;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    box-shadow: 0 4px 15px 0 rgba(255, 65, 108, 0.3);
+}
+
+.btn-delete-order:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 8px 25px 0 rgba(255, 65, 108, 0.4);
+    color: white;
+}
+
+.btn-delete-item {
+    background: linear-gradient(135deg, #ff416c 0%, #ff4b2b 100%);
+    border: none;
+    color: white;
+    border-radius: 6px;
+    padding: 6px 12px;
+    transition: all 0.3s ease;
+    width: 40px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.btn-delete-item:hover {
+    transform: scale(1.05);
+    color: white;
+}
+
+/* Form Buttons */
+.btn-save-changes {
+    background: linear-gradient(135deg, #00b09b 0%, #96c93d 100%);
+    border: none;
+    color: white;
+    padding: 10px 20px;
+    border-radius: 8px;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    box-shadow: 0 4px 12px rgba(0, 176, 155, 0.2);
+}
+
+.btn-save-changes:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 6px 20px rgba(0, 176, 155, 0.4);
+    color: white;
+}
+
+.btn-cancel {
+    background: linear-gradient(135deg, #8e9eab 0%, #eef2f3 100%);
+    border: none;
+    color: #2c3e50;
+    padding: 10px 20px;
+    border-radius: 8px;
+    font-weight: 600;
+    transition: all 0.3s ease;
+}
+
+.btn-cancel:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(142, 158, 171, 0.3);
+}
+
+/* Modal Styles */
+.custom-modal {
+    border-radius: 15px;
+    border: none;
+    box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
+    overflow: hidden;
+}
+
+.modal-gradient-header {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    border-bottom: none;
+    padding: 20px 25px;
+}
+
+.section-title {
+    color: #2c3e50;
+    font-weight: 600;
+    margin-bottom: 15px;
+    padding-bottom: 10px;
+    border-bottom: 2px solid #667eea;
+}
+
+.custom-input {
+    border: 2px solid #e9ecef;
+    border-radius: 8px;
+    padding: 10px 15px;
+    transition: all 0.3s ease;
+    font-size: 14px;
+}
+
+.custom-input:focus {
+    border-color: #667eea;
+    box-shadow: 0 0 0 0.2rem rgba(102, 126, 234, 0.25);
+    transform: translateY(-1px);
+}
+
+.btn-use-item {
+    background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
+    border: none;
+    color: white;
+    border-radius: 6px;
+    padding: 5px 15px;
+    font-size: 0.875rem;
+    transition: all 0.3s ease;
+    font-weight: 500;
+}
+
+.btn-use-item:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(79, 172, 254, 0.4);
+    color: white;
+}
+
+.btn-restore {
+    background: linear-gradient(135deg, #00b09b 0%, #96c93d 100%);
+    border: none;
+    color: white;
+    border-radius: 6px;
+    padding: 5px 15px;
+    font-size: 0.875rem;
+    transition: all 0.3s ease;
+    font-weight: 500;
+}
+
+.btn-restore:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 176, 155, 0.4);
+    color: white;
+}
+
+.btn-modal-close {
+    background: linear-gradient(135deg, #8e9eab 0%, #eef2f3 100%);
+    border: none;
+    color: #2c3e50;
+    padding: 10px 25px;
+    border-radius: 8px;
+    font-weight: 600;
+    transition: all 0.3s ease;
+}
+
+.btn-modal-close:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(142, 158, 171, 0.3);
+}
+
+.btn-modal-add {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    border: none;
+    color: white;
+    padding: 10px 25px;
+    border-radius: 8px;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    box-shadow: 0 4px 15px 0 rgba(102, 126, 234, 0.3);
+}
+
+.btn-modal-add:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 8px 25px 0 rgba(102, 126, 234, 0.4);
+    color: white;
+}
+
+/* Animation for the Add Item Button */
+@keyframes pulse-glow {
+    0% {
+        box-shadow: 0 0 0 0 rgba(102, 126, 234, 0.7);
+    }
+    70% {
+        box-shadow: 0 0 0 10px rgba(102, 126, 234, 0);
+    }
+    100% {
+        box-shadow: 0 0 0 0 rgba(102, 126, 234, 0);
+    }
+}
+
+.btn-add-item {
+    animation: pulse-glow 2s infinite;
+}
+
+/* List group items */
+.list-group-item {
+    border: 1px solid #e9ecef;
+    margin-bottom: 8px;
+    border-radius: 8px !important;
+    transition: all 0.3s ease;
+    padding: 15px;
+}
+
+.list-group-item:hover {
+    border-color: #667eea;
+    transform: translateX(5px);
+    box-shadow: 0 4px 12px rgba(102, 126, 234, 0.1);
+}
+
+/* Enhanced table styling */
+.table {
+    border-radius: 10px;
+    overflow: hidden;
+}
+
+.table thead th {
+    background: #667eea ;
+    color: white;
+    border: none;
+    padding: 15px 10px;
+    font-weight: 600;
+}
+
+.table tbody tr {
+    transition: all 0.3s ease;
+}
+
+.table tbody tr:hover {
+    background-color: rgba(102, 126, 234, 0.05);
+    transform: translateY(-1px);
+}
+
+/* Badge styling */
+.badge {
+    font-size: 0.85em;
+    padding: 8px 12px;
+    border-radius: 8px;
+}
+
+/* Card enhancements */
+.card {
+    border: none;
+    box-shadow: 0 5px 25px rgba(0, 0, 0, 0.1);
+}
+
+/* Responsive adjustments */
+@media (max-width: 768px) {
+    .btn-add-item,
+    .btn-edit-order,
+    .btn-delete-order {
+        padding: 10px 15px;
+        font-size: 0.9rem;
+    }
+    
+    .modal-gradient-header {
+        padding: 15px 20px;
+    }
+}
+
+</style>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/pdf/order_pdf.blade.php b/resources/views/admin/pdf/order_pdf.blade.php
new file mode 100644
index 0000000..906dea3
--- /dev/null
+++ b/resources/views/admin/pdf/order_pdf.blade.php
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Orders Report</title>
+    <style>
+        body { font-family: DejaVu Sans, sans-serif; font-size: 12px; }
+        table { width: 100%; border-collapse: collapse; margin-top: 10px; }
+        th, td { border: 1px solid #ccc; padding: 6px 8px; text-align: left; }
+        th { background: #f3f4f6; }
+    </style>
+</head>
+<body>
+    <h3>Orders Report</h3>
+    <table>
+        <thead>
+            <tr>
+                <th>Order ID</th>
+                <th>Company</th>
+                <th>Invoice No</th>
+                <th>Invoice Status</th>
+                <th>Shipment Status</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach($orders as $order)
+                @php
+                    $mark = $order->markList ?? null;
+                    $invoice = $order->invoice ?? null;
+                    $shipment = $order->shipments->first() ?? null;
+                @endphp
+                <tr>
+                    <td>{{ $order->order_id ?? '-' }}</td>
+                    <td>{{ $mark->company_name ?? '-' }}</td>
+                    <td>{{ $invoice->invoice_number ?? '-' }}</td>
+                    <td>{{ $invoice->status ?? '-' }}</td>
+                    <td>{{ $shipment->status ?? '-' }}</td>
+                </tr>
+            @endforeach
+        </tbody>
+    </table>
+</body>
+</html>
diff --git a/resources/views/admin/reports.blade.php b/resources/views/admin/reports.blade.php
index 8049351..d0d088a 100644
--- a/resources/views/admin/reports.blade.php
+++ b/resources/views/admin/reports.blade.php
@@ -6,20 +6,28 @@
 <style>
     /* ===== GLOBAL RESPONSIVE STYLES ===== */
     html, body {
-    overflow-x: hidden !important;
-    max-width: 100%;
+        overflow-x: hidden !important;
+        max-width: 100%;
     }
-    
+
+    /* Use Inter globally (keeps your existing @import too) */
     @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
-    
+
+    /* Apply Inter globally but keep specificity low so your component styles still work */
+    :root { --admin-font: 'Inter', sans-serif; }
+    body, input, select, textarea, button, table, th, td, .report-container {
+        font-family: var(--admin-font);
+    }
+
     .report-container {
+        
         background: #ffffff;
         padding: 25px;
         border-radius: 16px;
         box-shadow: 0 8px 32px rgba(0, 0, 0, 0.08);
         margin: 20px auto;
         max-width: 100%;
-        font-family: 'Inter', sans-serif;
+        /* font-family now coming from :root */
         border: 1px solid #f0f0f0;
     }
 
@@ -69,18 +77,21 @@
     .stats-container {
         display: grid;
         grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
-        gap: 15px;
+        gap: 12px;
         margin: 20px 0;
     }
 
     .stat-card {
         background: linear-gradient(135deg, #f8f9ff 0%, #f0f4ff 100%);
-        padding: 18px 15px;
+        padding: 16px;
         border-radius: 12px;
         border-left: 4px solid #4f46e5;
         box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
         transition: transform 0.3s ease;
-        text-align: center;
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        min-height: 70px;
     }
 
     .stat-card:hover {
@@ -112,7 +123,16 @@
         background: linear-gradient(135deg, #faf5ff 0%, #f3e8ff 100%);
     }
 
-    
+    .stat-icon {
+        width: 45px;
+        height: 45px;
+        border-radius: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(79, 70, 229, 0.1);
+        flex-shrink: 0;
+    }
 
     .stat-icon i {
         font-size: 18px;
@@ -143,9 +163,9 @@
         color: #ef4444;
     }
 
-    /* .stat-card.info .stat-icon {
+    .stat-card.info .stat-icon {
         background: rgba(59, 130, 246, 0.1);
-    } */
+    }
 
     .stat-card.info .stat-icon i {
         color: #3b82f6;
@@ -159,16 +179,20 @@
         color: #8b5cf6;
     }
 
+    .stat-content {
+        flex: 1;
+    }
+
     .stat-value {
         font-size: 22px;
         font-weight: 700;
         color: #1a202c;
-        margin-bottom: 4px;
         line-height: 1.2;
+        margin-bottom: 2px;
     }
 
     .stat-label {
-        font-size: 13px;
+        font-size: 12px;
         color: #718096;
         font-weight: 500;
         line-height: 1.3;
@@ -216,10 +240,10 @@
         border-radius: 8px;
         border: 1.5px solid #e5e7eb;
         background: #ffffff;
-        font-size: 13px;
+        font-size: 14px; /* increased to match global font sizing */
         color: #1f2937;
         transition: all 0.3s ease;
-        font-family: 'Inter', sans-serif;
+        font-family: var(--admin-font);
     }
 
     .filter-control:focus {
@@ -242,12 +266,15 @@
     /* Ensure table takes full width and doesn't wrap */
     .report-table {
         width: 100%;
-        border-collapse: collapse;
+        /* keep your collapse behavior but update spacing to match Orders page */
+        border-collapse: separate;
+        border-spacing: 0;
         min-width: 1200px; /* Minimum width to prevent squeezing */
         table-layout: auto; /* Allow columns to adjust based on content */
+        font-size: 14px; /* unified table font size */
     }
 
-    /* Table header styling - CENTER ALIGNED */
+    /* Table header styling - CENTER ALIGNED (keep your gradient & sticky) */
     .report-table thead {
         background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
         position: sticky;
@@ -255,10 +282,11 @@
         z-index: 10;
     }
 
+    /* Adjusted header padding to match Orders spacing */
     .report-table th {
-        padding: 15px 12px;
+        padding: 16px 20px; /* changed from 15px 12px to match Orders' spacing */
         text-align: center; /* Center align header text */
-        font-size: 13px;
+        font-size: 14px;
         font-weight: 600;
         color: white;
         border-bottom: none;
@@ -280,8 +308,8 @@
 
     /* Table cell styling with proper text handling - CENTER ALIGNED */
     .report-table td {
-        padding: 12px;
-        font-size: 13px;
+        padding: 14px 20px; /* changed from 12px to match Orders' td padding */
+        font-size: 14px;    /* unified */
         color: #374151;
         border-bottom: 1px solid #f3f4f6;
         vertical-align: middle;
@@ -292,12 +320,13 @@
         min-width: 120px; /* Minimum column width */
         text-align: center; /* Center align all table data */
     }
-
     /* Specific column width adjustments */
     .report-table th:nth-child(1), /* Order ID */
     .report-table td:nth-child(1) {
-        min-width: 100px;
-        max-width: 150px;
+       min-width: 200px !important;
+    max-width: 200px !important;
+     padding-left: 20px !important;
+   
     }
 
     .report-table th:nth-child(2), /* Shipment ID */
@@ -411,8 +440,12 @@
         z-index: -1;
     }
 
-    .status-badge i {
-        font-size: 8px;
+    /* Status icons */
+    .status-icon {
+        font-size: 11px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
         position: relative;
         z-index: 1;
     }
@@ -469,19 +502,18 @@
     }
 
     .data-highlight {
-        font-weight: 600;
+        font-weight: 400;
         color: #1a202c;
         display: flex;
         align-items: center;
         justify-content: center; /* Center content */
         gap: 4px;
-        font-size: 13px;
+        font-size: 14px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
         margin: 0 auto; /* Center the highlight container */
     }
-
     .data-highlight i {
         color: #4f46e5;
         font-size: 11px;
@@ -541,11 +573,144 @@
         background: #a8a8a8;
     }
 
+    /* ---------- Pagination Styles (Same as Account Dashboard) ---------- */
+    .pagination-container {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 15px;
+        padding: 12px 0;
+        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;
+    }
+
+    /* Image-based pagination buttons */
+    .pagination-img-btn {
+        background: #fff;
+        border: 1px solid #e3eaf6;
+        border-radius: 6px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 40px;
+        height: 32px;
+        padding: 0;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) {
+        background: #1a2951;
+        border-color: #1a2951;
+    }
+
+    .pagination-img-btn:disabled {
+        background: #f8fafc;
+        border-color: #e2e8f0;
+        cursor: not-allowed;
+        opacity: 0.5;
+    }
+
+    .pagination-img-btn img {
+        width: 16px;
+        height: 16px;
+        filter: brightness(0) saturate(100%) invert(26%) sepia(89%) saturate(748%) hue-rotate(201deg) brightness(93%) contrast(89%);
+        transition: filter 0.3s ease;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) img {
+        filter: brightness(0) saturate(100%) invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(106%) contrast(101%);
+    }
+
+    .pagination-img-btn:disabled img {
+        filter: brightness(0) saturate(100%) invert(84%) sepia(8%) saturate(165%) hue-rotate(179deg) brightness(89%) contrast(86%);
+    }
+
     @media (max-width: 1024px) {
         .stats-container {
             grid-template-columns: repeat(3, 1fr);
         }
-        
+
         .report-table {
             min-width: 1100px;
         }
@@ -555,77 +720,97 @@
         .report-container {
             padding: 15px;
         }
-        
+
         .report-header {
             flex-direction: column;
             text-align: center;
             gap: 12px;
         }
-        
+
         .header-icon {
             width: 50px;
             height: 50px;
         }
-        
+
         .report-title {
             font-size: 20px;
         }
-        
+
         .stats-container {
             grid-template-columns: repeat(2, 1fr);
-            gap: 12px;
+            gap: 10px;
         }
-        
+
         .stat-card {
-            padding: 15px 12px;
+            padding: 14px;
+            gap: 10px;
         }
-        
+
+        .stat-icon {
+            width: 40px;
+            height: 40px;
+        }
+
+        .stat-icon i {
+            font-size: 16px;
+        }
+
         .stat-value {
             font-size: 20px;
         }
-        
+
         .filter-row {
             flex-direction: column;
             align-items: stretch;
             gap: 12px;
         }
-        
+
         .filter-group {
             min-width: 100%;
         }
-        
+
         .report-table {
             min-width: 1000px;
         }
-        
+
         /* Adjust column widths for mobile */
         .report-table th,
         .report-table td {
             min-width: 100px;
             padding: 10px 8px;
         }
+
+        .pagination-container {
+            flex-direction: column;
+            gap: 10px;
+            align-items: stretch;
+        }
+
+        .pagination-controls {
+            justify-content: center;
+        }
     }
 
     @media (max-width: 480px) {
         .stats-container {
             grid-template-columns: 1fr;
         }
-        
+
         .stat-card {
-            padding: 15px;
+            padding: 12px;
         }
-        
+
         .report-table {
             min-width: 900px;
         }
-        
+
         .report-table th,
         .report-table td {
             min-width: 90px;
             padding: 8px 6px;
             font-size: 12px;
         }
-        
+
         .status-badge {
             font-size: 10px !important;
             padding: 4px 8px 4px 6px !important;
@@ -651,43 +836,55 @@
             <div class="stat-icon">
                 <i class="fas fa-box-open"></i>
             </div>
-            <div class="stat-value" id="totalShipments">{{ count($reports) }}</div>
-            <div class="stat-label">Total Shipments</div>
+            <div class="stat-content">
+                <div class="stat-value" id="totalShipments">{{ count($reports) }}</div>
+                <div class="stat-label">Total Shipments</div>
+            </div>
         </div>
         <div class="stat-card warning">
             <div class="stat-icon">
                 <i class="fas fa-clock"></i>
             </div>
-            <div class="stat-value" id="pendingShipments">0</div>
-            <div class="stat-label">Pending Shipments</div>
+            <div class="stat-content">
+                <div class="stat-value" id="pendingShipments">0</div>
+                <div class="stat-label">Pending Shipments</div>
+            </div>
         </div>
         <div class="stat-card info">
             <div class="stat-icon">
                 <i class="fas fa-truck-moving"></i>
             </div>
-            <div class="stat-value" id="inTransitShipments">0</div>
-            <div class="stat-label">In Transit</div>
+            <div class="stat-content">
+                <div class="stat-value" id="inTransitShipments">0</div>
+                <div class="stat-label">In Transit</div>
+            </div>
         </div>
         <div class="stat-card secondary">
             <div class="stat-icon">
                 <i class="fas fa-shipping-fast"></i>
             </div>
-            <div class="stat-value" id="dispatchedShipments">0</div>
-            <div class="stat-label">Dispatched</div>
+            <div class="stat-content">
+                <div class="stat-value" id="dispatchedShipments">0</div>
+                <div class="stat-label">Dispatched</div>
+            </div>
         </div>
         <div class="stat-card success">
             <div class="stat-icon">
                 <i class="fas fa-check-circle"></i>
             </div>
-            <div class="stat-value" id="deliveredShipments">0</div>
-            <div class="stat-label">Delivered</div>
+            <div class="stat-content">
+                <div class="stat-value" id="deliveredShipments">0</div>
+                <div class="stat-label">Delivered</div>
+            </div>
         </div>
         <div class="stat-card danger">
             <div class="stat-icon">
                 <i class="fas fa-exclamation-triangle"></i>
             </div>
-            <div class="stat-value" id="overdueInvoices">0</div>
-            <div class="stat-label">Overdue Invoices</div>
+            <div class="stat-content">
+                <div class="stat-value" id="overdueInvoices">0</div>
+                <div class="stat-label">Overdue Invoices</div>
+            </div>
         </div>
     </div>
 
@@ -736,24 +933,23 @@
             </div>
         </div>
     </div>
-
     <!-- TABLE SECTION -->
     <div class="table-container">
         <table class="report-table">
             <thead>
                 <tr>
-                    <th><i class="fas fa-hashtag"></i> Order ID</th>
-                    <th><i class="fas fa-barcode"></i> Shipment ID</th>
-                    <th><i class="fas fa-building"></i> Company Name</th>
-                    <th><i class="fas fa-user"></i> User Name</th>
+                    <th>Order ID</th>
+                    <th>Shipment ID</th>
+                    <th>Company Name</th>
+                    <th>User Name</th>
                     <th><i class="fas fa-map-marker-alt"></i> Origin</th>
                     <th><i class="fas fa-location-arrow"></i> Destination</th>
-                    <th><i class="fas fa-calendar"></i> Date</th>
-                    <th><i class="fas fa-file-invoice"></i> Invoice ID</th>
-                    <th><i class="fas fa-calendar-day"></i> Invoice Date</th>
-                    <th><i class="fas fa-money-bill-wave"></i> Invoice Amount</th>
-                    <th><i class="fas fa-receipt"></i> Invoice Status</th>
-                    <th><i class="fas fa-shipping-fast"></i> Shipment Status</th>
+                    <th>Date</th>
+                    <th>Invoice ID</th>
+                    <th>Invoice Date</th>
+                    <th>Invoice Amount</th>
+                    <th>Invoice Status</th>
+                    <th>Shipment Status</th>
                 </tr>
             </thead>
             <tbody id="reportTableBody">
@@ -761,13 +957,11 @@
                     <tr data-status="{{ $r->shipment_status }}" data-invoice-status="{{ strtolower($r->invoice_status) }}" data-company="{{ $r->company_name ?? '' }}" data-date="{{ $r->shipment_date }}">
                         <td>
                             <span class="data-highlight" title="{{ $r->order_id }}">
-                                <i class="fas fa-hashtag"></i>
                                 {{ $r->order_id }}
                             </span>
                         </td>
                         <td>
                             <span class="data-highlight" title="{{ $r->shipment_id }}">
-                                <i class="fas fa-barcode"></i>
                                 {{ $r->shipment_id }}
                             </span>
                         </td>
@@ -776,9 +970,10 @@
                         <td>
                             <span class="data-highlight" title="{{ $r->origin }}">
                                 <i class="fas fa-map-marker-alt"></i>
-                                {{ $r->origin }}
+                                {{ $r->origin ?? '-' }}
                             </span>
                         </td>
+
                         <td>
                             <span class="data-highlight" title="{{ $r->destination }}">
                                 <i class="fas fa-location-arrow"></i>
@@ -788,31 +983,43 @@
                         <td>{{ \Carbon\Carbon::parse($r->shipment_date)->format('d/m/Y') }}</td>
                         <td>
                             <span class="data-highlight" title="{{ $r->invoice_number }}">
-                                <i class="fas fa-file-invoice"></i>
                                 {{ $r->invoice_number }}
                             </span>
                         </td>
                         <td>{{ \Carbon\Carbon::parse($r->invoice_date)->format('d/m/Y') }}</td>
                         <td>
                             <span class="data-highlight" title="₹{{ number_format($r->final_amount) }}">
-                                <i class="fas fa-rupee-sign"></i>
-                                {{ number_format($r->final_amount) }}
+                                ₹{{ number_format($r->final_amount) }}
                             </span>
                         </td>
                         <td>
-                            @php $ist = strtolower($r->invoice_status); @endphp
+                            @php $ist = strtolower($r->invoice_status ?? ''); @endphp
                             <span class="status-badge 
                                 @if($ist === 'paid') status-paid
                                 @elseif($ist === 'pending') status-pending
                                 @elseif($ist === 'overdue') status-overdue
                                 @endif">
-                                <i class="fas fa-circle"></i>
+                                @if($ist === 'paid')
+                                    <i class="bi bi-check-circle-fill status-icon"></i>
+                                @elseif($ist === 'pending')
+                                    <i class="bi bi-clock-fill status-icon"></i>
+                                @elseif($ist === 'overdue')
+                                    <i class="bi bi-exclamation-triangle-fill status-icon"></i>
+                                @endif
                                 {{ ucfirst($ist) }}
                             </span>
                         </td>
                         <td>
                             <span class="status-badge ship-{{ $r->shipment_status }}">
-                                <i class="fas fa-circle"></i>
+                                @if($r->shipment_status === 'pending')
+                                    <i class="bi bi-clock-fill status-icon"></i>
+                                @elseif($r->shipment_status === 'in_transit')
+                                    <i class="bi bi-truck status-icon"></i>
+                                @elseif($r->shipment_status === 'dispatched')
+                                    <i class="bi bi-send-fill status-icon"></i>
+                                @elseif($r->shipment_status === 'delivered')
+                                    <i class="bi bi-check-circle-fill status-icon"></i>
+                                @endif
                                 {{ ucfirst(str_replace('_',' ', $r->shipment_status)) }}
                             </span>
                         </td>
@@ -833,29 +1040,98 @@
             </tbody>
         </table>
     </div>
-</div>
 
+    <!-- Pagination Controls -->
+    <div class="pagination-container">
+        <div class="pagination-info" id="pageInfo">Showing 1 to {{ min(10, count($reports)) }} of {{ count($reports) }} entries</div>
+        <div class="pagination-controls">
+            <button class="pagination-img-btn" id="prevPageBtn" title="Previous page" disabled>
+                <!-- Left arrow SVG -->
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                </svg>
+            </button>
+            <div class="pagination-pages" id="paginationPages">
+                <!-- Page numbers will be inserted here -->
+            </div>
+            <button class="pagination-img-btn" id="nextPageBtn" title="Next page" {{ count($reports) > 10 ? '' : 'disabled' }}>
+                <!-- Right arrow SVG -->
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                </svg>
+            </button>
+        </div>
+    </div>
+</div>
 <script>
+    // Pagination state
+    let currentPage = 1;
+    const itemsPerPage = 10;
+    let allReports = @json($reports);
+    let filteredReports = [...allReports];
+
+    // Status icon helper functions
+    function getInvoiceStatusIcon(status) {
+        switch(status) {
+            case 'paid':
+                return '<i class="bi bi-check-circle-fill status-icon"></i>';
+            case 'pending':
+                return '<i class="bi bi-clock-fill status-icon"></i>';
+            case 'overdue':
+                return '<i class="bi bi-exclamation-triangle-fill status-icon"></i>';
+            default:
+                return '';
+        }
+    }
+
+    function getShipmentStatusIcon(status) {
+        switch(status) {
+            case 'pending':
+                return '<i class="bi bi-clock-fill status-icon"></i>';
+            case 'in_transit':
+                return '<i class="bi bi-truck status-icon"></i>';
+            case 'dispatched':
+                return '<i class="bi bi-send-fill status-icon"></i>';
+            case 'delivered':
+                return '<i class="bi bi-check-circle-fill status-icon"></i>';
+            default:
+                return '';
+        }
+    }
+
     document.addEventListener('DOMContentLoaded', function() {
-        // Initialize statistics
+        // Initialize statistics and pagination
         updateStatistics();
-        
+        renderTable();
+        updatePaginationControls();
+
         // Set default dates for demo purposes
         const today = new Date();
         const lastMonth = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
-        
+
         const formatDate = (date) => {
             return date.toISOString().split('T')[0];
         };
-        
-        document.getElementById('fromDate').value = formatDate(lastMonth);
-        document.getElementById('toDate').value = formatDate(today);
+
+        if (document.getElementById('fromDate')) document.getElementById('fromDate').value = formatDate(lastMonth);
+        if (document.getElementById('toDate')) document.getElementById('toDate').value = formatDate(today);
 
         // Add event listeners for filters
-        document.getElementById('fromDate').addEventListener('change', filterTable);
-        document.getElementById('toDate').addEventListener('change', filterTable);
-        document.getElementById('companyFilter').addEventListener('change', filterTable);
-        document.getElementById('statusFilter').addEventListener('change', filterTable);
+        const fd = document.getElementById('fromDate');
+        const td = document.getElementById('toDate');
+        const cf = document.getElementById('companyFilter');
+        const sf = document.getElementById('statusFilter');
+
+        if(fd) fd.addEventListener('change', filterTable);
+        if(td) td.addEventListener('change', filterTable);
+        if(cf) cf.addEventListener('change', filterTable);
+        if(sf) sf.addEventListener('change', filterTable);
+
+        // Bind pagination events
+        const prevBtn = document.getElementById('prevPageBtn');
+        const nextBtn = document.getElementById('nextPageBtn');
+        if(prevBtn) prevBtn.addEventListener('click', goToPreviousPage);
+        if(nextBtn) nextBtn.addEventListener('click', goToNextPage);
 
         function updateStatistics() {
             const rows = document.querySelectorAll('#reportTableBody tr');
@@ -869,7 +1145,7 @@
             rows.forEach(row => {
                 // Skip if row is hidden or empty state
                 if (row.style.display === 'none' || row.querySelector('.empty-state')) return;
-                
+
                 totalShipments++;
 
                 // Count shipment statuses
@@ -878,87 +1154,247 @@
                 if (status === 'in_transit') inTransitShipments++;
                 if (status === 'dispatched') dispatchedShipments++;
                 if (status === 'delivered') deliveredShipments++;
-                
+
                 // Count invoice statuses
                 const invoiceStatus = row.getAttribute('data-invoice-status');
                 if (invoiceStatus === 'overdue') overdueInvoices++;
             });
 
             // Update statistics cards
-            document.getElementById('totalShipments').textContent = totalShipments;
-            document.getElementById('pendingShipments').textContent = pendingShipments;
-            document.getElementById('inTransitShipments').textContent = inTransitShipments;
-            document.getElementById('dispatchedShipments').textContent = dispatchedShipments;
-            document.getElementById('deliveredShipments').textContent = deliveredShipments;
-            document.getElementById('overdueInvoices').textContent = overdueInvoices;
+            const elTotal = document.getElementById('totalShipments');
+            if(elTotal) elTotal.textContent = totalShipments;
+            const elPending = document.getElementById('pendingShipments');
+            if(elPending) elPending.textContent = pendingShipments;
+            const elInTransit = document.getElementById('inTransitShipments');
+            if(elInTransit) elInTransit.textContent = inTransitShipments;
+            const elDispatched = document.getElementById('dispatchedShipments');
+            if(elDispatched) elDispatched.textContent = dispatchedShipments;
+            const elDelivered = document.getElementById('deliveredShipments');
+            if(elDelivered) elDelivered.textContent = deliveredShipments;
+            const elOverdue = document.getElementById('overdueInvoices');
+            if(elOverdue) elOverdue.textContent = overdueInvoices;
+        }
+
+        // Pagination Functions
+        function goToPreviousPage() {
+            if (currentPage > 1) {
+                currentPage--;
+                renderTable();
+                updatePaginationControls();
+            }
+        }
+
+        function goToNextPage() {
+            const totalPages = Math.ceil(filteredReports.length / itemsPerPage);
+            if (currentPage < totalPages) {
+                currentPage++;
+                renderTable();
+                updatePaginationControls();
+            }
+        }
+
+        function updatePaginationControls() {
+            const totalPages = Math.ceil(filteredReports.length / itemsPerPage);
+            const prevBtn = document.getElementById('prevPageBtn');
+            const nextBtn = document.getElementById('nextPageBtn');
+            const pageInfo = document.getElementById('pageInfo');
+            const paginationPages = document.getElementById('paginationPages');
+
+            if(prevBtn) prevBtn.disabled = currentPage === 1;
+            if(nextBtn) nextBtn.disabled = currentPage === totalPages || totalPages === 0;
+
+            // Update page info text
+            const startIndex = (currentPage - 1) * itemsPerPage + 1;
+            const endIndex = Math.min(currentPage * itemsPerPage, filteredReports.length);
+            if(pageInfo) pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${filteredReports.length} entries`;
+
+            // Generate page numbers
+            if(paginationPages) paginationPages.innerHTML = '';
+
+            if (totalPages <= 7) {
+                // Show all pages
+                for (let i = 1; i <= totalPages; i++) {
+                    addPageButton(i, paginationPages);
+                }
+            } else {
+                // Show first page, current page range, and last page
+                addPageButton(1, paginationPages);
+
+                if (currentPage > 3) {
+                    if(paginationPages) 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) {
+                    if(paginationPages) paginationPages.innerHTML += '<span class="pagination-ellipsis">...</span>';
+                }
+
+                addPageButton(totalPages, paginationPages);
+            }
+        }
+
+        function addPageButton(pageNumber, container) {
+            if(!container) return;
+            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
+        function renderTable() {
+            const tbody = document.getElementById('reportTableBody');
+            if(!tbody) return;
+            tbody.innerHTML = '';
+
+            if (filteredReports.length === 0) {
+                tbody.innerHTML = `
+                    <tr>
+                        <td colspan="12">
+                            <div class="empty-state">
+                                <div class="empty-icon">
+                                    <i class="fas fa-inbox"></i>
+                                </div>
+                                <h3>No Shipping Reports Found</h3>
+                                <p>There are no shipping reports matching your current filters</p>
+                            </div>
+                        </td>
+                    </tr>
+                `;
+                return;
+            }
+
+            // Calculate pagination
+            const startIndex = (currentPage - 1) * itemsPerPage;
+            const endIndex = startIndex + itemsPerPage;
+            const paginatedItems = filteredReports.slice(startIndex, endIndex);
+
+            paginatedItems.forEach(report => {
+                const ist = (report.invoice_status || '').toLowerCase();
+                const row = document.createElement('tr');
+                row.setAttribute('data-status', report.shipment_status);
+                row.setAttribute('data-invoice-status', ist);
+                row.setAttribute('data-company', report.company_name || '');
+                row.setAttribute('data-date', report.shipment_date);
+
+                row.innerHTML = `
+                    <td>
+                        <span class="data-highlight" title="${report.order_id}">
+                            ${report.order_id || '-'}
+                        </span>
+                    </td>
+                    <td>
+                        <span class="data-highlight" title="${report.shipment_id}">
+                            ${report.shipment_id || '-'}
+                        </span>
+                    </td>
+                    <td title="${report.company_name || '-'}">${report.company_name || '-'}</td>
+                    <td title="${report.customer_name || '-'}">${report.customer_name || '-'}</td>
+                    <td>
+                        <span class="data-highlight" title="${report.origin || '-'}">
+                            <i class="fas fa-map-marker-alt"></i>
+                            ${report.origin || '-'}
+                        </span>
+                    </td>
+                    <td>
+                        <span class="data-highlight" title="${report.destination || '-'}">
+                            <i class="fas fa-location-arrow"></i>
+                            ${report.destination || '-'}
+                        </span>
+                    </td>
+                    <td>${report.shipment_date ? new Date(report.shipment_date).toLocaleDateString('en-GB') : '-'}</td>
+                    <td>
+                        <span class="data-highlight" title="${report.invoice_number || '-'}">
+                            ${report.invoice_number || '-'}
+                        </span>
+                    </td>
+                    <td>${report.invoice_date ? new Date(report.invoice_date).toLocaleDateString('en-GB') : '-'}</td>
+                    <td>
+                        <span class="data-highlight" title="₹${Number(report.final_amount || 0).toLocaleString('en-IN')}">
+                            ₹${Number(report.final_amount || 0).toLocaleString('en-IN')}
+                        </span>
+                    </td>
+                    <td>
+                        <span class="status-badge 
+                            ${ist === 'paid' ? 'status-paid' : ''}
+                            ${ist === 'pending' ? 'status-pending' : ''}
+                            ${ist === 'overdue' ? 'status-overdue' : ''}">
+                            ${getInvoiceStatusIcon(ist)}
+                            ${ist ? ist.charAt(0).toUpperCase() + ist.slice(1) : '-'}
+                        </span>
+                    </td>
+                    <td>
+                        <span class="status-badge ship-${report.shipment_status || ''}">
+                            ${getShipmentStatusIcon(report.shipment_status)}
+                            ${report.shipment_status ? (report.shipment_status.charAt(0).toUpperCase() + report.shipment_status.slice(1)).replace('_',' ') : '-'}
+                        </span>
+                    </td>
+                `;
+                tbody.appendChild(row);
+            });
         }
 
         function filterTable() {
-            const fromDate = document.getElementById('fromDate').value;
-            const toDate = document.getElementById('toDate').value;
-            const companyFilter = document.getElementById('companyFilter').value;
-            const statusFilter = document.getElementById('statusFilter').value;
+            const fromDate = document.getElementById('fromDate')?.value;
+            const toDate = document.getElementById('toDate')?.value;
+            const companyFilter = document.getElementById('companyFilter')?.value;
+            const statusFilter = document.getElementById('statusFilter')?.value;
 
-            const rows = document.querySelectorAll('#reportTableBody tr');
-            let visibleCount = 0;
-
-            rows.forEach(row => {
-                // Skip empty state row
-                if (row.querySelector('.empty-state')) return;
-                
-                let showRow = true;
+            filteredReports = allReports.filter(report => {
+                let include = true;
 
                 // Date filter
                 if (fromDate && toDate) {
-                    const rowDate = row.getAttribute('data-date');
-                    if (rowDate) {
-                        const shipmentDate = new Date(rowDate);
-                        const from = new Date(fromDate);
-                        const to = new Date(toDate);
-                        to.setHours(23, 59, 59, 999); // End of day
+                    const reportDate = new Date(report.shipment_date);
+                    const from = new Date(fromDate);
+                    const to = new Date(toDate);
+                    to.setHours(23, 59, 59, 999);
 
-                        if (shipmentDate < from || shipmentDate > to) {
-                            showRow = false;
-                        }
+                    if (reportDate < from || reportDate > to) {
+                        include = false;
                     }
                 }
 
                 // Company filter
-                if (companyFilter) {
-                    const companyName = row.getAttribute('data-company');
-                    if (companyName !== companyFilter) {
-                        showRow = false;
-                    }
+                if (companyFilter && report.company_name !== companyFilter) {
+                    include = false;
                 }
 
                 // Status filter
-                if (statusFilter && row.getAttribute('data-status') !== statusFilter) {
-                    showRow = false;
+                if (statusFilter && report.shipment_status !== statusFilter) {
+                    include = false;
                 }
 
-                // Show/hide row
-                row.style.display = showRow ? '' : 'none';
-                if (showRow) visibleCount++;
+                return include;
             });
 
-            // Show empty state if no rows visible
-            const emptyState = document.querySelector('.empty-state');
-            if (emptyState) {
-                const emptyRow = emptyState.closest('tr');
-                emptyRow.style.display = visibleCount === 0 ? '' : 'none';
-            }
-
-            // Update statistics with filtered data
+            currentPage = 1;
+            renderTable();
+            updatePaginationControls();
             updateStatistics();
         }
 
-        // Add hover effects to table rows
+        // Add hover effects to table rows (for rows present initially in DOM — dynamic rows handled in renderTable)
         const tableRows = document.querySelectorAll('.report-table tbody tr');
         tableRows.forEach(row => {
             row.addEventListener('mouseenter', function() {
                 this.style.transform = 'translateY(-2px)';
             });
-            
+
             row.addEventListener('mouseleave', function() {
                 this.style.transform = 'translateY(0)';
             });
diff --git a/resources/views/admin/requests.blade.php b/resources/views/admin/requests.blade.php
index fad909f..cab3f38 100644
--- a/resources/views/admin/requests.blade.php
+++ b/resources/views/admin/requests.blade.php
@@ -5,289 +5,365 @@
 @section('content')
 <div class="container-fluid px-0">
 
+    @php
+        $perPage = 5; // ✅ FORCED to show pagination even with few records
+        $currentPage = request()->get('page', 1);
+        $currentPage = max(1, (int)$currentPage);
+        $total = $requests->count();
+        $totalPages = ceil($total / $perPage);
+        $currentItems = $requests->slice(($currentPage - 1) * $perPage, $perPage);
+    @endphp
+
     <style>
-      /* 🌟 Smooth fade-in animation */
-      @keyframes fadeInUp {
-          0% {
-              transform: translateY(20px);
-              opacity: 0;
-          }
-          100% {
-              transform: translateY(0);
-              opacity: 1;
-          }
-      }
+        /* [ALL YOUR ORIGINAL CSS HERE - SAME AS BEFORE] */
+        @keyframes fadeInUp {0% { transform: translateY(20px); opacity: 0; }100% { transform: translateY(0); opacity: 1; }}
+        .card, .custom-table-wrapper { animation: fadeInUp 0.8s ease both; }
+        .custom-table tbody tr { transition: all 0.25s ease-in-out; }
+        .custom-table tbody tr:hover { background-color: #fffbea; transform: scale(1.01); box-shadow: 0 2px 6px rgba(0,0,0,0.05); }
+        .priority-badge {
+            display: inline-flex; align-items: center; font-size: 13.5px; padding: 6px 16px; border-radius: 12px; font-weight: 600;
+            box-shadow: 0 1px 2px 0 rgba(130,130,130,0.15); width: 90px; min-height: 28px; justify-content: center;
+            color: #fff; margin: 2px 0; transition: transform 0.2s ease-in-out;
+        }
+        .priority-badge:hover { transform: scale(1.08); }
+        .priority-high { background: linear-gradient(135deg, #ff8a8a, #d12929); }
+        .priority-medium { background: linear-gradient(135deg, #ffe390, #f5b041); }
+        .priority-low { background: linear-gradient(135deg, #b8f0c2, #1d8660); }
+        .custom-table thead th {
+            text-align: center; font-weight: 700; color: #000; padding: 14px; font-size: 17px; letter-spacing: 0.5px;
+            border-bottom: 2px solid #bfbfbf; background-color: #fde4b3;
+        }
+        .custom-table thead tr:first-child th:first-child { border-top-left-radius: 12px; }
+        .custom-table thead tr:first-child th:last-child { border-top-right-radius: 12px; }
+        .custom-table tbody tr:last-child td:first-child { border-bottom-left-radius: 12px; }
+        .custom-table tbody tr:last-child td:last-child { border-bottom-right-radius: 12px; }
+        .input-group input { border-radius: 10px 0 0 10px; border: 1px solid #ccc; box-shadow: inset 0 1px 3px rgba(0,0,0,0.05); }
+        .input-group .btn { border-radius: 0 10px 10px 0; transition: all 0.2s ease-in-out; }
+        .input-group .btn:hover { background: #ffd65a; border-color: #ffd65a; color: #000; }
+        .card { border-radius: 16px; border: none; box-shadow: 0 4px 10px rgba(0,0,0,0.08); background: #fff; }
+        .badge {
+            font-size: 11px !important; font-weight: 600 !important; padding: 7px 13px !important; border-radius: 20px !important;
+            text-transform: uppercase; letter-spacing: 0.3px; display: inline-flex !important; align-items: center; justify-content: center;
+            color: #fff !important; text-shadow: 0 1px 2px rgba(0,0,0,0.3); border: 2px solid transparent !important;
+            line-height: 1.2; gap: 6px; animation: pulse 2s infinite; width: 99px;
+        }
+        .status-icon { font-size: 0px; display: flex; align-items: center; justify-content: center; }
+        .badge.badge-pending { background: linear-gradient(135deg, #fef3c7, #fde68a) !important; color: #d97706 !important; border-color: #f59e0b !important; width: 85px; }
+        .badge.badge-approved { background: linear-gradient(135deg, #d1fae5, #a7f3d0) !important; color: #065f46 !important; border-color: #10b981 !important; width: 85px; }
+        .badge.badge-rejected { background: linear-gradient(135deg, #fecaca, #fca5a5) !important; color: #991b1b !important; border-color: #ef4444 !important; width: 85px; }
+        @keyframes pulse {0% { box-shadow: 0 0 8px rgba(0,0,0,0.1); }50% { box-shadow: 0 0 14px rgba(0,0,0,0.15); }100% { box-shadow: 0 0 8px rgba(0,0,0,0.1); }}
+        .count-badge { --bs-badge-padding-x: 0.65em; --bs-badge-padding-y: 0.35em; --bs-badge-font-size: 0.75em; --bs-badge-font-weight: 700; --bs-badge-color: #fff; --bs-badge-border-radius: var(--bs-border-radius); }
+        h4.fw-bold { background: linear-gradient(90deg, #000000ff 0%, #030302ff 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; font-weight: 800; letter-spacing: 1px; }
+        .custom-table tbody td:last-child { text-align: center !important; vertical-align: middle !important; }
+        
+        /* ===== PAGINATION STYLES ===== */
+        .pagination-container {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-top: 15px;
+            padding: 12px 0;
+            border-top: 1px solid #eef3fb;
+        }
 
-      /* ✨ Container animation */
-      .card, .custom-table-wrapper {
-          animation: fadeInUp 0.8s ease both;
-      }
+        .pagination-info {
+            font-size: 13px;
+            color: #9ba5bb;
+            font-weight: 600;
+        }
 
-      /* 🪄 Table hover effect */
-      .custom-table tbody tr {
-          transition: all 0.25s ease-in-out;
-      }
-      .custom-table tbody tr:hover {
-          background-color: #fffbea;
-          transform: scale(1.01);
-          box-shadow: 0 2px 6px rgba(0,0,0,0.05);
-      }
+        .pagination-controls {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
 
-      /* 🎯 Priority Badges */
-      .priority-badge {
-          display: inline-flex;
-          align-items: center;
-          font-size: 13.5px;
-          padding: 6px 16px;
-          border-radius: 12px;
-          font-weight: 600;
-          box-shadow: 0 1px 2px 0 rgba(130,130,130,0.15);
-          width: 90px;
-          min-height: 28px;
-          justify-content: center;
-          color: #fff;
-          margin: 2px 0;
-          transition: transform 0.2s ease-in-out;
-      }
-      .priority-badge:hover {
-          transform: scale(1.08);
-      }
-      .priority-high { background: linear-gradient(135deg, #ff8a8a, #d12929); }
-      .priority-medium { background: linear-gradient(135deg, #ffe390, #f5b041); }
-      .priority-low { background: linear-gradient(135deg, #b8f0c2, #1d8660); }
+        .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;
+        }
 
-      /* 🎨 Table Header (keep original bg-light color) */
-      .custom-table thead th {
-          text-align: center;
-          font-weight: 700;
-          color: #000;
-          padding: 14px;
-          font-size: 17px;
-          letter-spacing: 0.5px;
-          border-bottom: 2px solid #bfbfbf;
-          background-color: #fde4b3; /* Bootstrap bg-light */
-      }
+        .pagination-btn:hover:not(:disabled) {
+            background: #1a2951;
+            color: white;
+            border-color: #1a2951;
+        }
 
-      /* 🟢 Rounded Corners for Header */
-      .custom-table thead tr:first-child th:first-child {
-          border-top-left-radius: 12px;
-      }
-      .custom-table thead tr:first-child th:last-child {
-          border-top-right-radius: 12px;
-      }
+        .pagination-btn:disabled {
+            background: #f8fafc;
+            color: #cbd5e0;
+            border-color: #e2e8f0;
+            cursor: not-allowed;
+            opacity: 0.6;
+        }
 
-      /* 🧾 Table bottom corners */
-      .custom-table tbody tr:last-child td:first-child {
-          border-bottom-left-radius: 12px;
-      }
-      .custom-table tbody tr:last-child td:last-child {
-          border-bottom-right-radius: 12px;
-      }
+        .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;
+            text-decoration: none;
+        }
 
-      /* 💫 Search box styling */
-      .input-group input {
-          border-radius: 10px 0 0 10px;
-          border: 1px solid #ccc;
-          box-shadow: inset 0 1px 3px rgba(0,0,0,0.05);
-      }
-      .input-group .btn {
-          border-radius: 0 10px 10px 0;
-          transition: all 0.2s ease-in-out;
-      }
-      .input-group .btn:hover {
-          background: #ffd65a;
-          border-color: #ffd65a;
-          color: #000;
-      }
+        .pagination-page-btn:hover {
+            background: #1a2951;
+            color: white;
+            border-color: #1a2951;
+        }
 
-      /* 🎨 Card Style */
-      .card {
-          border-radius: 16px;
-          border: none;
-          box-shadow: 0 4px 10px rgba(0,0,0,0.08);
-          background: #fff;
-      }
+        .pagination-page-btn.active {
+            background: #1a2951;
+            color: white;
+            border-color: #1a2951;
+        }
 
-      /* ⚡ Status Badges - NEW ATTRACTIVE STYLES */
-      .badge {
-          font-size: 11px !important;
-          font-weight: 600 !important;
-          padding: 7px 13px !important;
-          border-radius: 20px !important;
-          text-transform: uppercase;
-          letter-spacing: 0.3px;
-          display: inline-flex !important;
-          align-items: center;
-          justify-content: center;
-          background-size: cover !important;
-          background-position: center !important;
-          color: #fff !important;
-          text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-          border: 2px solid transparent !important;
-          box-sizing: border-box;
-          line-height: 1.2;
-          gap: 6px;
-          animation: pulse 2s infinite;
-          width: 99px;
-      }
+        .pagination-pages {
+            display: flex;
+            gap: 4px;
+            align-items: center;
+        }
 
-      /* Status icons */
-      .status-icon {
-          font-size: 0px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-      }
+        .pagination-ellipsis {
+            color: #9ba5bb;
+            font-size: 13px;
+            padding: 0 4px;
+        }
 
-      /* Custom status badge backgrounds */
-      .badge-pending { 
-          background: url('/images/status-bg-pending.png') !important;
-      }
+        .pagination-img-btn {
+            background: #fff;
+            border: 1px solid #e3eaf6;
+            border-radius: 6px;
+            cursor: pointer;
+            transition: all 0.3s ease;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            min-width: 40px;
+            height: 32px;
+            padding: 0;
+            text-decoration: none;
+        }
 
-      .badge-approved { 
-          background: url('/images/status-bg-approved.png') !important;
-      }
+        .pagination-img-btn:hover:not(:disabled) {
+            background: #1a2951;
+            border-color: #1a2951;
+        }
 
-      .badge-rejected { 
-          background: url('/images/status-bg-rejected.png') !important;
-      }
+        .pagination-img-btn:disabled {
+            background: #f8fafc;
+            border-color: #e2e8f0;
+            cursor: not-allowed;
+            opacity: 0.5;
+        }
 
-      /* Fallback colors if images don't load */
-      .badge.badge-pending { 
-          background: linear-gradient(135deg, #fef3c7, #fde68a) !important;
-          color: #d97706 !important;
-          border-color: #f59e0b !important;
-          width: 85px;
-      }
+        .pagination-img-btn svg {
+            width: 16px;
+            height: 16px;
+            transition: filter 0.3s ease;
+        }
 
-      .badge.badge-approved { 
-          background: linear-gradient(135deg, #d1fae5, #a7f3d0) !important;
-          color: #065f46 !important;
-          border-color: #10b981 !important;
-          width: 85px;
-      }
+        .pagination-img-btn:hover:not(:disabled) svg {
+            filter: brightness(0) saturate(100%) invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(106%) contrast(101%);
+        }
 
-      .badge.badge-rejected { 
-          background: linear-gradient(135deg, #fecaca, #fca5a5) !important;
-          color: #991b1b !important;
-          border-color: #ef4444 !important;
-          width: 85px;
-      }
+        .pagination-img-btn:disabled svg {
+            filter: brightness(0) saturate(100%) invert(84%) sepia(8%) saturate(165%) hue-rotate(179deg) brightness(89%) contrast(86%);
+        }
 
-      /* Animation effects for badges */
-      @keyframes pulse {
-          0% { box-shadow: 0 0 8px rgba(0,0,0,0.1); }
-          50% { box-shadow: 0 0 14px rgba(0,0,0,0.15); }
-          100% { box-shadow: 0 0 8px rgba(0,0,0,0.1); }
-      }
+        /* ===== UPDATED SEARCH BAR STYLES ===== */
+        .search-container {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+            gap: 15px;
+        }
+        
+        .search-form {
+            flex: 1;
+            max-width: 400px;
+        }
+        
+        .search-input-group {
+            display: flex;
+            box-shadow: 0 2px 6px rgba(0,0,0,0.08);
+            border-radius: 10px;
+            overflow: hidden;
+        }
+        
+        .search-input {
+            flex: 1;
+            border: 1px solid #e2e8f0;
+            border-right: none;
+            padding: 10px 16px;
+            font-size: 14px;
+            background-color: #fff;
+            transition: all 0.3s ease;
+        }
+        
+        .search-input:focus {
+            outline: none;
+            border-color: #3b82f6;
+            box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+        }
+        
+        .search-button {
+            background: #3b82f6;
+            border: 1px solid #3b82f6;
+            color: white;
+            padding: 10px 16px;
+            cursor: pointer;
+            transition: all 0.3s ease;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+        
+        .search-button:hover {
+            background: #2563eb;
+            border-color: #2563eb;
+        }
+        
+        .search-icon {
+            width: 16px;
+            height: 16px;
+        }
+        
+        .status-badges {
+            display: flex;
+            gap: 8px;
+            align-items: center;
+        }
+        
+        .status-badge {
+            font-size: 12px;
+            font-weight: 600;
+            padding: 6px 12px;
+            border-radius: 20px;
+            display: inline-flex;
+            align-items: center;
+            gap: 4px;
+            box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+        }
+        
+        .status-badge-pending {
+            background: linear-gradient(135deg, #fef3c7, #fde68a);
+            color: #d97706;
+            border: 1px solid #f59e0b;
+        }
+        
+        .status-badge-approved {
+            background: linear-gradient(135deg, #d1fae5, #a7f3d0);
+            color: #065f46;
+            border: 1px solid #10b981;
+        }
+        
+        .status-badge-rejected {
+            background: linear-gradient(135deg, #fecaca, #fca5a5);
+            color: #991b1b;
+            border: 1px solid #ef4444;
+        }
 
-      /* Count badges at top */
-      .count-badge {
-          --bs-badge-padding-x: 0.65em;
-          --bs-badge-padding-y: 0.35em;
-          --bs-badge-font-size: 0.75em;
-          --bs-badge-font-weight: 700;
-          --bs-badge-color: #fff;
-          --bs-badge-border-radius: var(--bs-border-radius);
-      }
-
-      /* ✨ Heading style */
-      h4.fw-bold {
-          background: linear-gradient(90deg, #000000ff 0%, #030302ff 100%);
-          -webkit-background-clip: text;
-          -webkit-text-fill-color: transparent;
-          font-weight: 800;
-          letter-spacing: 1px;
-      }
-
-      /* ✅ Center align for last column */
-      .custom-table tbody td:last-child {
-          text-align: center !important;
-          vertical-align: middle !important;
-      }
+        /* Responsive styles */
+        @media (max-width: 768px) {
+            .pagination-container {
+                flex-direction: column;
+                gap: 10px;
+                align-items: stretch;
+            }
+            .pagination-controls {
+                justify-content: center;
+            }
+            
+            .search-container {
+                flex-direction: column;
+                align-items: stretch;
+            }
+            
+            .search-form {
+                max-width: 100%;
+            }
+            
+            .status-badges {
+                justify-content: center;
+            }
+        }
     </style>
 
-    <!-- Heading and status badges row -->
+    <!-- Counts -->
     <div class="d-flex justify-content-between align-items-center mb-2 mt-3">
-        <h4 class="fw-bold mb-0">User Requests</h4>
-        <div>
-            <span class="count-badge badge rounded-pill bg-warning text-dark me-1">
-                {{ $requests->where('status', 'pending')->count() }} Pending
-            </span>
-            <span class="count-badge badge rounded-pill bg-success me-1">
-                {{ $requests->where('status', 'approved')->count() }} Approved
-            </span>
-            <span class="count-badge badge rounded-pill bg-danger">
-                {{ $requests->where('status', 'rejected')->count() }} Rejected
-            </span>
-        </div>
+        <h4 class="fw-bold mb-0">User Requests (Total: {{ $total }})</h4>
+       
     </div>
 
+    <!-- Search + Table -->
     <div class="card mb-4 shadow-sm">
         <div class="card-body pb-1">
-            <form method="GET" action="">
-                <div class="input-group mb-2">
-                    <input type="text" name="search" value="{{ old('search', request('search')) }}" class="form-control" placeholder="Search Request by name, email, Company or Request ID">
-                    <button class="btn btn-outline-primary" type="submit"><i class="bi bi-search"></i></button>
+            <!-- Updated Search Bar with Status Badges in the same line -->
+            <div class="search-container">
+                <form method="GET" action="" class="search-form">
+                    <div class="search-input-group">
+                        <input type="text" name="search" value="{{ request('search') }}" class="search-input" placeholder="Search by name, email, company...">
+                        <button class="search-button" type="submit">
+                            <svg class="search-icon" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M21 21L16.514 16.506L21 21ZM19 10.5C19 15.194 15.194 19 10.5 19C5.806 19 2 15.194 2 10.5C2 5.806 5.806 2 10.5 2C15.194 2 19 5.806 19 10.5Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </button>
+                    </div>
+                </form>
+                
+                <div class="status-badges">
+                    <span class="status-badge status-badge-pending">{{ $requests->where('status', 'pending')->count() }} Pending</span>
+                    <span class="status-badge status-badge-approved">{{ $requests->where('status', 'approved')->count() }} Approved</span>
+                    <span class="status-badge status-badge-rejected">{{ $requests->where('status', 'rejected')->count() }} Rejected</span>
                 </div>
-            </form>
+            </div>
 
             <div class="table-responsive custom-table-wrapper">
                 <table class="table align-middle mb-0 custom-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th>#</th>
-                            <th>Request ID</th>
-                            <th>Name</th>
-                            <th>Company</th>
-                            <th>Email</th>
-                            <th>Mobile</th>
-                            <th>Address</th>
-                            <th>Priority</th>
-                            <th>Date</th>
-                            <th>Status</th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
+                    <thead><tr>
+                        <th>#</th><th>Request ID</th><th>Name</th><th>Company</th><th>Email</th><th>Mobile</th><th>Address</th><th>Priority</th><th>Date</th><th>Status</th><th>Actions</th>
+                    </tr></thead>
                     <tbody>
-                        @foreach($requests as $index => $req)
+                        @forelse($currentItems as $index => $req)
                             <tr>
-                                <td>{{ $requests->count() - $index }}</td>
+                                <td><strong>{{ ($currentPage - 1) * $perPage + $index + 1 }}</strong></td>
                                 <td>{{ $req->request_id }}</td>
                                 <td>{{ $req->customer_name }}</td>
                                 <td>{{ $req->company_name }}</td>
                                 <td>{{ $req->email }}</td>
                                 <td>{{ $req->mobile_no }}</td>
-                                <td>{{ $req->address }}</td>
+                                <td>{{ Str::limit($req->address, 30) }}</td>
                                 <td>
-                                    @if(strtolower($req->priority) == 'high')
-                                        <span class="priority-badge priority-high">High</span>
-                                    @elseif(strtolower($req->priority) == 'medium')
-                                        <span class="priority-badge priority-medium">Medium</span>
-                                    @elseif(strtolower($req->priority) == 'low')
-                                        <span class="priority-badge priority-low">Low</span>
-                                    @else
-                                        {{ $req->priority }}
-                                    @endif
+                                    @if(strtolower($req->priority) == 'high')<span class="priority-badge priority-high">High</span>
+                                    @elseif(strtolower($req->priority) == 'medium')<span class="priority-badge priority-medium">Medium</span>
+                                    @elseif(strtolower($req->priority) == 'low')<span class="priority-badge priority-low">Low</span>
+                                    @else{{ $req->priority ?? 'N/A' }}@endif
                                 </td>
                                 <td>{{ $req->date }}</td>
                                 <td>
-                                    @if($req->status == 'approved')
-                                        <span class="badge badge-approved">
-                                            <i class="bi bi-check-circle-fill status-icon"></i>
-                                            Approved
-                                        </span>
-                                    @elseif($req->status == 'rejected')
-                                        <span class="badge badge-rejected">
-                                            <i class="bi bi-x-circle-fill status-icon"></i>
-                                            Rejected
-                                        </span>
-                                    @else
-                                        <span class="badge badge-pending">
-                                            <i class="bi bi-clock-fill status-icon"></i>
-                                            Pending
-                                        </span>
-                                    @endif
+                                    @if($req->status == 'approved')<span class="badge badge-approved"><i class="bi bi-check-circle-fill status-icon"></i>Approved</span>
+                                    @elseif($req->status == 'rejected')<span class="badge badge-rejected"><i class="bi bi-x-circle-fill status-icon"></i>Rejected</span>
+                                    @else<span class="badge badge-pending"><i class="bi bi-clock-fill status-icon"></i>Pending</span>@endif
                                 </td>
                                 <td>
                                     @if($req->status == 'pending')
@@ -306,12 +382,79 @@
                                 </td>
 
                             </tr>
-                        @endforeach
+                        @empty
+                            <tr><td colspan="11" class="text-center text-muted py-4">No records found.</td></tr>
+                        @endforelse
                     </tbody>
                 </table>
-                @if($requests->isEmpty())
-                    <div class="py-4 text-center text-muted">No records found.</div>
-                @endif
+            </div>
+
+            {{-- ✅ PAGINATION - WITH ARROW BUTTONS --}}
+            <div class="pagination-container">
+                <div class="pagination-info">
+                    Showing {{ ($currentPage - 1) * $perPage + 1 }} to {{ min($currentPage * $perPage, $total) }} of {{ $total }} entries
+                </div>
+                <div class="pagination-controls">
+                    {{-- Previous Page --}}
+                    @if($currentPage > 1)
+                        <a href="{{ request()->fullUrlWithQuery(['page' => $currentPage - 1]) }}" class="pagination-img-btn" title="Previous page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </a>
+                    @else
+                        <button class="pagination-img-btn" disabled title="Previous page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </button>
+                    @endif
+
+                    {{-- Page Numbers --}}
+                    <div class="pagination-pages">
+                        @php
+                            $start = max(1, $currentPage - 1);
+                            $end = min($totalPages, $currentPage + 1);
+                        @endphp
+
+                        @if($start > 1)
+                            <a href="{{ request()->fullUrlWithQuery(['page' => 1]) }}" class="pagination-page-btn">1</a>
+                            @if($start > 2)
+                                <span class="pagination-ellipsis">...</span>
+                            @endif
+                        @endif
+
+                        @for($i = $start; $i <= $end; $i++)
+                            @if($i == $currentPage)
+                                <span class="pagination-page-btn active">{{ $i }}</span>
+                            @else
+                                <a href="{{ request()->fullUrlWithQuery(['page' => $i]) }}" class="pagination-page-btn">{{ $i }}</a>
+                            @endif
+                        @endfor
+
+                        @if($end < $totalPages)
+                            @if($end < $totalPages - 1)
+                                <span class="pagination-ellipsis">...</span>
+                            @endif
+                            <a href="{{ request()->fullUrlWithQuery(['page' => $totalPages]) }}" class="pagination-page-btn">{{ $totalPages }}</a>
+                        @endif
+                    </div>
+
+                    {{-- Next Page --}}
+                    @if($currentPage < $totalPages)
+                        <a href="{{ request()->fullUrlWithQuery(['page' => $currentPage + 1]) }}" class="pagination-img-btn" title="Next page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </a>
+                    @else
+                        <button class="pagination-img-btn" disabled title="Next page">
+                            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                            </svg>
+                        </button>
+                    @endif
+                </div>
             </div>
         </div>
     </div>
diff --git a/resources/views/admin/shipments.blade.php b/resources/views/admin/shipments.blade.php
index 81b7d96..4092ae7 100644
--- a/resources/views/admin/shipments.blade.php
+++ b/resources/views/admin/shipments.blade.php
@@ -7,15 +7,18 @@
     /*Remove horizontal scroll bar*/
     html, body {
         overflow-x: hidden !important;
+        font-family: 'Inter', sans-serif;
     }
     
     .table thead th,
     .table tbody td {
         white-space: nowrap !important;
-        padding: 8px 4px !important;
+        padding: 14px 8px !important;
+        font-size: 14px;
+        font-family: 'Inter', sans-serif;
     }
 
-    .table th:nth-child(10),  /* if Date is column 10 */
+    .table th:nth-child(10),
     .table td:nth-child(10) {
         max-width: 110px !important;
         width: 110px !important;
@@ -25,6 +28,7 @@
 
     .table {
         table-layout: fixed !important;
+        font-family: 'Inter', sans-serif;
     }
 
     
@@ -32,6 +36,7 @@
         min-width: unset !important;
         width: 100% !important;
         table-layout: auto !important;
+        font-family: 'Inter', sans-serif;
     }
     
     .table thead th,
@@ -42,6 +47,8 @@
     .shipment-details-table td {
         white-space: normal !important;
         word-break: break-word;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .table-responsive, .modal .table-responsive {
@@ -63,62 +70,125 @@
         --hover-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
     }
 
+    /* Search Bar Styles */
     .search-shipment-bar {
         display: flex;
         align-items: center;
         gap: 15px;
         padding: 20px;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        background: white;
         border-radius: 16px;
         box-shadow: var(--card-shadow);
         flex-wrap: wrap;
         margin-bottom: 30px;
-        color: white;
+        color: #333;
         position: relative;
         overflow: hidden;
+        font-family: 'Inter', sans-serif;
+        border: 1px solid #e2e8f0;
     }
     
-    .search-shipment-bar::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background: rgba(255,255,255,0.1);
-        z-index: 0;
-    }
-    
-    .search-shipment-bar > * {
-        position: relative;
-        z-index: 1;
-    }
-    
-    .search-shipment-bar input, 
-    .search-shipment-bar select {
-        padding: 12px 16px;
-        border: 1px solid rgba(255,255,255,0.2);
-        border-radius: 10px;
+    .search-input-container {
+        display: flex;
         flex: 1;
-        min-width: 150px;
-        background: rgba(255,255,255,0.9);
-        font-weight: 500;
+        min-width: 300px;
+        background: white;
+        border-radius: 10px;
+        overflow: hidden;
+        border: 1px solid #d1d5db;
         transition: all 0.3s ease;
     }
     
-    .search-shipment-bar input:focus, 
+    .search-input-container:focus-within {
+        border-color: #4361ee;
+        box-shadow: 0 0 0 3px rgba(67, 97, 238, 0.1);
+    }
+    
+    .search-shipment-bar input {
+        padding: 12px 16px;
+        border: none;
+        flex: 1;
+        background: transparent;
+        font-weight: 500;
+        transition: all 0.3s ease;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
+        outline: none;
+        color: #333;
+    }
+    
+    .search-shipment-bar input::placeholder {
+        color: #6b7280;
+    }
+    
+    .search-button {
+        background: white;
+        color: #4361ee;
+        border: none;
+        padding: 12px 20px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        font-weight: 600;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        border-radius: 0 10px 10px 0;
+        min-width: 100px;
+        justify-content: center;
+        border-left: 1px solid #d1d5db;
+    }
+    
+    .search-input-group {
+        border: 1px solid #d1d5db !important;
+        border-radius: 8px !important;
+        padding: 4px !important;
+        background: #ffffff !important;
+    }
+    
+    .search-button:hover {
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        color: white;
+        transform: translateY(-1px);
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
+    }
+    
+    .search-icon {
+        font-size: 16px;
+        color: #4361ee;
+        transition: all 0.3s ease;
+    }
+    
+    .search-button:hover .search-icon {
+        color: white;
+    }
+    
+    .search-shipment-bar select {
+        padding: 20px 16px;
+        border: 1px solid #d1d5db;
+        border-radius: 10px;
+        min-width: 150px;
+        background: white;
+        font-weight: 500;
+        transition: all 0.3s ease;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
+        color: #333;
+    }
+    
     .search-shipment-bar select:focus {
         background: white;
-        box-shadow: 0 0 0 3px rgba(255,255,255,0.3);
+        box-shadow: 0 0 0 3px rgba(67, 97, 238, 0.1);
         outline: none;
+        border-color: #4361ee;
     }
     
     .btn-add-shipment {
-        background: rgba(255,255,255,0.2);
-        backdrop-filter: blur(10px);
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
         color: white;
-        border: 1px solid rgba(255,255,255,0.3);
-        padding: 12px 24px;
+        border: none;
+        padding: 17px 24px;
         border-radius: 10px;
         cursor: pointer;
         display: flex;
@@ -127,17 +197,13 @@
         transition: all 0.3s ease;
         white-space: nowrap;
         font-weight: 600;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .btn-add-shipment: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));
+        box-shadow: 0 10px 20px rgba(102, 126, 234, 0.3);
     }
     
     .truck-icon {
@@ -149,7 +215,7 @@
             flex-direction: column;
             align-items: stretch;
         }
-        .search-shipment-bar input, 
+        .search-input-container,
         .search-shipment-bar select {
             width: 100%;
         }
@@ -162,6 +228,7 @@
         box-shadow: var(--card-shadow);
         transition: all 0.3s ease;
         overflow: hidden;
+        font-family: 'Inter', sans-serif;
     }
     
     .card:hover {
@@ -175,6 +242,7 @@
         border: none;
         padding: 20px 25px;
         border-radius: 16px 16px 0 0 !important;
+        font-family: 'Inter', sans-serif;
     }
     
     .card-header h5 {
@@ -183,6 +251,8 @@
         display: flex;
         align-items: center;
         gap: 10px;
+        font-family: 'Inter', sans-serif;
+        font-size: 18px;
     }
     
     /* Table Styles */
@@ -198,6 +268,7 @@
         width: 100%;
         min-width: 1200px;
         padding: 0;
+        font-family: 'Inter', sans-serif;
     }
     
     .table thead th {
@@ -211,6 +282,8 @@
         border-bottom: 2px solid var(--border);
         position: relative;
         white-space: nowrap;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .table thead th:first-child {
@@ -239,13 +312,15 @@
         border-bottom: 1px solid var(--border);
         font-weight: 500;
         white-space: nowrap;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .table tbody tr:last-child td {
         border-bottom: none;
     }
     
-    /* UPDATED: Status Badge Styles - ALL SAME SIZE */
+    /* Status Badge Styles */
     .badge {
         padding: 7px 17px !important;
         border-radius: 20px !important;
@@ -254,63 +329,51 @@
         border: 2px solid transparent !important;
         min-width: 40px !important;
         text-align: center !important;
-        display: inline-block !important;
+        display: inline-flex !important;
+        align-items: center;
+        justify-content: center;
         line-height: 1.2 !important;
+        font-family: 'Inter', sans-serif;
+        gap: 6px;
+        width: 110px;
     }
     
-    /* Pending Status - SAME SIZE */
+    /* Status icons */
+    .status-icon {
+        font-size: 13px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    
+    /* Pending Status */
     .badge-pending {
         background: linear-gradient(135deg, #fef3c7, #fde68a) !important;
         color: #d97706 !important;
         border-color: #f59e0b !important;
-        width: 110px;
     }
     
-    /* In Transit Status - SAME SIZE */
+    /* In Transit Status */
     .badge-in_transit {
         background: linear-gradient(135deg, #dbeafe, #93c5fd) !important;
         color: #1e40af !important;
         border-color: #3b82f6 !important;
-        width: 110px;
     }
     
-    /* Dispatched Status - SAME SIZE */
+    /* Dispatched Status */
     .badge-dispatched {
         background: linear-gradient(135deg, #e9d5ff, #c4b5fd) !important;
         color: #6b21a8 !important;
         border-color: #8b5cf6 !important;
-        width: 110px;
     }
     
-    /* Delivered Status - SAME SIZE */
+    /* Delivered Status */
     .badge-delivered {
         background: linear-gradient(135deg, #d1fae5, #a7f3d0) !important;
         color: #065f46 !important;
         border-color: #10b981 !important;
-        width: 110px;
     }
     
-    /* Default badge styles - SAME SIZE */
-    .badge.bg-info {
-        background: linear-gradient(135deg, #4cc9f0, #4361ee) !important;
-        color: white !important;
-    }
-    
-    .badge.bg-success {
-        background: linear-gradient(135deg, #4ade80, #22c55e) !important;
-        color: white !important;
-    }
-    
-    .badge.bg-warning {
-        background: linear-gradient(135deg, #fbbf24, #f59e0b) !important;
-        color: white !important;
-    }
-    
-    .badge.bg-danger {
-        background: linear-gradient(135deg, #f87171, #ef4444) !important;
-        color: white !important;
-    }
-
     /* Light badges for quantity, kg, cbm */
     .badge.bg-light {
         background: #f8f9fa !important;
@@ -318,9 +381,12 @@
         border: 1px solid #dee2e6 !important;
         min-width: 80px !important;
         padding: 6px 12px !important;
+        font-family: 'Inter', sans-serif;
+        font-size: 13px;
+        width: auto;
     }
     
-    /* NEW: Action Button Styles */
+    /* Action Button Styles */
     .action-container {
         position: relative;
         display: inline-block;
@@ -339,6 +405,7 @@
         justify-content: center;
         width: 36px;
         height: 36px;
+        font-family: 'Inter', sans-serif;
     }
     
     .btn-edit-status:hover {
@@ -362,6 +429,7 @@
         margin-top: -50px;
         border: 1px solid var(--border);
         z-index: 1050;
+        font-family: 'Inter', sans-serif;
     }
     
     .status-dropdown.show {
@@ -382,6 +450,7 @@
         gap: 8px;
         background: transparent;
         width: 100%;
+        font-family: 'Inter', sans-serif;
     }
     
     .status-option:hover {
@@ -447,12 +516,73 @@
         background: #10b981;
     }
 
+    /* View Button Styles */
+    .btn-view {
+        background: #4361ee;
+        color: white;
+        border: none;
+        border-radius: 8px;
+        padding: 8px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 36px;
+        height: 36px;
+        font-weight: 600;
+        font-size: 16px;
+        font-family: 'Inter', sans-serif;
+        position: relative;
+        overflow: hidden;
+    }
+    
+    .btn-view::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        transition: all 0.3s ease;
+        z-index: 1;
+    }
+    
+    .btn-view:hover::before {
+        left: 0;
+    }
+    
+    .btn-view i {
+        position: relative;
+        z-index: 2;
+        transition: all 0.3s ease;
+    }
+    
+    .btn-view:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
+    }
+    
+    .btn-view:hover i {
+        transform: scale(1.1);
+    }
+
+    /* Action buttons container */
+    .action-buttons {
+        display: flex;
+        gap: 8px;
+        align-items: center;
+        justify-content: center;
+    }
+
     /* Modal Styles */
     .modal-content {
         border-radius: 20px;
         border: none;
         box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
         overflow: hidden;
+        font-family: 'Inter', sans-serif;
     }
     
     .modal-header {
@@ -462,6 +592,7 @@
         padding: 25px 30px 15px;
         border-radius: 20px 20px 0 0;
         position: relative;
+        font-family: 'Inter', sans-serif;
     }
     
     .modal-header::after {
@@ -477,6 +608,7 @@
     .modal-title {
         font-weight: 700;
         font-size: 1.5rem;
+        font-family: 'Inter', sans-serif;
     }
     
     .btn-close {
@@ -490,6 +622,7 @@
     
     .modal-body {
         padding: 25px 30px;
+        font-family: 'Inter', sans-serif;
     }
     
     /* Form Styles */
@@ -498,16 +631,18 @@
         color: #5a6c7d;
         margin-bottom: 8px;
         font-size: 0.9rem;
+        font-family: 'Inter', sans-serif;
     }
     
     .form-control {
         border-radius: 10px;
         border: 1px solid #e2e8f0;
         padding: 12px 16px;
-        font-size: 15px;
+        font-size: 14px;
         transition: all 0.3s ease;
         background: #fafbfc;
         color: #4a5568;
+        font-family: 'Inter', sans-serif;
     }
     
     .form-control:focus {
@@ -520,39 +655,6 @@
         color: #a0aec0;
     }
     
-    /* Date Input Styling */
-    input[type="date"] {
-        position: relative;
-    }
-    
-    input[type="date"]::-webkit-calendar-picker-indicator {
-        background: transparent;
-        bottom: 0;
-        color: transparent;
-        cursor: pointer;
-        height: auto;
-        left: 0;
-        position: absolute;
-        right: 0;
-        top: 0;
-        width: auto;
-    }
-    
-    input[type="date"] {
-        position: relative;
-        padding-right: 40px;
-    }
-    
-    input[type="date"]:after {
-        content: "📅";
-        position: absolute;
-        right: 12px;
-        top: 50%;
-        transform: translateY(-50%);
-        pointer-events: none;
-        font-size: 16px;
-    }
-    
     /* Button Styles */
     .btn-cancel {
         background: #f7fafc;
@@ -562,6 +664,8 @@
         font-weight: 600;
         padding: 12px 30px;
         transition: all 0.3s ease;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .btn-cancel:hover {
@@ -575,11 +679,12 @@
         background: linear-gradient(135deg, #48bb78, #38a169);
         color: white;
         font-weight: 600;
-        font-size: 16px;
+        font-size: 14px;
         border-radius: 10px;
         padding: 12px 35px;
         border: none;
         transition: all 0.3s ease;
+        font-family: 'Inter', sans-serif;
     }
     
     .btn-create:hover {
@@ -595,6 +700,7 @@
         border-spacing: 0 8px;
         margin: 0;
         min-width: 1300px;
+        font-family: 'Inter', sans-serif;
     }
     
     .custom-table-modal thead th {
@@ -605,9 +711,10 @@
         border: 1px solid #e2e8f0;
         text-align: center;
         position: relative;
-        font-size: 0.9rem;
+        font-size: 14px;
         letter-spacing: 0.3px;
         white-space: nowrap;
+        font-family: 'Inter', sans-serif;
     }
     
     .custom-table-modal thead th:first-child {
@@ -644,6 +751,8 @@
         position: relative;
         color: #4a5568;
         white-space: nowrap;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .custom-table-modal tbody tr td:first-child {
@@ -656,38 +765,6 @@
         border-bottom-right-radius: 10px;
     }
     
-    /* Checkbox Styling */
-    input[type="checkbox"] {
-        width: 20px;
-        height: 20px;
-        border-radius: 6px;
-        border: 2px solid #cbd5e0;
-        cursor: pointer;
-        position: relative;
-        transition: all 0.2s ease;
-        background: #f7fafc;
-    }
-    
-    input[type="checkbox"]:checked {
-        background: var(--primary);
-        border-color: var(--primary);
-    }
-    
-    /* Link Styling */
-    a.text-primary {
-        color: var(--primary) !important;
-        text-decoration: none;
-        font-weight: 600;
-        transition: all 0.3s ease;
-        position: relative;
-        color: #4361ee !important;
-    }
-    
-    a.text-primary:hover {
-        color: var(--primary-dark) !important;
-        text-decoration: underline;
-    }
-    
     /* Shipment Details Modal */
     .shipment-details-header {
         background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
@@ -695,10 +772,12 @@
         border: none;
         padding: 25px 30px 15px;
         border-radius: 20px 20px 0 0;
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-details-body {
         padding: 40px 45px;
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-info-row {
@@ -709,6 +788,7 @@
         background: #f8fafc;
         border-radius: 12px;
         box-shadow: 0 2px 10px rgba(0,0,0,0.05);
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-info-item {
@@ -722,12 +802,14 @@
         color: #64748b;
         font-size: 14px;
         margin-bottom: 5px;
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-info-value {
         font-weight: 700;
         font-size: 18px;
         color: var(--dark);
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-details-table {
@@ -736,6 +818,7 @@
         border-spacing: 0 8px;
         margin-top: 20px;
         min-width: 1400px;
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-details-table th {
@@ -747,6 +830,8 @@
         border: none;
         position: relative;
         white-space: nowrap;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .shipment-details-table th:first-child {
@@ -766,6 +851,8 @@
         background: white;
         box-shadow: 0 2px 5px rgba(0,0,0,0.05);
         white-space: nowrap;
+        font-family: 'Inter', sans-serif;
+        font-size: 14px;
     }
     
     .shipment-details-table tr td:first-child {
@@ -778,6 +865,31 @@
         border-bottom-right-radius: 10px;
     }
     
+    /* Delete Button for Orders */
+    .btn-delete-order {
+        background: linear-gradient(135deg, #f87171, #ef4444);
+        color: white;
+        border: none;
+        border-radius: 6px;
+        padding: 6px 12px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        font-size: 12px;
+        font-weight: 600;
+        font-family: 'Inter', sans-serif;
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        min-width: 80px;
+        justify-content: center;
+    }
+    
+    .btn-delete-order:hover {
+        background: linear-gradient(135deg, #ef4444, #dc2626);
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(239, 68, 68, 0.3);
+    }
+    
     /* Shipment Totals Section */
     .shipment-totals {
         margin-top: 25px;
@@ -786,6 +898,7 @@
         border-radius: 12px;
         box-shadow: 0 4px 6px rgba(0,0,0,0.05);
         border-left: 4px solid #4361ee;
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-totals-row {
@@ -812,6 +925,7 @@
         margin-bottom: 8px;
         text-transform: uppercase;
         letter-spacing: 0.5px;
+        font-family: 'Inter', sans-serif;
     }
     
     .shipment-total-value {
@@ -819,6 +933,7 @@
         font-size: 20px;
         color: #1e293b;
         line-height: 1.2;
+        font-family: 'Inter', sans-serif;
     }
     
     .total-amount {
@@ -891,6 +1006,7 @@
     /* Status Filter Styles */
     .status-filter-container {
         position: relative;
+        margin-left:350px;
     }
 
     .status-filter-select {
@@ -905,17 +1021,189 @@
         padding-right: 40px !important;
     }
 
-    /* Shipment row styling for filtering */
-    .shipment-row {
+    /* Pagination Styles */
+    .pagination-container {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 15px;
+        padding: 12px 25px;
+        border-top: 1px solid #eef3fb;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .pagination-info {
+        font-size: 13px;
+        color: #9ba5bb;
+        font-weight: 600;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .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;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .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;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .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;
+        font-family: 'Inter', sans-serif;
+    }
+
+    .pagination-img-btn {
+        background: #fff;
+        border: 1px solid #e3eaf6;
+        border-radius: 6px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 40px;
+        height: 32px;
+        padding: 0;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) {
+        background: #1a2951;
+        border-color: #1a2951;
+    }
+
+    .pagination-img-btn:disabled {
+        background: #f8fafc;
+        border-color: #e2e8f0;
+        cursor: not-allowed;
+        opacity: 0.5;
+    }
+
+    .pagination-img-btn img {
+        width: 16px;
+        height: 16px;
+        filter: brightness(0) saturate(100%) invert(26%) sepia(89%) saturate(748%) hue-rotate(201deg) brightness(93%) contrast(89%);
+        transition: filter 0.3s ease;
+    }
+
+    .pagination-img-btn:hover:not(:disabled) img {
+        filter: brightness(0) saturate(100%) invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(106%) contrast(101%);
+    }
+
+    .pagination-img-btn:disabled img {
+        filter: brightness(0) saturate(100%) invert(84%) sepia(8%) saturate(165%) hue-rotate(179deg) brightness(89%) contrast(86%);
+    }
+
+    @media (max-width: 768px) {
+        .pagination-container {
+            flex-direction: column;
+            gap: 10px;
+            align-items: stretch;
+        }
+        
+        .pagination-controls {
+            justify-content: center;
+        }
+    }
+
+    /* Delete Confirmation Modal */
+    .delete-confirmation-modal .modal-header {
+        background: linear-gradient(135deg, #ef4444, #dc2626);
+    }
+
+    .delete-confirmation-modal .btn-confirm-delete {
+        background: linear-gradient(135deg, #ef4444, #dc2626);
+        color: white;
+        border: none;
+        border-radius: 8px;
+        padding: 10px 20px;
+        font-weight: 600;
         transition: all 0.3s ease;
     }
 
-    .shipment-row.hidden {
-        display: none !important;
+    .delete-confirmation-modal .btn-confirm-delete:hover {
+        background: linear-gradient(135deg, #dc2626, #b91c1c);
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(220, 38, 38, 0.3);
     }
 
-    .shipment-row.visible {
-        display: table-row;
+    .delete-confirmation-modal .btn-cancel-delete {
+        background: #f7fafc;
+        color: #718096;
+        border: 1px solid #cbd5e0;
+        border-radius: 8px;
+        padding: 10px 20px;
+        font-weight: 600;
+        transition: all 0.3s ease;
+    }
+
+    .delete-confirmation-modal .btn-cancel-delete:hover {
+        background: #edf2f7;
+        color: #4a5568;
     }
 </style>
 
@@ -938,12 +1226,27 @@
         </div>
     @endif
 
-    <!-- ============================= -->
-    <!--    SEARCH BAR AND ADD BUTTON  -->
-    <!-- ============================= -->
+    <!-- SEARCH BAR AND ADD BUTTON -->
     <div class="search-shipment-bar">
-        <span class="search-icon">🔍</span>
-        <input type="text" id="searchInput" placeholder="Search Shipments...">
+        <form method="GET" action="">
+            <div class="input-group mb-2 search-input-group">
+                <input 
+                    type="text" 
+                    name="search" 
+                    id="searchInput"
+                    value="{{ request('search') }}"
+                    class="form-control"
+                    placeholder="Search Shipments..."
+                >
+                <button 
+                    class="btn btn-outline-primary search-button" 
+                    type="submit"
+                >
+                    <i class="bi bi-search search-icon"></i>
+                </button>
+            </div>
+        </form>
+
         <div class="status-filter-container">
             <select id="statusFilter" class="status-filter-select">
                 <option value="all">All Status</option>
@@ -953,21 +1256,13 @@
                 <option value="delivered">Delivered</option>
             </select>
         </div>
-        <select id="carrierFilter">
-            <option value="all">All Carriers</option>
-            <option value="fedex">FedEx</option>
-            <option value="ups">UPS</option>
-            <option value="dhl">DHL</option>
-        </select>
         <button type="button" class="btn-add-shipment" data-bs-toggle="modal" data-bs-target="#createShipmentModal">
             <span class="truck-icon">🚚</span>
             Add Shipments
         </button>
     </div>
 
-    <!-- ============================= -->
-    <!--   CREATE SHIPMENT MODAL -->
-    <!-- ============================= -->
+    <!-- CREATE SHIPMENT MODAL -->
     <div class="modal fade" id="createShipmentModal" tabindex="-1" aria-labelledby="createShipmentModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-xl">
             <div class="modal-content">
@@ -1059,9 +1354,7 @@
         </div>
     </div>
 
-    <!-- ============================= -->
-    <!--      SHIPMENT LIST TABLE     -->
-    <!-- ============================= -->
+    <!-- SHIPMENT LIST TABLE -->
     <div class="card">
         <div class="card-header">
             <h5 class="mb-0"><i class="bi bi-truck me-2"></i> Shipments List</h5>
@@ -1082,7 +1375,8 @@
                             <th>Total Amount</th>
                             <th>Status</th>
                             <th>Date</th>
-                            <th>Action</th>
+                            <th>Actions</th>
+                            <th>View</th>
                         </tr>
                     </thead>
 
@@ -1092,13 +1386,12 @@
                         @endphp
                         @forelse($shipments as $ship)
                         <tr class="shipment-row" data-status="{{ $ship->status }}" data-shipment-id="{{ $ship->shipment_id }}">
-                            {{-- REVERSE INDEX: सर्वात वरच्या shipment ला सर्वात मोठा क्रमांक --}}
+                            {{-- REVERSE INDEX --}}
                             <td class="fw-bold">{{ $totalShipments - $loop->index }}</td>
                             <td>
-                                <a href="#" class="text-primary fw-bold"
-                                   onclick="openShipmentDetails({{ $ship->id }})">
+                                <span class="fw-bold text-primary">
                                     {{ $ship->shipment_id }}
-                                </a>
+                                </span>
                             </td>
                             <td>{{ $ship->origin }}</td>
                             <td>{{ $ship->destination }}</td>
@@ -1108,43 +1401,59 @@
                             <td class="fw-bold text-success">₹{{ number_format($ship->total_amount, 2) }}</td>
                             <td>
                                 <span class="badge badge-{{ $ship->status }}">
+                                    @if($ship->status == 'pending')
+                                        <i class="bi bi-clock-fill status-icon"></i>
+                                    @elseif($ship->status == 'in_transit')
+                                        <i class="bi bi-truck status-icon"></i>
+                                    @elseif($ship->status == 'dispatched')
+                                        <i class="bi bi-box-seam status-icon"></i>
+                                    @elseif($ship->status == 'delivered')
+                                        <i class="bi bi-check-circle-fill status-icon"></i>
+                                    @endif
                                     {{ ucfirst(str_replace('_', ' ', $ship->status)) }}
                                 </span>
                             </td>
                             <td>{{ \Carbon\Carbon::parse($ship->shipment_date)->format('d M Y') }}</td>
                             <td>
-                                <div class="action-container">
-                                    <button type="button" class="btn-edit-status" onclick="toggleStatusDropdown(this, {{ $ship->id }})" title="Edit Status">
-                                        <i class="bi bi-pencil"></i>
-                                    </button>
-                                    <div class="status-dropdown" id="statusDropdown-{{ $ship->id }}">
-                                        <form action="{{ route('admin.shipments.updateStatus') }}" method="POST" class="status-form">
-                                            @csrf
-                                            <input type="hidden" name="shipment_id" value="{{ $ship->id }}">
-                                            <button type="submit" name="status" value="pending" class="status-option pending">
-                                                <span class="status-indicator pending"></span>
-                                                Pending
-                                            </button>
-                                            <button type="submit" name="status" value="in_transit" class="status-option in_transit">
-                                                <span class="status-indicator in_transit"></span>
-                                                In Transit
-                                            </button>
-                                            <button type="submit" name="status" value="dispatched" class="status-option dispatched">
-                                                <span class="status-indicator dispatched"></span>
-                                                Dispatched
-                                            </button>
-                                            <button type="submit" name="status" value="delivered" class="status-option delivered">
-                                                <span class="status-indicator delivered"></span>
-                                                Delivered
-                                            </button>
-                                        </form>
+                                <div class="action-buttons">
+                                    <div class="action-container">
+                                        <button type="button" class="btn-edit-status" onclick="toggleStatusDropdown(this, {{ $ship->id }})" title="Edit Status">
+                                            <i class="bi bi-pencil"></i>
+                                        </button>
+                                        <div class="status-dropdown" id="statusDropdown-{{ $ship->id }}">
+                                            <form action="{{ route('admin.shipments.updateStatus') }}" method="POST" class="status-form">
+                                                @csrf
+                                                <input type="hidden" name="shipment_id" value="{{ $ship->id }}">
+                                                <button type="submit" name="status" value="pending" class="status-option pending">
+                                                    <span class="status-indicator pending"></span>
+                                                    Pending
+                                                </button>
+                                                <button type="submit" name="status" value="in_transit" class="status-option in_transit">
+                                                    <span class="status-indicator in_transit"></span>
+                                                    In Transit
+                                                </button>
+                                                <button type="submit" name="status" value="dispatched" class="status-option dispatched">
+                                                    <span class="status-indicator dispatched"></span>
+                                                    Dispatched
+                                                </button>
+                                                <button type="submit" name="status" value="delivered" class="status-option delivered">
+                                                    <span class="status-indicator delivered"></span>
+                                                    Delivered
+                                                </button>
+                                            </form>
+                                        </div>
                                     </div>
                                 </div>
                             </td>
+                            <td>
+                                <button type="button" class="btn-view" onclick="viewShipmentOrders({{ $ship->id }})" title="View Orders">
+                                    <i class="bi bi-eye"></i>
+                                </button>
+                            </td>
                         </tr>
                         @empty
                         <tr>
-                            <td colspan="11" class="text-center py-5 text-muted">
+                            <td colspan="12" class="text-center py-5 text-muted">
                                 <i class="bi bi-inbox display-4 d-block mb-3"></i>
                                 No shipments found
                             </td>
@@ -1153,26 +1462,74 @@
                     </tbody>
                 </table>
             </div>
+
+            <!-- Pagination Controls -->
+            <div class="pagination-container">
+                <div class="pagination-info" id="pageInfo">Showing 1 to {{ $shipments->count() }} of {{ $shipments->count() }} entries</div>
+                <div class="pagination-controls">
+                    <button class="pagination-img-btn" id="prevPageBtn" title="Previous page" disabled>
+                        <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M10 12L6 8L10 4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                        </svg>
+                    </button>
+                    <div class="pagination-pages" id="paginationPages">
+                        <!-- Page numbers will be inserted here -->
+                    </div>
+                    <button class="pagination-img-btn" id="nextPageBtn" title="Next page" disabled>
+                        <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                        </svg>
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
 
-    <!-- ============================= -->
-    <!--   SHIPMENT DETAILS MODAL     -->
-    <!-- ============================= -->
-    <div class="modal fade" id="shipmentDetailsModal" tabindex="-1">
+    <!-- VIEW SHIPMENT ORDERS MODAL -->
+    <div class="modal fade" id="viewShipmentOrdersModal" tabindex="-1">
         <div class="modal-dialog modal-xl modal-dialog-scrollable">
             <div class="modal-content">
-                <div class="modal-header shipment-details-header">
-                    <h5 class="modal-title fw-bold"><i class="bi bi-box-seam me-2"></i>Consolidated Shipment Details</h5>
-                    <button class="btn-close" data-bs-dismiss="modal"></button>
+                <div class="modal-header shipment-details-header d-flex justify-content-between align-items-center">
+                    <h5 class="modal-title fw-bold">
+                        <i class="bi bi-list-ul me-2"></i>
+                        Shipment Details — <span id="shipmentOrdersHeader"></span>
+                    </h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
-
-                <div class="modal-body shipment-details-body" id="shipmentDetailsContent">
+                <div class="modal-body shipment-details-body" id="shipmentOrdersContent">
                     <div class="text-center py-4 loading">
                         <div class="spinner-border text-primary" role="status">
                             <span class="visually-hidden">Loading...</span>
                         </div>
-                        <p class="mt-2 text-muted">Loading shipment details...</p>
+                        <p class="mt-2 text-muted">Loading orders...</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- DELETE CONFIRMATION MODAL -->
+    <div class="modal fade delete-confirmation-modal" id="deleteOrderModal" tabindex="-1">
+        <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title fw-bold">
+                        <i class="bi bi-exclamation-triangle-fill me-2"></i>
+                        Confirm Delete
+                    </h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body text-center">
+                    <i class="bi bi-trash-fill display-1 text-danger mb-3"></i>
+                    <h4 class="mb-3">Are you sure?</h4>
+                    <p class="text-muted mb-4">You are about to delete this order from the shipment. This action cannot be undone.</p>
+                    <input type="hidden" id="orderToDeleteId">
+                    <input type="hidden" id="shipmentToDeleteFromId">
+                    <div class="d-flex justify-content-center gap-3">
+                        <button type="button" class="btn-cancel-delete" data-bs-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn-confirm-delete" onclick="confirmDeleteOrder()">
+                            <i class="bi bi-trash me-2"></i>Delete Order
+                        </button>
                     </div>
                 </div>
             </div>
@@ -1181,103 +1538,271 @@
 
 </div>
 
-<!-- ========================= -->
-<!--  MODAL LOAD SCRIPT (AJAX) -->
-<!-- ========================= -->
 <script>
-// Status Filter Functionality
+// Global variables
+let currentShipmentId = null;
+let currentPage = 1;
+const itemsPerPage = 10;
+let allShipments = @json($shipments);
+let filteredShipments = [...allShipments];
+
+// Initialize on page load
 document.addEventListener('DOMContentLoaded', function() {
+    renderTable();
+    updatePaginationControls();
+    
+    // Bind pagination events
+    document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
+    document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
+
+    // Status Filter Functionality
     const statusFilter = document.getElementById('statusFilter');
     const searchInput = document.getElementById('searchInput');
-    const carrierFilter = document.getElementById('carrierFilter');
-    const shipmentRows = document.querySelectorAll('.shipment-row');
 
     // Function to filter shipments
     function filterShipments() {
         const selectedStatus = statusFilter.value;
         const searchTerm = searchInput.value.toLowerCase();
-        const selectedCarrier = carrierFilter.value;
 
-        shipmentRows.forEach(row => {
-            const status = row.getAttribute('data-status');
-            const shipmentId = row.getAttribute('data-shipment-id').toLowerCase();
-            const origin = row.cells[2].textContent.toLowerCase();
-            const destination = row.cells[3].textContent.toLowerCase();
-            
-            let statusMatch = selectedStatus === 'all' || status === selectedStatus;
-            let searchMatch = searchTerm === '' || 
-                            shipmentId.includes(searchTerm) || 
-                            origin.includes(searchTerm) || 
-                            destination.includes(searchTerm);
-            let carrierMatch = selectedCarrier === 'all'; // You can add carrier data attribute if needed
+        filteredShipments = allShipments.filter(shipment => {
+            let include = true;
 
-            if (statusMatch && searchMatch && carrierMatch) {
-                row.classList.remove('hidden');
-                row.classList.add('visible');
-            } else {
-                row.classList.add('hidden');
-                row.classList.remove('visible');
+            // Status filter
+            if (selectedStatus !== 'all' && shipment.status !== selectedStatus) {
+                include = false;
             }
+
+            // Search filter
+            if (searchTerm) {
+                const matchesSearch = 
+                    (shipment.shipment_id && shipment.shipment_id.toLowerCase().includes(searchTerm)) ||
+                    (shipment.origin && shipment.origin.toLowerCase().includes(searchTerm)) ||
+                    (shipment.destination && shipment.destination.toLowerCase().includes(searchTerm));
+                if (!matchesSearch) include = false;
+            }
+
+            return include;
         });
 
-        // Show message if no results
-        const visibleRows = document.querySelectorAll('.shipment-row:not(.hidden)');
-        const noResultsRow = document.querySelector('.shipment-row[colspan]');
-        
-        if (visibleRows.length === 0 && !noResultsRow) {
-            // Add no results message
-            const tbody = document.getElementById('shipmentsTableBody');
-            const noResultsHtml = `
-                <tr>
-                    <td colspan="11" class="text-center py-5 text-muted">
-                        <i class="bi bi-search display-4 d-block mb-3"></i>
-                        No shipments found matching your criteria
-                    </td>
-                </tr>
-            `;
-            tbody.innerHTML = noResultsHtml;
-        } else if (visibleRows.length > 0 && noResultsRow) {
-            // Remove no results message
-            noResultsRow.remove();
-        }
+        currentPage = 1;
+        renderTable();
+        updatePaginationControls();
     }
 
     // Event listeners for filters
     statusFilter.addEventListener('change', filterShipments);
     searchInput.addEventListener('input', filterShipments);
-    carrierFilter.addEventListener('change', filterShipments);
+    searchInput.addEventListener('keypress', function(e) {
+        if (e.key === 'Enter') {
+            filterShipments();
+        }
+    });
 
     // Initialize filter on page load
     filterShipments();
 });
 
-function openShipmentDetails(id) {
-    let modal = new bootstrap.Modal(document.getElementById('shipmentDetailsModal'));
-    let content = document.getElementById('shipmentDetailsContent');
+// Pagination Functions
+function goToPreviousPage() {
+    if (currentPage > 1) {
+        currentPage--;
+        renderTable();
+        updatePaginationControls();
+    }
+}
+
+function goToNextPage() {
+    const totalPages = Math.ceil(filteredShipments.length / itemsPerPage);
+    if (currentPage < totalPages) {
+        currentPage++;
+        renderTable();
+        updatePaginationControls();
+    }
+}
+
+function updatePaginationControls() {
+    const totalPages = Math.ceil(filteredShipments.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, filteredShipments.length);
+    pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${filteredShipments.length} entries`;
+    
+    // Generate page numbers
+    paginationPages.innerHTML = '';
+    
+    if (totalPages <= 7) {
+        // Show all pages
+        for (let i = 1; i <= totalPages; i++) {
+            addPageButton(i, paginationPages);
+        }
+    } else {
+        // Show first page, current page range, and last page
+        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
+function renderTable() {
+    const tbody = document.getElementById('shipmentsTableBody');
+    
+    if (filteredShipments.length === 0) {
+        tbody.innerHTML = `
+            <tr>
+                <td colspan="12" class="text-center py-5 text-muted">
+                    <i class="bi bi-search display-4 d-block mb-3"></i>
+                    No shipments found matching your criteria
+                </td>
+            </tr>
+        `;
+        return;
+    }
+    
+    // Calculate pagination
+    const startIndex = (currentPage - 1) * itemsPerPage;
+    const endIndex = startIndex + itemsPerPage;
+    const paginatedItems = filteredShipments.slice(startIndex, endIndex);
+    
+    // Sort by creation date (newest first)
+    const sortedItems = [...paginatedItems].sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+    
+    // Render table rows
+    tbody.innerHTML = '';
+    sortedItems.forEach((shipment, index) => {
+        const displayIndex = filteredShipments.length - (startIndex + index);
+        const row = document.createElement('tr');
+        row.className = 'shipment-row';
+        row.setAttribute('data-status', shipment.status);
+        row.setAttribute('data-shipment-id', shipment.shipment_id);
+        
+        row.innerHTML = `
+            <td class="fw-bold">${displayIndex}</td>
+            <td>
+                <span class="fw-bold text-primary">
+                    ${shipment.shipment_id}
+                </span>
+            </td>
+            <td>${shipment.origin}</td>
+            <td>${shipment.destination}</td>
+            <td>${shipment.total_qty}</td>
+            <td>${shipment.total_kg} kg</td>
+            <td>${shipment.total_cbm} CBM</td>
+            <td class="fw-bold text-success">₹${parseFloat(shipment.total_amount).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
+            <td>
+                <span class="badge badge-${shipment.status}">
+                    ${shipment.status === 'pending' ? '<i class="bi bi-clock-fill status-icon"></i>' : ''}
+                    ${shipment.status === 'in_transit' ? '<i class="bi bi-truck status-icon"></i>' : ''}
+                    ${shipment.status === 'dispatched' ? '<i class="bi bi-box-seam status-icon"></i>' : ''}
+                    ${shipment.status === 'delivered' ? '<i class="bi bi-check-circle-fill status-icon"></i>' : ''}
+                    ${shipment.status.charAt(0).toUpperCase() + shipment.status.slice(1).replace('_', ' ')}
+                </span>
+            </td>
+            <td>${new Date(shipment.shipment_date).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })}</td>
+            <td>
+                <div class="action-buttons">
+                    <div class="action-container">
+                        <button type="button" class="btn-edit-status" onclick="toggleStatusDropdown(this, ${shipment.id})" title="Edit Status">
+                            <i class="bi bi-pencil"></i>
+                        </button>
+                        <div class="status-dropdown" id="statusDropdown-${shipment.id}">
+                            <form action="/admin/shipments/update-status" method="POST" class="status-form">
+                                <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                                <input type="hidden" name="shipment_id" value="${shipment.id}">
+                                <button type="submit" name="status" value="pending" class="status-option pending">
+                                    <span class="status-indicator pending"></span>
+                                    Pending
+                                </button>
+                                <button type="submit" name="status" value="in_transit" class="status-option in_transit">
+                                    <span class="status-indicator in_transit"></span>
+                                    In Transit
+                                </button>
+                                <button type="submit" name="status" value="dispatched" class="status-option dispatched">
+                                    <span class="status-indicator dispatched"></span>
+                                    Dispatched
+                                </button>
+                                <button type="submit" name="status" value="delivered" class="status-option delivered">
+                                    <span class="status-indicator delivered"></span>
+                                    Delivered
+                                </button>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </td>
+            <td>
+                <button type="button" class="btn-view" onclick="viewShipmentOrders(${shipment.id})" title="View Orders">
+                    <i class="bi bi-eye"></i>
+                </button>
+            </td>
+        `;
+        tbody.appendChild(row);
+    });
+}
+
+// Function to view shipment orders
+function viewShipmentOrders(shipmentId) {
+    currentShipmentId = shipmentId;
+    const modal = new bootstrap.Modal(document.getElementById('viewShipmentOrdersModal'));
+    const content = document.getElementById('shipmentOrdersContent');
+    const header = document.getElementById('shipmentOrdersHeader');
     
     content.innerHTML = `
         <div class="text-center py-4 loading">
             <div class="spinner-border text-primary" role="status">
                 <span class="visually-hidden">Loading...</span>
             </div>
-            <p class="mt-2 text-muted">Loading shipment details...</p>
+            <p class="mt-2 text-muted">Loading orders...</p>
         </div>
     `;
 
-    fetch(`/admin/shipments/${id}`)
+    fetch(`/admin/shipments/${shipmentId}/orders`)
         .then(res => {
             if (!res.ok) throw new Error('Network response was not ok');
             return res.json();
         })
         .then(data => {
-            // Format date properly
-            const shipmentDate = new Date(data.shipment.shipment_date);
-            const formattedDate = shipmentDate.toLocaleDateString('en-GB', {
-                day: '2-digit',
-                month: 'short',
-                year: 'numeric'
-            });
-
+            // Update header with shipment ID
+            header.textContent = data.shipment.shipment_id;
+            
             let html = `
                 <!-- Shipment Basic Info -->
                 <div class="shipment-info-row">
@@ -1291,15 +1816,19 @@ function openShipmentDetails(id) {
                     </div>
                     <div class="shipment-info-item">
                         <div class="shipment-info-label">Status</div>
-                        <div class="shipment-info-value">${data.shipment.status}</div>
+                        <div class="shipment-info-value">
+                            <span class="badge badge-${data.shipment.status}">
+                                ${data.shipment.status.charAt(0).toUpperCase() + data.shipment.status.slice(1).replace('_', ' ')}
+                            </span>
+                        </div>
                     </div>
                     <div class="shipment-info-item">
                         <div class="shipment-info-label">Date</div>
-                        <div class="shipment-info-value">${formattedDate}</div>
+                        <div class="shipment-info-value">${new Date(data.shipment.shipment_date).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })}</div>
                     </div>
                 </div>
 
-                <h6 class="fw-bold mt-4 mb-3">Detailed view of all orders in this shipment consolidation</h6>
+                <h6 class="fw-bold mt-4 mb-3">Detailed view of all orders in this shipment</h6>
 
                 <div class="table-responsive">
                     <table class="shipment-details-table">
@@ -1308,8 +1837,6 @@ function openShipmentDetails(id) {
                                 <th>Order ID</th>
                                 <th>Origin</th>
                                 <th>Destination</th>
-                                <th>Item No</th>
-                                <th>Description</th>
                                 <th>CTN</th>
                                 <th>QTY</th>
                                 <th>TTL/QTY</th>
@@ -1318,6 +1845,7 @@ function openShipmentDetails(id) {
                                 <th>KG</th>
                                 <th>TTL KG</th>
                                 <th>Amount (₹)</th>
+                                <th>Action</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -1325,12 +1853,10 @@ function openShipmentDetails(id) {
 
             data.orders.forEach(order => {
                 html += `
-                    <tr>
+                    <tr id="order-row-${order.id}">
                         <td class="fw-bold text-primary">${order.order_id}</td>
                         <td>${order.origin || 'N/A'}</td>
                         <td>${order.destination || 'N/A'}</td>
-                        <td>${order.mark_no || 'ITEM001'}</td>
-                        <td>${order.description || 'Manufacturing Equipment'}</td>
                         <td>${order.ctn}</td>
                         <td>${order.qty}</td>
                         <td>${order.ttl_qty}</td>
@@ -1339,6 +1865,11 @@ function openShipmentDetails(id) {
                         <td>${order.kg || '0.00'}</td>
                         <td>${order.ttl_kg || '0.00'}</td>
                         <td class="fw-bold text-success">₹${parseFloat(order.ttl_amount).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</td>
+                        <td>
+                            <button type="button" class="btn-delete-order" onclick="deleteOrderFromShipment(${order.id}, ${data.shipment.id})">
+                                <i class="bi bi-trash"></i> Remove
+                            </button>
+                        </td>
                     </tr>
                 `;
             });
@@ -1390,13 +1921,13 @@ function openShipmentDetails(id) {
             content.innerHTML = html;
         })
         .catch(error => {
-            console.error('Error loading shipment details:', error);
+            console.error('Error loading shipment orders:', error);
             content.innerHTML = `
                 <div class="text-center py-5">
                     <i class="bi bi-exclamation-triangle display-1 text-danger"></i>
-                    <h4 class="mt-3 text-danger">Error Loading Shipment Details</h4>
+                    <h4 class="mt-3 text-danger">Error Loading Orders</h4>
                     <p class="text-muted">Please try again later</p>
-                    <button class="btn btn-primary mt-2" onclick="openShipmentDetails(${id})">Retry</button>
+                    <button class="btn btn-primary mt-2" onclick="viewShipmentOrders(${shipmentId})">Retry</button>
                 </div>
             `;
         });
@@ -1404,6 +1935,136 @@ function openShipmentDetails(id) {
     modal.show();
 }
 
+// Function to show delete confirmation modal
+function deleteOrderFromShipment(orderId, shipmentId) {
+    document.getElementById('orderToDeleteId').value = orderId;
+    document.getElementById('shipmentToDeleteFromId').value = shipmentId;
+    
+    const deleteModal = new bootstrap.Modal(document.getElementById('deleteOrderModal'));
+    deleteModal.show();
+}
+
+// Function to confirm and delete order from shipment
+function confirmDeleteOrder() {
+    const orderId = document.getElementById('orderToDeleteId').value;
+    const shipmentId = document.getElementById('shipmentToDeleteFromId').value;
+    
+    // Create form data for DELETE request
+    const formData = new FormData();
+    formData.append('_method', 'DELETE');
+    formData.append('_token', '{{ csrf_token() }}');
+    
+    fetch(`/admin/shipments/${shipmentId}/orders/${orderId}`, {
+        method: 'POST',
+        body: formData,
+        headers: {
+            'X-CSRF-TOKEN': '{{ csrf_token() }}',
+            'X-Requested-With': 'XMLHttpRequest'
+        }
+    })
+    .then(response => {
+        if (!response.ok) {
+            throw new Error('Network response was not ok');
+        }
+        return response.json();
+    })
+    .then(data => {
+        if (data.success) {
+            // Close delete modal
+            const deleteModal = bootstrap.Modal.getInstance(document.getElementById('deleteOrderModal'));
+            deleteModal.hide();
+            
+            // Remove the order row from the table
+            const orderRow = document.getElementById(`order-row-${orderId}`);
+            if (orderRow) {
+                orderRow.remove();
+            }
+            
+            // Show success message
+            showAlert('Order removed successfully from shipment', 'success');
+            
+            // If there are no orders left, close the modal and refresh the page
+            if (data.orders_remaining === 0) {
+                const viewModal = bootstrap.Modal.getInstance(document.getElementById('viewShipmentOrdersModal'));
+                viewModal.hide();
+                location.reload();
+            } else {
+                // Update totals in the modal
+                updateShipmentTotals(data.shipment);
+            }
+        } else {
+            showAlert('Error removing order: ' + (data.message || 'Unknown error'), 'error');
+        }
+    })
+    .catch(error => {
+        console.error('Error deleting order:', error);
+        showAlert('Error removing order. Please try again.', 'error');
+    });
+}
+
+// Function to update shipment totals in the modal
+function updateShipmentTotals(shipment) {
+    // Update totals section
+    const totalsRow = document.querySelector('.shipment-totals-row');
+    if (totalsRow) {
+        totalsRow.innerHTML = `
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total CTN</div>
+                <div class="shipment-total-value total-ctn">${shipment.total_ctn}</div>
+            </div>
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total QTY</div>
+                <div class="shipment-total-value total-quantity">${shipment.total_qty}</div>
+            </div>
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total CBM</div>
+                <div class="shipment-total-value total-cbm">${shipment.total_cbm}</div>
+            </div>
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total KG</div>
+                <div class="shipment-total-value total-weight">${shipment.total_kg}</div>
+            </div>
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total TTL/QTY</div>
+                <div class="shipment-total-value total-quantity">${shipment.total_ttl_qty}</div>
+            </div>
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total TTL/CBM</div>
+                <div class="shipment-total-value total-ttl-cbm">${shipment.total_ttl_cbm}</div>
+            </div>
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total TTL/KG</div>
+                <div class="shipment-total-value total-ttl-kg">${shipment.total_ttl_kg}</div>
+            </div>
+            <div class="shipment-total-item">
+                <div class="shipment-total-label">Total Amount</div>
+                <div class="shipment-total-value total-amount">₹${parseFloat(shipment.total_amount).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})}</div>
+            </div>
+        `;
+    }
+}
+
+// Function to show alert messages
+function showAlert(message, type) {
+    const alertDiv = document.createElement('div');
+    alertDiv.className = `alert alert-${type === 'success' ? 'success' : 'danger'} alert-dismissible fade show position-fixed`;
+    alertDiv.style.cssText = 'top: 20px; right: 20px; z-index: 9999; min-width: 300px;';
+    alertDiv.innerHTML = `
+        <i class="bi ${type === 'success' ? 'bi-check-circle-fill' : 'bi-exclamation-triangle-fill'} me-2"></i>
+        ${message}
+        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+    `;
+    
+    document.body.appendChild(alertDiv);
+    
+    // Auto remove after 5 seconds
+    setTimeout(() => {
+        if (alertDiv.parentNode) {
+            alertDiv.parentNode.removeChild(alertDiv);
+        }
+    }, 5000);
+}
+
 // Toggle status dropdown
 function toggleStatusDropdown(button, shipmentId) {
     const dropdown = document.getElementById(`statusDropdown-${shipmentId}`);
diff --git a/routes/web.php b/routes/web.php
index 922b457..968d73e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,6 +32,8 @@ Route::prefix('admin')->group(function () {
 
     Route::post('/logout', [AdminAuthController::class, 'logout'])
         ->name('admin.logout');
+
+    
 });
 
 
@@ -111,23 +113,59 @@ Route::prefix('admin')
 
         Route::get('/orders/view/{id}', [AdminOrderController::class, 'popup'])
             ->name('admin.orders.popup');
-
-
+            
         // ---------------------------
-        // SHIPMENTS
+            // ORDERS (FIXED ROUTES)
+            // ---------------------------
+
+            // Add item to order
+            Route::post('/orders/{order}/item', [AdminOrderController::class, 'addItem'])
+                ->name('admin.orders.addItem');
+
+            // Delete item from order
+            Route::delete('/orders/item/{id}', [AdminOrderController::class, 'deleteItem'])
+                ->name('admin.orders.deleteItem');
+
+            // Restore deleted item
+            Route::post('/orders/item/{id}/restore', [AdminOrderController::class, 'restoreItem'])
+                ->name('admin.orders.restoreItem');
+
+            // Update main order fields
+            Route::post('/orders/{id}/update', [AdminOrderController::class, 'update'])
+                ->name('admin.orders.update');
+
+            // Delete full order
+            Route::delete('/orders/{id}/delete', [AdminOrderController::class, 'destroy'])
+                ->name('admin.orders.destroy');
+                
+        // ---------------------------
+        // SHIPMENTS (FIXED ROUTES)
         // ---------------------------
         Route::get('/shipments', [ShipmentController::class, 'index'])
             ->name('admin.shipments');
 
-        Route::post('/shipments/store', [ShipmentController::class, 'store'])
+        Route::post('/shipments', [ShipmentController::class, 'store'])
             ->name('admin.shipments.store');
 
         Route::post('/shipments/update-status', [ShipmentController::class, 'updateStatus'])
             ->name('admin.shipments.updateStatus');
 
+        // Get shipment orders for modal (AJAX)
+        Route::get('/shipments/{id}/orders', [ShipmentController::class, 'getShipmentOrders'])
+            ->name('admin.shipments.orders');
+
+        // Get shipment details for edit (AJAX)
         Route::get('/shipments/{id}', [ShipmentController::class, 'show'])
             ->name('admin.shipments.show');
 
+        // Shipment Update
+        Route::put('/shipments/{id}', [ShipmentController::class, 'update'])
+            ->name('admin.shipments.update');
+
+        // Shipment Delete
+        Route::delete('/shipments/{id}', [ShipmentController::class, 'destroy'])
+            ->name('admin.shipments.destroy');
+
 
         // ---------------------------
         // INVOICES
@@ -180,36 +218,67 @@ Route::prefix('admin')
             ->name('admin.customers.status');
     });
 
-
-// ==========================================
-// ADMIN ACCOUNT (AJAX) ROUTES
-// ==========================================
-Route::prefix('admin/account')
-    ->middleware('auth:admin')
-    ->name('admin.account.')
-    ->group(function () {
-
-        Route::get('/dashboard', [AdminAccountController::class, 'getDashboardData'])
-            ->name('dashboard');
-
-        Route::get('/available-orders', [AdminAccountController::class, 'getAvailableOrders'])
-            ->name('orders.available');
-
-        Route::post('/create-order', [AdminAccountController::class, 'accountCreateOrder'])
-            ->name('create');
-
-        Route::post('/toggle-payment', [AdminAccountController::class, 'togglePayment'])
-            ->name('toggle');
-
-        Route::post('/installment/create', [AdminAccountController::class, 'addInstallment'])
-            ->name('installment.create');
-
-        Route::post('/installment/update-status', [AdminAccountController::class, 'updateInstallmentStatus'])
-            ->name('installment.update');
-
-        Route::get('/entry/{entry_no}', [AdminAccountController::class, 'getEntryDetails'])
-            ->name('entry.details');
-    });
+    // ==========================================
+    // ADMIN ACCOUNT (AJAX) ROUTES
+    // ==========================================
+    Route::prefix('admin/account')
+        ->middleware('auth:admin')
+        ->name('admin.account.')
+        ->group(function () {
+    
+            Route::get('/dashboard', [AdminAccountController::class, 'getDashboardData'])
+                ->name('dashboard');
+    
+            Route::get('/available-orders', [AdminAccountController::class, 'getAvailableOrders'])
+                ->name('orders.available');
+    
+            Route::post('/create-order', [AdminAccountController::class, 'accountCreateOrder'])
+                ->name('create');
+    
+            Route::post('/toggle-payment', [AdminAccountController::class, 'togglePayment'])
+                ->name('toggle');
+    
+            Route::post('/installment/create', [AdminAccountController::class, 'addInstallment'])
+                ->name('installment.create');
+    
+            Route::post('/installment/update-status', [AdminAccountController::class, 'updateInstallmentStatus'])
+                ->name('installment.update');
+    
+            Route::get('/entry/{entry_no}', [AdminAccountController::class, 'getEntryDetails'])
+                ->name('entry.details');
+    
+            // ⬇⬇ NEW ROUTES FOR EDIT + DELETE ⬇⬇
+            Route::post('/update-entry', [AdminAccountController::class, 'updateEntry'])
+                ->name('update.entry');
+    
+            Route::post('/delete-entry', [AdminAccountController::class, 'deleteEntry'])
+                ->name('delete.entry');
 
 
+                // ===== Associated Orders Routes (EDIT MODAL साठी) =====
+                Route::post('/add-orders-to-entry', [AdminAccountController::class, 'addOrdersToEntry'])
+                    ->name('add.orders.to.entry');
+        
+                Route::get('/entry-orders/{entry_no}', [AdminAccountController::class, 'getEntryOrders'])
+                    ->name('entry.orders');
+        
+                Route::post('/remove-order-from-entry', [AdminAccountController::class, 'removeOrderFromEntry'])
+                    ->name('remove.order.from.entry');
+
+            
+        });
+
+   
+
+
+        // ---------------------------
+        // REPORTS DOWNLOAD ROUTES
+        // ---------------------------
+        Route::get('/admin/orders/download/pdf', [OrderController::class, 'downloadPdf'])->name('admin.orders.download.pdf');
+        Route::get('/admin/orders/download/excel', [OrderController::class, 'downloadExcel'])->name('admin.orders.download.excel');
+
+        //---------------------------
+          //Edit Button Route
+        //---------------------------
+