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

.env.example

@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=
+APP_KEY=base64:/ulhRgiCOFjZV6xUDkXLfiR9X8iFRZ4QIiX3UJbdwY4=
 APP_DEBUG=true
 APP_URL=http://localhost
 
@@ -20,12 +20,12 @@ LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-DB_CONNECTION=sqlite
-# DB_HOST=127.0.0.1
-# DB_PORT=3306
-# DB_DATABASE=laravel
-# DB_USERNAME=root
-# DB_PASSWORD=
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=kent_logistics6
+DB_USERNAME=root
+DB_PASSWORD=
 
 SESSION_DRIVER=database
 SESSION_LIFETIME=120

app/Exports/InvoicesExport.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Exports;
+
+use Illuminate\Contracts\View\View;
+use Maatwebsite\Excel\Concerns\FromView;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class InvoicesExport implements FromView
+{
+    protected $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function view(): View
+    {
+        $request = $this->request;
+
+        $invoices = DB::table('invoices')
+            ->leftJoin('containers', 'containers.id', '=', 'invoices.container_id')
+            ->leftJoin('mark_list', 'mark_list.mark_no', '=', 'invoices.mark_no')
+            ->select(
+                'invoices.invoice_number',
+                'invoices.invoice_date',
+                'invoices.mark_no',
+                'containers.container_number',
+                'containers.container_date',
+                DB::raw('COALESCE(invoices.company_name, mark_list.company_name) as company_name'),
+                DB::raw('COALESCE(invoices.customer_name, mark_list.customer_name) as customer_name'),
+                'invoices.final_amount',
+                'invoices.final_amount_with_gst',
+                'invoices.status as invoice_status'
+            )
+            ->when($request->filled('search'), function ($q) use ($request) {
+                $search = trim($request->search);
+                $q->where(function ($qq) use ($search) {
+                    $qq->where('invoices.invoice_number', 'like', "%{$search}%")
+                        ->orWhere('invoices.mark_no', 'like', "%{$search}%")
+                        ->orWhere('containers.container_number', 'like', "%{$search}%")
+                        ->orWhere('mark_list.company_name', 'like', "%{$search}%")
+                        ->orWhere('mark_list.customer_name', 'like', "%{$search}%");
+                });
+            })
+            ->when($request->filled('status'), function ($q) use ($request) {
+                $q->where('invoices.status', $request->status);
+            })
+            ->when($request->filled('from_date'), function ($q) use ($request) {
+                $q->whereDate('invoices.invoice_date', '>=', $request->from_date);
+            })
+            ->when($request->filled('to_date'), function ($q) use ($request) {
+                $q->whereDate('invoices.invoice_date', '<=', $request->to_date);
+            })
+            ->orderByDesc('containers.container_date')
+            ->orderByDesc('invoices.id')
+            ->get();
+
+        return view('admin.pdf.invoices_excel', compact('invoices'));
+    }
+}

app/Http/Controllers/Admin/AdminAuthController.php

@@ -5,6 +5,10 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use App\Models\Container;
+use App\Models\Invoice;
+use App\Models\User;
+use App\Models\MarkList;
 
 class AdminAuthController extends Controller
 {
@@ -31,16 +35,15 @@ class AdminAuthController extends Controller
         }
 
         $credentials = [
-            $field => $loginInput,
+            $field     => $loginInput,
             'password' => $request->password,
         ];
 
-        // attempt login
         if (Auth::guard('admin')->attempt($credentials)) {
             $request->session()->regenerate();
             $user = Auth::guard('admin')->user();
-
-            return redirect()->route('admin.dashboard')->with('success', 'Welcome back, ' . $user->name . '!');
+            return redirect()->route('admin.dashboard')
+                ->with('success', 'Welcome back, ' . $user->name . '!');
         }
 
         return back()->withErrors(['login' => 'Invalid login credentials.']);
@@ -51,6 +54,25 @@ class AdminAuthController extends Controller
         Auth::guard('admin')->logout();
         $request->session()->invalidate();
         $request->session()->regenerateToken();
-        return redirect()->route('admin.login')->with('success', 'Logged out successfully.');
+        return redirect()->route('admin.login')
+            ->with('success', 'Logged out successfully.');
     }
-}
+
+    public function profile()
+    {
+        $user = Auth::guard('admin')->user();
+
+        // ── Real Stats ──
+        $stats = [
+            'total_containers' => Container::count(),
+            'total_invoices'   => Invoice::count(),
+            'paid_invoices'    => Invoice::where('status', 'paid')->count(),
+            'pending_invoices' => Invoice::where('status', 'pending')->count(),
+            'total_customers'  => User::count(),
+            'total_marklist'   => MarkList::count(),
+            'active_marklist'  => MarkList::where('status', 'active')->count(),
+        ];
+
+        return view('admin.profile', compact('user', 'stats'));
+    }
+}

app/Http/Controllers/Admin/AdminInvoiceController.php

@@ -3,167 +3,237 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
 use App\Models\Invoice;
 use App\Models\InvoiceItem;
-use Mpdf\Mpdf;
 use App\Models\InvoiceInstallment;
+use App\Models\InvoiceChargeGroup;
+use App\Models\InvoiceChargeGroupItem;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use Barryvdh\DomPDF\Facade\Pdf;
+use Mpdf\Mpdf;
 
 class AdminInvoiceController extends Controller
 {
     // -------------------------------------------------------------
     // INVOICE LIST PAGE
     // -------------------------------------------------------------
-    public function index()
+    public function index(Request $request)
     {
-        $invoices = Invoice::with(['order.shipments'])->latest()->get();
+        $query = Invoice::with(['items', 'customer', 'container']);
+
+        if ($request->filled('search')) {
+            $search = $request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('invoice_number', 'like', "%{$search}%")
+                    ->orWhere('customer_name', 'like', "%{$search}%");
+            });
+        }
+
+        if ($request->filled('status') && $request->status !== 'all') {
+            $query->where('status', $request->status);
+        }
+
+        if ($request->filled('start_date')) {
+            $query->whereDate('invoice_date', '>=', $request->start_date);
+        }
+
+        if ($request->filled('end_date')) {
+            $query->whereDate('invoice_date', '<=', $request->end_date);
+        }
+
+        $invoices = $query->latest()->get();
+
         return view('admin.invoice', compact('invoices'));
     }
 
     // -------------------------------------------------------------
-    // POPUP VIEW (AJAX)
+    // POPUP VIEW
     // -------------------------------------------------------------
     public function popup($id)
-    {
-        $invoice = Invoice::with(['items', 'order', 'installments'])->findOrFail($id);
+{
+    $invoice = Invoice::with([
+        'items',
+        'chargeGroups.items',
+    ])->findOrFail($id);
 
-    $shipment = \App\Models\Shipment::whereHas('items', function ($q) use ($invoice) {
-        $q->where('order_id', $invoice->order_id);
-    })->first();
+    $shipment = null;
 
-    return view('admin.popup_invoice', compact('invoice', 'shipment'));
-    }
+    $groupedItemIds = $invoice->chargeGroups
+        ->flatMap(fn($group) => $group->items->pluck('invoice_item_id'))
+        ->unique()
+        ->values()
+        ->toArray();
+
+    return view('admin.popup_invoice', compact('invoice', 'shipment', 'groupedItemIds'));
+}
 
     // -------------------------------------------------------------
     // EDIT INVOICE PAGE
     // -------------------------------------------------------------
     public function edit($id)
     {
-        $invoice = Invoice::with(['order.shipments'])->findOrFail($id);
-    $shipment = $invoice->order?->shipments?->first();
-
-    // ADD THIS SECTION: Calculate customer's total due across all invoices
-    $customerTotalDue = Invoice::where('customer_id', $invoice->customer_id)
-        ->where('status', '!=', 'cancelled')
-        ->where('status', '!=', 'void')
-        ->sum('final_amount_with_gst');
-
-    // Pass the new variable to the view
-    return view('admin.invoice_edit', compact('invoice', 'shipment', 'customerTotalDue'));
+        $invoice = Invoice::with([
+            'items',
+            'customer',
+            'container',
+            'chargeGroups.items',
+            'installments',
+        ])->findOrFail($id);
+    
+        // ✅ Customer details sync — जर test data आला असेल तर fix होईल
+        if ($invoice->customer) {
+            $needsUpdate = [];
+    
+            if (empty($invoice->customer_email) || $invoice->customer_email === 'test@demo.com') {
+                $needsUpdate['customer_email'] = $invoice->customer->email;
+            }
+    
+            if (empty($invoice->customer_address) || $invoice->customer_address === 'TEST ADDRESS') {
+                $needsUpdate['customer_address'] = $invoice->customer->address;
+            }
+    
+            if (empty($invoice->pincode) || $invoice->pincode === '999999') {
+                $needsUpdate['pincode'] = $invoice->customer->pincode;
+            }
+    
+            if (!empty($needsUpdate)) {
+                $invoice->update($needsUpdate);
+                $invoice->refresh();
+            }
+        }
+    
+        $shipment = null;
+    
+        $groupedItemIds = $invoice->chargeGroups
+            ->flatMap(function ($group) {
+                return $group->items->pluck('invoice_item_id');
+            })
+            ->unique()
+            ->values()
+            ->toArray();
+    
+        return view('admin.invoice_edit', compact('invoice', 'shipment', 'groupedItemIds'));
     }
 
     // -------------------------------------------------------------
-    // UPDATE INVOICE
+    // UPDATE INVOICE (HEADER ONLY)
     // -------------------------------------------------------------
     public function update(Request $request, $id)
     {
-        Log::info("🟡 Invoice Update Request Received", [
+        Log::info('🟡 Invoice Update Request Received', [
             'invoice_id' => $id,
-            'request'    => $request->all()
+            'request'    => $request->all(),
         ]);
 
         $invoice = Invoice::findOrFail($id);
 
         $data = $request->validate([
-            'invoice_date'      => 'required|date',
-            'due_date'          => 'required|date|after_or_equal:invoice_date',
-            'final_amount'      => 'required|numeric|min:0',
-            'tax_type'          => 'required|in:gst,igst',
-            'tax_percent'       => 'required|numeric|min:0|max:28',
-            'status'            => 'required|in:pending,paid,overdue',
-            'notes'             => 'nullable|string',
+            'invoice_date' => 'required|date',
+            'due_date'     => 'required|date|after_or_equal:invoice_date',
+            'status' => 'required|in:pending,paying,paid,overdue',
+            'notes'        => 'nullable|string',
         ]);
 
-        Log::info("✅ Validated Invoice Update Data", $data);
-
-        $finalAmount = floatval($data['final_amount']);
-        $taxPercent  = floatval($data['tax_percent']);
-        $taxAmount   = 0;
-
-        if ($data['tax_type'] === 'gst') {
-            Log::info("🟢 GST Selected", compact('taxPercent'));
-            $data['cgst_percent'] = $taxPercent / 2;
-            $data['sgst_percent'] = $taxPercent / 2;
-            $data['igst_percent'] = 0;
-        } else {
-            Log::info("🔵 IGST Selected", compact('taxPercent'));
-            $data['cgst_percent'] = 0;
-            $data['sgst_percent'] = 0;
-            $data['igst_percent'] = $taxPercent;
-        }
-
-        $taxAmount = ($finalAmount * $taxPercent) / 100;
-
-        $data['gst_amount'] = $taxAmount;
-        $data['final_amount_with_gst'] = $finalAmount + $taxAmount;
-        $data['gst_percent'] = $taxPercent;
-
-        Log::info("📌 Final Calculated Invoice Values", [
-            'invoice_id'             => $invoice->id,
-            'final_amount'           => $finalAmount,
-            'gst_amount'             => $data['gst_amount'],
-            'final_amount_with_gst'  => $data['final_amount_with_gst'],
-            'tax_type'               => $data['tax_type'],
-            'cgst_percent'           => $data['cgst_percent'],
-            'sgst_percent'           => $data['sgst_percent'],
-            'igst_percent'           => $data['igst_percent'],
-        ]);
+        Log::info('✅ Validated Invoice Header Update Data', $data);
 
         $invoice->update($data);
+        $invoice->refresh();
 
-        Log::info("✅ Invoice Updated Successfully", [
-            'invoice_id' => $invoice->id
+        Log::info('🔍 Invoice AFTER HEADER UPDATE', [
+            'invoice_id'              => $invoice->id,
+            'charge_groups_total'     => $invoice->charge_groups_total,
+            'gst_amount'              => $invoice->gst_amount,
+            'grand_total_with_charges'=> $invoice->grand_total_with_charges,
         ]);
 
-        // regenerate PDF
         $this->generateInvoicePDF($invoice);
 
         return redirect()
-            ->route('admin.invoices.index')
-            ->with('success', 'Invoice updated & PDF generated successfully.');
+        ->route('admin.invoices.edit', $invoice->id)
+        ->with('success', 'Invoice updated & PDF generated successfully.');
     }
 
     // -------------------------------------------------------------
-    // PDF GENERATION USING mPDF
+    // UPDATE INVOICE ITEMS (फक्त items save)
+    // -------------------------------------------------------------
+    public function updateItems(Request $request, Invoice $invoice)
+    {
+        Log::info('🟡 Invoice Items Update Request', [
+            'invoice_id' => $invoice->id,
+            'payload'    => $request->all(),
+        ]);
+
+        $data = $request->validate([
+            'items'              => ['required', 'array'],
+            'items.*.price'      => ['required', 'numeric', 'min:0'],
+            'items.*.ttl_amount' => ['required', 'numeric', 'min:0'],
+        ]);
+
+        foreach ($data['items'] as $itemId => $itemData) {
+            $item = InvoiceItem::where('id', $itemId)
+                ->where('invoice_id', $invoice->id)
+                ->first();
+
+            if (!$item) {
+                Log::warning('Invoice item not found or mismatched invoice', [
+                    'invoice_id' => $invoice->id,
+                    'item_id'    => $itemId,
+                ]);
+                continue;
+            }
+
+            $item->price      = $itemData['price'];
+            $item->ttl_amount = $itemData['ttl_amount'];
+            $item->save();
+        }
+
+        Log::info('✅ Invoice items updated (no totals recalculation)', [
+            'invoice_id' => $invoice->id,
+        ]);
+
+        return back()->with('success', 'Invoice items updated successfully.');
+    }
+
+    // -------------------------------------------------------------
+    // PDF GENERATION
     // -------------------------------------------------------------
     public function generateInvoicePDF($invoice)
     {
-        $invoice->load(['items', 'order.shipments']);
-        $shipment = $invoice->order?->shipments?->first();
+        $invoice->load(['items', 'customer', 'container']);
+        $shipment = null;
+
         $fileName = 'invoice-' . $invoice->invoice_number . '.pdf';
-        $folder = public_path('invoices/');
+        $folder   = public_path('invoices/');
 
         if (!file_exists($folder)) {
             mkdir($folder, 0777, true);
         }
 
         $filePath = $folder . $fileName;
+
         if (file_exists($filePath)) {
             unlink($filePath);
         }
 
-        $mpdf = new Mpdf(['mode' => 'utf-8', 'format' => 'A4', 'default_font' => 'sans-serif']);
-        $html = view('admin.pdf.invoice', ['invoice' => $invoice, 'shipment' => $shipment])->render();
+        $mpdf = new Mpdf([
+            'mode'         => 'utf-8',
+            'format'       => 'A4',
+            'default_font' => 'sans-serif',
+        ]);
+
+        $html = view('admin.pdf.invoice', [
+            'invoice'  => $invoice,
+            'shipment' => $shipment,
+        ])->render();
+
         $mpdf->WriteHTML($html);
         $mpdf->Output($filePath, 'F');
+
         $invoice->update(['pdf_path' => 'invoices/' . $fileName]);
     }
 
-    public function downloadInvoice($id)
-{
-   $invoice = Invoice::findOrFail($id);
-
-    // ALWAYS regenerate to reflect latest HTML/CSS
-    $this->generateInvoicePDF($invoice);
-    $invoice->refresh();
-
-    return response()->download(public_path($invoice->pdf_path));
-}
-
     // -------------------------------------------------------------
-    // INSTALLMENTS (ADD/DELETE)
+    // INSTALLMENTS (ADD)
     // -------------------------------------------------------------
     public function storeInstallment(Request $request, $invoice_id)
     {
@@ -176,14 +246,15 @@ class AdminInvoiceController extends Controller
 
         $invoice = Invoice::findOrFail($invoice_id);
 
+        $grandTotal = $invoice->grand_total_with_charges ?? 0;
+
         $paidTotal = $invoice->installments()->sum('amount');
-        // Use GST-inclusive total for all calculations/checks
-        $remaining = $invoice->final_amount_with_gst - $paidTotal;
+        $remaining = $grandTotal - $paidTotal;
 
         if ($request->amount > $remaining) {
             return response()->json([
-                'status' => 'error',
-                'message' => 'Installment amount exceeds remaining balance.'
+                'status'  => 'error',
+                'message' => 'Installment amount exceeds remaining balance.',
             ], 422);
         }
 
@@ -195,54 +266,202 @@ class AdminInvoiceController extends Controller
             'amount'           => $request->amount,
         ]);
 
-        $newPaid = $paidTotal + $request->amount;
+        $newPaid   = $paidTotal + $request->amount;
+        $remaining = max(0, $grandTotal - $newPaid);
 
-        // Mark as 'paid' if GST-inclusive total is cleared
-        if ($newPaid >= $invoice->final_amount_with_gst) {
-            $invoice->update(['status' => 'paid']);
 
-            $this->generateInvoicePDF($invoice);
-        }
+
+        // Full payment logic (जर पूर्ण भरले तर status paid करणे, नाहीतर pending राहील)
+        // if ($newPaid >= $grandTotal && $grandTotal > 0) {
+        //     $invoice->update([
+        //         'payment_method' => $request->payment_method,
+        //         'reference_no'   => $request->reference_no,
+        //         'status'         => ($newPaid >= $grandTotal && $grandTotal > 0) ? 'paid' : $invoice->status,
+        //     ]);
+        // }
+
+        // Partial payment status logic:
+        $invoice->update([
+            'payment_method' => $request->payment_method,
+            'reference_no'   => $request->reference_no,
+            'status' => ($newPaid >= $grandTotal && $grandTotal > 0) ? 'paid' : $invoice->status,
+        ]);
 
         return response()->json([
-            'status'              => 'success',
-            'message'             => 'Installment added successfully.',
-            'installment'         => $installment,
-            'totalPaid'           => $newPaid,
-            'gstAmount'           => $invoice->gst_amount,
-            'finalAmountWithGst'  => $invoice->final_amount_with_gst,
-            'baseAmount'          => $invoice->final_amount,
-            'remaining'           => max(0, $invoice->final_amount_with_gst - $newPaid),
-            'isCompleted'         => $newPaid >= $invoice->final_amount_with_gst
+            'status'            => 'success',
+            'message'           => 'Installment added successfully.',
+            'installment'       => $installment,
+            'chargeGroupsTotal' => $invoice->charge_groups_total ?? 0,
+            'gstAmount'         => $invoice->gst_amount ?? 0,
+            'grandTotal'        => $grandTotal,
+            'totalPaid'         => $newPaid,
+            'remaining'         => $remaining,
+            'isCompleted'       => $remaining <= 0,
+            'isZero'            => $newPaid == 0,
         ]);
     }
+
+    // -------------------------------------------------------------
+    // INSTALLMENTS (DELETE)
+    // -------------------------------------------------------------
     public function deleteInstallment($id)
     {
         $installment = InvoiceInstallment::findOrFail($id);
-        $invoice = $installment->invoice;
-    
-        $installment->delete();
-    
-        $paidTotal = $invoice->installments()->sum('amount');
-        $remaining = $invoice->final_amount_with_gst - $paidTotal;
-    
-        // Update status if not fully paid anymore
-        if ($remaining > 0 && $invoice->status === "paid") {
-            $invoice->update(['status' => 'pending']);
+        $invoice     = $installment->invoice;
 
-            $this->generateInvoicePDF($invoice);
+        $installment->delete();
+        $invoice->refresh();
+
+        $grandTotal = $invoice->grand_total_with_charges ?? 0;
+
+        $paidTotal = $invoice->installments()->sum('amount');
+        $remaining = max(0, $grandTotal - $paidTotal);
+
+        if ($paidTotal <= 0 && $grandTotal > 0) {
+            $invoice->update(['status' => 'pending']);
+        } elseif ($paidTotal > 0 && $paidTotal < $grandTotal) {
+            $invoice->update(['status' => 'pending']);
         }
-    
+
         return response()->json([
-            'status'              => 'success',
-            'message'             => 'Installment deleted.',
-            'totalPaid'           => $paidTotal,
-            'gstAmount'           => $invoice->gst_amount,
-            'finalAmountWithGst'  => $invoice->final_amount_with_gst,
-            'baseAmount'          => $invoice->final_amount,
-            'remaining'           => $remaining,
-            'isZero'              => $paidTotal == 0
+            'status'            => 'success',
+            'message'           => 'Installment deleted.',
+            'chargeGroupsTotal' => $invoice->charge_groups_total ?? 0,
+            'gstAmount'         => $invoice->gst_amount ?? 0,
+            'grandTotal'        => $grandTotal,
+            'totalPaid'         => $paidTotal,
+            'remaining'         => $remaining,
+            'isZero'            => $paidTotal == 0,
         ]);
     }
+
+    // -------------------------------------------------------------
+    // CHARGE GROUP SAVE
+    // -------------------------------------------------------------
+    public function storeChargeGroup(Request $request, $invoiceId)
+    {
+        Log::info('🟡 storeChargeGroup HIT', [
+            'invoice_id' => $invoiceId,
+            'payload'    => $request->all(),
+        ]);
     
-}
+        $invoice = Invoice::with('items', 'chargeGroups')->findOrFail($invoiceId);
+    
+        $data = $request->validate([
+            'groupname'      => 'required|string|max:255',
+            'basistype'      => 'required|in:ttl_qty,amount,ttl_cbm,ttl_kg',
+            'basisvalue'     => 'required|numeric',
+            'rate'           => 'required|numeric|min:0.0001',
+            'autototal'      => 'required|numeric|min:0.01',
+            'itemids'        => 'required|array',
+            'itemids.*'      => 'integer|exists:invoice_items,id',
+    
+            'tax_type'       => 'nullable|in:none,gst,igst',
+            'gst_percent'    => 'nullable|numeric|min:0|max:28',
+            'total_with_gst' => 'nullable|numeric|min:0',
+        ]);
+    
+        Log::info('✅ storeChargeGroup VALIDATED', $data);
+    
+        // duplicate name check
+        $exists = InvoiceChargeGroup::where('invoice_id', $invoice->id)
+            ->where('group_name', $data['groupname'])
+            ->exists();
+    
+        if ($exists) {
+            return back()
+                ->withErrors(['groupname' => 'This group name is already used for this invoice.'])
+                ->withInput();
+        }
+    
+        $taxType    = $data['tax_type']    ?? 'gst';
+        $gstPercent = $data['gst_percent'] ?? 0;
+        $baseTotal  = $data['autototal'];
+    
+        $totalWithGst = $data['total_with_gst'] ?? $baseTotal;
+        if ($totalWithGst == 0 && $gstPercent > 0) {
+            $gstAmount    = ($baseTotal * $gstPercent) / 100;
+            $totalWithGst = $baseTotal + $gstAmount;
+        }
+    
+        // 1) Group create
+        $group = InvoiceChargeGroup::create([
+            'invoice_id'     => $invoice->id,
+            'group_name'     => $data['groupname'],
+            'basis_type'     => $data['basistype'],
+            'basis_value'    => $data['basisvalue'],
+            'rate'           => $data['rate'],
+            'total_charge'   => $baseTotal,
+            'tax_type'       => $taxType,
+            'gst_percent'    => $gstPercent,
+            'total_with_gst' => $totalWithGst,
+        ]);
+    
+        // 2) Items link
+        foreach ($data['itemids'] as $itemId) {
+            InvoiceChargeGroupItem::create([
+                'group_id'        => $group->id,
+                'invoice_item_id' => $itemId,
+            ]);
+        }
+    
+        // 3) सर्व groups वरून invoice level totals
+        $invoice->load('chargeGroups');
+    
+        $chargeGroupsBase  = $invoice->chargeGroups->sum('total_charge');      // base
+        $chargeGroupsWithG = $invoice->chargeGroups->sum('total_with_gst');    // base + gst
+        $chargeGroupsGst   = $chargeGroupsWithG - $chargeGroupsBase;           // gst only
+    
+        $invoiceGstPercent = $group->gst_percent ?? 0;
+        $invoiceTaxType    = $group->tax_type    ?? 'gst';
+    
+        $cgstPercent = 0;
+        $sgstPercent = 0;
+        $igstPercent = 0;
+    
+        if ($invoiceTaxType === 'gst') {
+            $cgstPercent = $invoiceGstPercent / 2;
+            $sgstPercent = $invoiceGstPercent / 2;
+        } elseif ($invoiceTaxType === 'igst') {
+            $igstPercent = $invoiceGstPercent;
+        }
+    
+        // 🔴 इथे main fix:
+        // final_amount      = base (total_charge sum)
+        // final_amount_with_gst = base + gst (total_with_gst sum)
+        // grand_total_with_charges = final_amount_with_gst (same)
+        $invoice->update([
+            'charge_groups_total'      => $chargeGroupsBase,
+            'gst_amount'               => $chargeGroupsGst,
+            'gst_percent'              => $invoiceGstPercent,
+            'tax_type'                 => $invoiceTaxType,
+            'cgst_percent'             => $cgstPercent,
+            'sgst_percent'             => $sgstPercent,
+            'igst_percent'             => $igstPercent,
+    
+            'final_amount'             => $chargeGroupsBase,
+            'final_amount_with_gst'    => $chargeGroupsWithG,
+            'grand_total_with_charges' => $chargeGroupsWithG,
+        ]);
+    
+        Log::info('✅ Invoice updated from Charge Group (CG total + GST)', [
+            'invoice_id'              => $invoice->id,
+            'charge_groups_total'     => $chargeGroupsBase,
+            'gst_amount'              => $chargeGroupsGst,
+            'gst_percent'             => $invoiceGstPercent,
+            'tax_type'                => $invoiceTaxType,
+            'cgst_percent'            => $cgstPercent,
+            'sgst_percent'            => $sgstPercent,
+            'igst_percent'            => $igstPercent,
+            'final_amount'            => $invoice->final_amount,
+            'final_amount_with_gst'   => $invoice->final_amount_with_gst,
+            'grand_total_with_charges'=> $invoice->grand_total_with_charges,
+        ]);
+    
+       return response()->json([
+            'success' => true,
+            'message' => 'Charge group saved successfully.',
+            'group_id' => $group->id,
+        ]);
+    }
+}    

app/Http/Controllers/Admin/AdminOrderController.php

@@ -10,26 +10,118 @@ use App\Models\MarkList;
 use App\Models\Invoice;
 use App\Models\InvoiceItem;
 use App\Models\User;
+use App\Models\Container;
+use App\Models\Admin;
+use App\Models\Shipment;
 use PDF;
 use Maatwebsite\Excel\Facades\Excel;
 use App\Exports\OrdersExport;
 use App\Imports\OrderItemsPreviewImport;
-
-
 use Illuminate\Validation\ValidationException;
-
+use Illuminate\Support\Facades\DB;
+use App\Exports\InvoicesExport;
 
 class AdminOrderController extends Controller
 {
     /* ---------------------------
-     * LIST / DASHBOARD
+     * DASHBOARD (old UI: stats + recent orders)
      * ---------------------------*/
-    public function index()
+    public function dashboard()
     {
-        $orders   = Order::latest()->get();
-        $markList = MarkList::where('status', 'active')->get();
+        // ── Order counts (from Invoice Management / Orders table) ──
+        $totalOrders = Order::count();
 
-        return view('admin.dashboard', compact('orders', 'markList'));
+        // "Pending" म्हणजे delivered नसलेले सर्व orders
+        // Order तयार होतो तेव्हा status = 'order_placed' असतो, 'pending' नाही
+        $deliveredStatuses = ['delivered'];
+        $pendingOrders     = Order::whereNotIn('status', $deliveredStatuses)->count();
+
+        // ── Invoice counts ──
+        $totalContainers   = Container::count();
+        $totalInvoices     = Invoice::count();
+        $paidInvoices      = Invoice::where('status', 'paid')->count();
+        $pendingInvoices   = Invoice::where('status', 'pending')->count();
+        $overdueInvoices   = Invoice::where('status', 'overdue')->count();
+        $totalRevenue      = Invoice::sum('final_amount_with_gst');
+
+        // ── User / Staff counts ──
+        $activeCustomers   = User::where('status', 'active')->count();
+        $inactiveCustomers = User::where('status', 'inactive')->count();
+        $totalStaff        = Admin::where('type', 'staff')->count();
+
+        $markList = MarkList::where('status', 'active')->get();
+        $orders   = Order::latest()->get();
+
+        return view('admin.dashboard', compact(
+            'totalOrders',
+            'pendingOrders',
+            'totalContainers',
+            'totalInvoices',
+            'paidInvoices',
+            'pendingInvoices',
+            'overdueInvoices',
+            'totalRevenue',
+            'activeCustomers',
+            'inactiveCustomers',
+            'totalStaff',
+            'orders',
+            'markList'
+        ));
+    }
+
+    /* ---------------------------
+     * LIST (new: Invoices Management for Orders page)
+     * ---------------------------*/
+    public function index(Request $request)
+    {
+        $invoices = DB::table('invoices')
+        ->leftJoin('containers', 'containers.id', '=', 'invoices.container_id')
+        ->leftJoin('mark_list', 'mark_list.mark_no', '=', 'invoices.mark_no')
+        ->select(
+            'invoices.id',
+            'invoices.invoice_number',
+            'invoices.invoice_date',
+            'invoices.final_amount',
+            'invoices.final_amount_with_gst',
+            'invoices.status as invoice_status',
+            'invoices.mark_no',
+            'invoices.container_id',                 // <<< हे नक्की घाल
+            'containers.container_number',
+            'containers.container_date',
+            DB::raw('COALESCE(invoices.company_name, mark_list.company_name) as company_name'),
+            DB::raw('COALESCE(invoices.customer_name, mark_list.customer_name) as customer_name')
+        )
+        
+        ->when($request->filled('search'), function ($q) use ($request) {
+            $search = trim($request->search);
+            $q->where(function ($qq) use ($search) {
+                $qq->where('invoices.invoice_number', 'like', "%{$search}%")
+                    ->orWhere('containers.container_number', 'like', "%{$search}%")
+                    ->orWhere('invoices.mark_no', 'like', "%{$search}%")
+                    ->orWhere('mark_list.company_name', 'like', "%{$search}%")
+                    ->orWhere('mark_list.customer_name', 'like', "%{$search}%");
+            });
+        })
+        ->when($request->filled('status'), function ($q) use ($request) {
+            $q->where('invoices.status', $request->status);
+        })
+        ->orderByDesc('invoices.invoice_date')
+        ->orderByDesc('invoices.id')
+        ->get();
+
+        // ── Real DB counts (filter-independent) ──
+        $totalInvoices   = \App\Models\Invoice::count();
+        $paidInvoices    = \App\Models\Invoice::where('status', 'paid')->count();
+        $pendingInvoices = \App\Models\Invoice::where('status', 'pending')->count();
+        $overdueInvoices = \App\Models\Invoice::where('status', 'overdue')->count();
+
+        return view('admin.orders', compact(
+            'invoices',
+            'totalInvoices',
+            'paidInvoices',
+            'pendingInvoices',
+            'overdueInvoices'
+        ));
     }
 
     /* ---------------------------
@@ -68,42 +160,39 @@ class AdminOrderController extends Controller
      * ORDER ITEM MANAGEMENT (existing orders)
      * ---------------------------*/
     public function addItem(Request $request, $orderId)
-{
-    $order = Order::findOrFail($orderId);
+    {
+        $order = Order::findOrFail($orderId);
 
-    $data = $request->validate([
-        'description' => 'required|string',
-        'ctn'         => 'nullable|numeric',
-        'qty'         => 'nullable|numeric',
-        'unit'        => 'nullable|string',
-        'price'       => 'nullable|numeric',
-        'cbm'         => 'nullable|numeric',
-        'kg'          => 'nullable|numeric',
-        'shop_no'     => 'nullable|string',
-    ]);
+        $data = $request->validate([
+            'description' => 'required|string',
+            'ctn'         => 'nullable|numeric',
+            'qty'         => 'nullable|numeric',
+            'unit'        => 'nullable|string',
+            'price'       => 'nullable|numeric',
+            'cbm'         => 'nullable|numeric',
+            'kg'          => 'nullable|numeric',
+            'shop_no'     => 'nullable|string',
+        ]);
 
-    // ✅ BACKEND CALCULATION
-    $ctn   = (float) ($data['ctn'] ?? 0);
-    $qty   = (float) ($data['qty'] ?? 0);
-    $price = (float) ($data['price'] ?? 0);
-    $cbm   = (float) ($data['cbm'] ?? 0);
-    $kg    = (float) ($data['kg'] ?? 0);
+        $ctn   = (float) ($data['ctn'] ?? 0);
+        $qty   = (float) ($data['qty'] ?? 0);
+        $price = (float) ($data['price'] ?? 0);
+        $cbm   = (float) ($data['cbm'] ?? 0);
+        $kg    = (float) ($data['kg'] ?? 0);
 
-    $data['ttl_qty']    = $ctn * $qty;
-    $data['ttl_amount'] = $data['ttl_qty'] * $price;
-    $data['ttl_cbm']    = $cbm * $ctn;
-    $data['ttl_kg']     = $ctn * $kg;
+        $data['ttl_qty']    = $ctn * $qty;
+        $data['ttl_amount'] = $data['ttl_qty'] * $price;
+        $data['ttl_cbm']    = $cbm * $ctn;
+        $data['ttl_kg']     = $ctn * $kg;
 
-    $data['order_id'] = $order->id;
+        $data['order_id'] = $order->id;
 
-    OrderItem::create($data);
+        OrderItem::create($data);
 
-    $this->recalcTotals($order);
-    $this->updateInvoiceFromOrder($order);
-
-    return redirect()->back()->with('success', 'Item added and totals updated.');
-}
+        $this->recalcTotals($order);
 
+        return redirect()->back()->with('success', 'Item added and totals updated.');
+    }
 
     public function deleteItem($id)
     {
@@ -113,7 +202,6 @@ class AdminOrderController extends Controller
         $item->delete();
 
         $this->recalcTotals($order);
-        $this->updateInvoiceFromOrder($order);
 
         return redirect()->back()->with('success', 'Item deleted and totals updated.');
     }
@@ -126,7 +214,6 @@ class AdminOrderController extends Controller
         $item->restore();
 
         $this->recalcTotals($order);
-        $this->updateInvoiceFromOrder($order);
 
         return redirect()->back()->with('success', 'Item restored and totals updated.');
     }
@@ -175,14 +262,14 @@ class AdminOrderController extends Controller
         $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)),
+            '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)),
         ]);
     }
 
@@ -285,7 +372,6 @@ class AdminOrderController extends Controller
         $order = Order::with([
             'markList',
             'items',
-            'invoice.items',
             'shipments' => function ($q) use ($id) {
                 $q->whereHas('orders', function ($oq) use ($id) {
                     $oq->where('orders.id', $id)
@@ -304,14 +390,14 @@ class AdminOrderController extends Controller
             'order_id' => $order->order_id,
             'status'   => $order->status,
             'totals'   => [
-                'ctn'     => $order->ctn,
-                'qty'     => $order->qty,
-                'ttl_qty' => $order->ttl_qty,
-                'cbm'     => $order->cbm,
-                'ttl_cbm' => $order->ttl_cbm,
-                'kg'      => $order->kg,
-                'ttl_kg'  => $order->ttl_kg,
-                'amount'  => $order->ttl_amount,
+                'ctn'      => $order->ctn,
+                'qty'      => $order->qty,
+                'ttl_qty'  => $order->ttl_qty,
+                'cbm'      => $order->cbm,
+                'ttl_cbm'  => $order->ttl_cbm,
+                'kg'       => $order->kg,
+                'ttl_kg'   => $order->ttl_kg,
+                'amount'   => $order->ttl_amount,
             ],
             'items' => $order->items,
         ];
@@ -365,29 +451,6 @@ class AdminOrderController extends Controller
         }
 
         $invoiceData = null;
-        if ($order->invoice) {
-            $invoice = $order->invoice;
-            $invoiceData = [
-                'invoice_no'   => $invoice->invoice_number,
-                'status'       => $invoice->status,
-                'invoice_date' => $invoice->invoice_date,
-                'due_date'     => $invoice->due_date,
-                'customer'     => [
-                    'name'    => $invoice->customer_name,
-                    'mobile'  => $invoice->customer_mobile,
-                    'email'   => $invoice->customer_email,
-                    'address' => $invoice->customer_address,
-                    'pincode' => $invoice->pincode,
-                ],
-                'items'   => $invoice->items,
-                'summary' => [
-                    'amount' => $invoice->final_amount,
-                    'cgst'   => 0,
-                    'sgst'   => 0,
-                    'total'  => $invoice->final_amount_with_gst,
-                ],
-            ];
-        }
 
         return view('admin.see_order', compact(
             'order',
@@ -398,14 +461,13 @@ class AdminOrderController extends Controller
     }
 
     /* ---------------------------
-     * FILTERED LIST + EXPORTS
+     * FILTERED LIST + EXPORTS (old orders listing)
      * ---------------------------*/
     public function orderShow()
     {
         $orders = Order::with([
             'markList',
             'shipments',
-            'invoice'
         ])->latest('id')->get();
 
         return view('admin.orders', compact('orders'));
@@ -414,7 +476,7 @@ class AdminOrderController extends Controller
     private function buildOrdersQueryFromRequest(Request $request)
     {
         $query = Order::query()
-            ->with(['markList', 'invoice', 'shipments']);
+            ->with(['markList', 'shipments']);
 
         if ($request->filled('search')) {
             $search = trim($request->search);
@@ -427,23 +489,12 @@ class AdminOrderController extends Controller
                             ->orWhere('origin', 'like', "%{$search}%")
                             ->orWhere('destination', 'like', "%{$search}%");
                     })
-                    ->orWhereHas('invoice', function ($q3) use ($search) {
-                        $q3->where('invoice_number', 'like', "%{$search}%");
-                    })
                     ->orWhereHas('shipments', function ($q4) use ($search) {
                         $q4->where('shipments.shipment_id', 'like', "%{$search}%");
                     });
             });
         }
 
-        if ($request->filled('status')) {
-            $query->where(function ($q) use ($request) {
-                $q->whereHas('invoice', function ($q2) use ($request) {
-                    $q2->where('status', $request->status);
-                })->orWhereDoesntHave('invoice');
-            });
-        }
-
         if ($request->filled('shipment')) {
             $query->where(function ($q) use ($request) {
                 $q->whereHas('shipments', function ($q2) use ($request) {
@@ -465,62 +516,83 @@ class AdminOrderController extends Controller
 
     public function downloadPdf(Request $request)
     {
-        $orders  = $this->buildOrdersQueryFromRequest($request)->get();
-        $filters = [
-            'search'   => $request->search,
-            'status'   => $request->status,
-            'shipment' => $request->shipment,
-            'from'     => $request->from_date,
-            'to'       => $request->to_date,
-        ];
-
-        $pdf = PDF::loadView('admin.orders.pdf', compact('orders', 'filters'))
+        $invoices = DB::table('invoices')
+            ->leftJoin('containers', 'containers.id', '=', 'invoices.container_id')
+            ->leftJoin('mark_list', 'mark_list.mark_no', '=', 'invoices.mark_no')
+            ->select(
+                'invoices.invoice_number',
+                'invoices.invoice_date',
+                'invoices.mark_no',
+                'containers.container_number',
+                'containers.container_date',
+                DB::raw('COALESCE(invoices.company_name, mark_list.company_name) as company_name'),
+                DB::raw('COALESCE(invoices.customer_name, mark_list.customer_name) as customer_name'),
+                'invoices.final_amount',
+                'invoices.final_amount_with_gst',
+                'invoices.status as invoice_status'
+            )
+            ->when($request->filled('search'), function ($q) use ($request) {
+                $search = trim($request->search);
+                $q->where(function ($qq) use ($search) {
+                    $qq->where('invoices.invoice_number', 'like', "%{$search}%")
+                        ->orWhere('invoices.mark_no', 'like', "%{$search}%")
+                        ->orWhere('containers.container_number', 'like', "%{$search}%")
+                        ->orWhere('mark_list.company_name', 'like', "%{$search}%")
+                        ->orWhere('mark_list.customer_name', 'like', "%{$search}%");
+                });
+            })
+            ->when($request->filled('status'), function ($q) use ($request) {
+                $q->where('invoices.status', $request->status);
+            })
+            ->when($request->filled('from_date'), function ($q) use ($request) {
+                $q->whereDate('invoices.invoice_date', '>=', $request->from_date);
+            })
+            ->when($request->filled('to_date'), function ($q) use ($request) {
+                $q->whereDate('invoices.invoice_date', '<=', $request->to_date);
+            })
+            ->orderByDesc('containers.container_date')
+            ->orderByDesc('invoices.id')
+            ->get();
+    
+        $pdf = PDF::loadView('admin.pdf.invoices_report', compact('invoices'))
             ->setPaper('a4', 'landscape');
-
+    
         return $pdf->download(
-            'orders-report-' . now()->format('Y-m-d') . '.pdf'
+            'invoices-report-' . now()->format('Y-m-d') . '.pdf'
         );
     }
-
+    
     public function downloadExcel(Request $request)
     {
         return Excel::download(
-            new OrdersExport($request),
-            'orders-report-' . now()->format('Y-m-d') . '.xlsx'
+            new InvoicesExport($request),
+            'invoices-report-' . now()->format('Y-m-d') . '.xlsx'
         );
     }
 
     /* --------------------------------------------------
      * NEW: Create Order + Invoice directly from popup
-     * route: admin.orders.temp.add  (Create New Order form)
      * --------------------------------------------------*/
     public function addTempItem(Request $request)
     {
-        // 1) order-level fields
         $request->validate([
             'mark_no'     => 'required',
-            'origin'      => 'required',
-            'destination' => 'required',
+            'origin'      => 'nullable',
+            'destination' => 'nullable',
         ]);
 
-        // 2) multi-row items
         $items = $request->validate([
             'items'                   => 'required|array',
             'items.*.description'     => 'required|string',
             'items.*.ctn'             => 'nullable|numeric',
             'items.*.qty'             => 'nullable|numeric',
-            
             'items.*.unit'            => 'nullable|string',
             'items.*.price'           => 'nullable|numeric',
-            
             'items.*.cbm'             => 'nullable|numeric',
-            
             'items.*.kg'              => 'nullable|numeric',
-            
             'items.*.shop_no'         => 'nullable|string',
         ])['items'];
 
-        // रिकामे rows काढा
         $items = array_filter($items, function ($row) {
             return trim($row['description'] ?? '') !== '';
         });
@@ -529,38 +601,31 @@ class AdminOrderController extends Controller
             return back()->with('error', 'Add at least one item.');
         }
 
-        // ✅ BACKEND CALCULATION (DO NOT TRUST FRONTEND)
         foreach ($items as &$item) {
-
             $ctn   = (float) ($item['ctn'] ?? 0);
             $qty   = (float) ($item['qty'] ?? 0);
             $price = (float) ($item['price'] ?? 0);
             $cbm   = (float) ($item['cbm'] ?? 0);
             $kg    = (float) ($item['kg'] ?? 0);
 
-            // Calculated fields
             $item['ttl_qty']    = $ctn * $qty;
             $item['ttl_amount'] = $item['ttl_qty'] * $price;
             $item['ttl_cbm']    = $cbm * $ctn;
             $item['ttl_kg']     = $ctn * $kg;
         }
-        unset($item); // VERY IMPORTANT
+        unset($item);
 
+        $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'));
 
-        // 3) totals
-        $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'));
-
-        // 4) order id generate
         $orderId = $this->generateOrderId();
 
-        // 5) order create
         $order = Order::create([
             'order_id'   => $orderId,
             'mark_no'    => $request->mark_no,
@@ -577,7 +642,6 @@ class AdminOrderController extends Controller
             'status'     => 'order_placed',
         ]);
 
-        // 6) order items
         foreach ($items as $item) {
             OrderItem::create([
                 'order_id'   => $order->id,
@@ -596,17 +660,14 @@ class AdminOrderController extends Controller
             ]);
         }
 
-        // 7) invoice number
         $invoiceNumber = $this->generateInvoiceNumber();
 
-        // 8) customer fetch
         $markList = MarkList::where('mark_no', $order->mark_no)->first();
         $customer = null;
         if ($markList && $markList->customer_id) {
             $customer = User::where('customer_id', $markList->customer_id)->first();
         }
 
-        // 9) invoice create
         $invoice = Invoice::create([
             'order_id'              => $order->id,
             'customer_id'           => $customer->id ?? null,
@@ -631,7 +692,6 @@ class AdminOrderController extends Controller
             'pdf_path'              => null,
         ]);
 
-        // 10) invoice items
         foreach ($order->items as $item) {
             InvoiceItem::create([
                 'invoice_id'  => $invoice->id,
@@ -658,114 +718,72 @@ class AdminOrderController extends Controller
      * UPDATE ORDER ITEM (existing orders)
      * ---------------------------*/
     public function updateItem(Request $request, $id)
-{
-    $item  = OrderItem::findOrFail($id);
-    $order = $item->order;
-
-    $request->validate([
-        'description' => 'required|string',
-        'ctn'         => 'nullable|numeric',
-        'qty'         => 'nullable|numeric',
-        'unit'        => 'nullable|string',
-        'price'       => 'nullable|numeric',
-        'cbm'         => 'nullable|numeric',
-        'kg'          => 'nullable|numeric',
-        'shop_no'     => 'nullable|string',
-    ]);
-
-    // ✅ BACKEND CALCULATION
-    $ctn   = (float) ($request->ctn ?? 0);
-    $qty   = (float) ($request->qty ?? 0);
-    $price = (float) ($request->price ?? 0);
-    $cbm   = (float) ($request->cbm ?? 0);
-    $kg    = (float) ($request->kg ?? 0);
-
-    $item->update([
-        'description' => $request->description,
-        'ctn'         => $ctn,
-        'qty'         => $qty,
-        'ttl_qty'     => $ctn * $qty,
-        'unit'        => $request->unit,
-        'price'       => $price,
-        'ttl_amount'  => ($ctn * $qty) * $price,
-        'cbm'         => $cbm,
-        'ttl_cbm'     => $cbm * $ctn,
-        'kg'          => $kg,
-        'ttl_kg'      => $ctn * $kg,
-        'shop_no'     => $request->shop_no,
-    ]);
-
-    $this->recalcTotals($order);
-    $this->updateInvoiceFromOrder($order);
-
-    return back()->with('success', 'Item updated successfully');
-}
-
-
-    private function updateInvoiceFromOrder(Order $order)
     {
-        $invoice = Invoice::where('order_id', $order->id)->first();
+        $item  = OrderItem::findOrFail($id);
+        $order = $item->order;
 
-        if (!$invoice) {
-            return;
-        }
-
-        $invoice->final_amount          = $order->ttl_amount;
-        $invoice->gst_percent           = 0;
-        $invoice->gst_amount            = 0;
-        $invoice->final_amount_with_gst = $order->ttl_amount;
-        $invoice->save();
-
-        InvoiceItem::where('invoice_id', $invoice->id)->delete();
-
-        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,
-            ]);
-        }
-    }
-
-
-
-public function uploadExcelPreview(Request $request)
-{
-    try {
         $request->validate([
-            'excel' => 'required|file|mimes:xlsx,xls'
+            'description' => 'required|string',
+            'ctn'         => 'nullable|numeric',
+            'qty'         => 'nullable|numeric',
+            'unit'        => 'nullable|string',
+            'price'       => 'nullable|numeric',
+            'cbm'         => 'nullable|numeric',
+            'kg'          => 'nullable|numeric',
+            'shop_no'     => 'nullable|string',
         ]);
 
-        $import = new OrderItemsPreviewImport();
-        Excel::import($import, $request->file('excel'));
+        $ctn   = (float) ($request->ctn ?? 0);
+        $qty   = (float) ($request->qty ?? 0);
+        $price = (float) ($request->price ?? 0);
+        $cbm   = (float) ($request->cbm ?? 0);
+        $kg    = (float) ($request->kg ?? 0);
 
-        return response()->json([
-            'success' => true,
-            'items' => $import->rows
+        $item->update([
+            'description' => $request->description,
+            'ctn'         => $ctn,
+            'qty'         => $qty,
+            'ttl_qty'     => $ctn * $qty,
+            'unit'        => $request->unit,
+            'price'       => $price,
+            'ttl_amount'  => ($ctn * $qty) * $price,
+            'cbm'         => $cbm,
+            'ttl_cbm'     => $cbm * $ctn,
+            'kg'          => $kg,
+            'ttl_kg'      => $ctn * $kg,
+            'shop_no'     => $request->shop_no,
         ]);
-    } catch (ValidationException $e) {
-        return response()->json([
-            'success' => false,
-            'message' => 'Invalid Excel file format'
-        ], 422);
-    } catch (\Throwable $e) {
-        \Log::error($e);
-        return response()->json([
-            'success' => false,
-            'message' => 'Server error'
-        ], 500);
+
+        $this->recalcTotals($order);
+
+        return back()->with('success', 'Item updated successfully');
     }
-}
 
+    public function uploadExcelPreview(Request $request)
+    {
+        try {
+            $request->validate([
+                'excel' => 'required|file|mimes:xlsx,xls'
+            ]);
 
-}
+            $import = new OrderItemsPreviewImport();
+            Excel::import($import, $request->file('excel'));
+
+            return response()->json([
+                'success' => true,
+                'items'   => $import->rows
+            ]);
+        } catch (ValidationException $e) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Invalid Excel file format'
+            ], 422);
+        } catch (\Throwable $e) {
+            \Log::error($e);
+            return response()->json([
+                'success' => false,
+                'message' => 'Server error'
+            ], 500);
+        }
+    }
+}

app/Http/Controllers/Admin/AdminReportController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Models\Order;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -12,45 +11,98 @@ class AdminReportController extends Controller
     /**
      * Display the reports page with joined data
      */
-    public function index(Request $request)
-    {
-        // -------------------------------
-        // FETCH REPORT DATA
-        // ONLY orders that have BOTH:
-        // 1. Invoice
-        // 2. Shipment
-        // -------------------------------
+    // public function index(Request $request)
+    // {
+        /*********************************************************
+         * OLD FLOW (Order + Shipment + Invoice)
+         * फक्त reference साठी ठेवलेला, वापरत नाही.
+         *********************************************************/
+
+        /*
         $reports = DB::table('orders')
             ->join('shipment_items', 'shipment_items.order_id', '=', 'orders.id')
             ->join('shipments', 'shipments.id', '=', 'shipment_items.shipment_id')
             ->join('invoices', 'invoices.order_id', '=', 'orders.id')
             ->leftJoin('mark_list', 'mark_list.mark_no', '=', 'orders.mark_no')
             ->leftJoin('users', 'users.customer_id', '=', 'mark_list.customer_id')
+            ->select(...)
+            ->orderBy('shipments.shipment_date', 'desc')
+            ->get();
+        */
 
+        /*********************************************************
+         * NEW FLOW (Container + Invoice + MarkList)
+         *********************************************************/
+
+    //     $reports = DB::table('invoices')
+    //         ->join('containers', 'containers.id', '=', 'invoices.containerid')
+    //         ->leftJoin('mark_list', 'mark_list.markno', '=', 'invoices.markno')
+    //         ->select(
+    //             'invoices.id as invoicepk',
+    //             'invoices.invoicenumber',
+    //             'invoices.invoicedate',
+    //             'invoices.finalamount',
+    //             'invoices.finalamountwithgst',
+    //             'invoices.gstpercent',
+    //             'invoices.gstamount',
+    //             'invoices.status as invoicestatus',
+    //             'invoices.markno',
+
+    //             'containers.id as containerpk',
+    //             'containers.containernumber',
+    //             'containers.containerdate',
+    //             'containers.containername',
+
+    //             'mark_list.companyname',
+    //             'mark_list.customername'
+    //         )
+    //         ->orderBy('containers.containerdate', 'desc')
+    //         ->get();
+
+    //     return view('admin.reports', compact('reports'));
+    // }
+
+
+    
+    public function index(Request $request)
+    {
+        $reports = DB::table('invoices')
+            ->join('containers', 'containers.id', '=', 'invoices.container_id')
+            ->leftJoin('mark_list', 'mark_list.mark_no', '=', 'invoices.mark_no')
             ->select(
-                'orders.id as order_pk',
-                'orders.order_id',
-                'orders.mark_no',
-                'orders.origin',
-                'orders.destination',
-
-                'shipments.id as shipment_pk',
-                'shipments.shipment_id',
-                'shipments.status as shipment_status',
-                'shipments.shipment_date',
-
+                // INVOICE
+                'invoices.id as invoicepk',
                 'invoices.invoice_number',
                 'invoices.invoice_date',
                 'invoices.final_amount',
-                'invoices.status as invoice_status',
-
-                'mark_list.company_name',
-                'mark_list.customer_name'
+                'invoices.final_amount_with_gst',
+                'invoices.gst_percent',
+                'invoices.gst_amount',
+                'invoices.status as invoicestatus',
+                'invoices.mark_no',
+    
+                // CONTAINER
+                'containers.id as containerpk',
+                'containers.container_number',
+                'containers.container_date',
+                'containers.container_name',
+    
+                // RAW FIELDS (for reference/debug if needed)
+                'invoices.company_name as inv_company_name',
+                'invoices.customer_name as inv_customer_name',
+                'mark_list.company_name as ml_company_name',
+                'mark_list.customer_name as ml_customer_name',
+    
+                // FINAL FIELDS (automatically pick invoice first, else mark_list)
+                DB::raw('COALESCE(invoices.company_name, mark_list.company_name) as company_name'),
+                DB::raw('COALESCE(invoices.customer_name, mark_list.customer_name) as customer_name')
             )
+            ->orderBy('invoices.invoice_date', 'desc')
+            ->orderBy('invoices.id', 'desc')
 
-            ->orderBy('shipments.shipment_date', 'desc')
             ->get();
-
+    
         return view('admin.reports', compact('reports'));
     }
+    
 }

app/Http/Controllers/Admin/UserRequestController.php

@@ -85,7 +85,6 @@ public function approveProfileUpdate($id)
     $req = \App\Models\UpdateRequest::findOrFail($id);
     $user = \App\Models\User::findOrFail($req->user_id);
 
-    // FIX: Ensure data is array
     $newData = is_array($req->data) ? $req->data : json_decode($req->data, true);
 
     foreach ($newData as $key => $value) {
@@ -96,8 +95,18 @@ public function approveProfileUpdate($id)
         }
     }
 
+    // Update user table
     $user->save();
 
+    // Update mark_list table
+    \App\Models\MarkList::where('customer_id', $user->customer_id)
+        ->update([
+            'customer_name' => $user->customer_name,
+            'company_name' => $user->company_name,
+            'mobile_no' => $user->mobile_no
+        ]);
+
+    // Update request status
     $req->status = 'approved';
     $req->admin_note = 'Approved by admin on ' . now();
     $req->save();

app/Http/Controllers/ContainerController.php

@@ -0,0 +1,975 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Container;
+use App\Models\ContainerRow;
+use App\Models\MarkList;
+use App\Models\Invoice;
+use App\Models\InvoiceItem;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+use Carbon\Carbon;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Illuminate\Support\Facades\Storage;
+
+class ContainerController extends Controller
+{
+    public function index()
+    {
+        $containers = Container::with('rows')->latest()->get();
+
+        $containers->each(function ($container) {
+            $rows = $container->rows;
+
+            $totalCtn = 0;
+            $totalQty = 0;
+            $totalCbm = 0;
+            $totalKg  = 0;
+
+            $ctnKeys = ['CTN', 'CTNS'];
+            $qtyKeys = ['ITLQTY', 'TOTALQTY', 'TTLQTY', 'QTY', 'PCS', 'PIECES'];
+            $cbmKeys = ['TOTALCBM', 'TTLCBM', 'ITLCBM', 'CBM'];
+            $kgKeys  = ['TOTALKG', 'TTKG', 'KG', 'WEIGHT'];
+
+            $getFirstNumeric = function (array $data, array $possibleKeys) {
+                $normalizedMap = [];
+
+                foreach ($data as $key => $value) {
+                    if ($key === null || $key === '') continue;
+
+                    $normKey = strtoupper((string)$key);
+                    $normKey = str_replace([' ', '/', '-', '.'], '', $normKey);
+                    $normalizedMap[$normKey] = $value;
+                }
+
+                foreach ($possibleKeys as $search) {
+                    $normSearch = strtoupper($search);
+                    $normSearch = str_replace([' ', '/', '-', '.'], '', $normSearch);
+
+                    foreach ($normalizedMap as $nKey => $value) {
+                        if (
+                            strpos($nKey, $normSearch) !== false &&
+                            (is_numeric($value) || (is_string($value) && is_numeric(trim($value))))
+                        ) {
+                            return (float) trim($value);
+                        }
+                    }
+                }
+
+                return 0;
+            };
+
+            foreach ($rows as $row) {
+                $data = $row->data ?? [];
+
+                $totalCtn += $getFirstNumeric($data, $ctnKeys);
+                $totalQty += $getFirstNumeric($data, $qtyKeys);
+                $totalCbm += $getFirstNumeric($data, $cbmKeys);
+                $totalKg  += $getFirstNumeric($data, $kgKeys);
+            }
+
+            $container->summary = [
+                'total_ctn' => round($totalCtn, 2),
+                'total_qty' => round($totalQty, 2),
+                'total_cbm' => round($totalCbm, 3),
+                'total_kg'  => round($totalKg, 2),
+            ];
+        });
+
+        return view('admin.container', compact('containers'));
+    }
+
+    public function create()
+    {
+        return view('admin.container_create');
+    }
+
+    private function isValidExcelFormat($rows, $header)
+    {
+        if (empty($header) || count($rows) < 2) return false;
+
+        $validKeywords = [
+            'MARK', 'DESCRIPTION', 'DESC', 'CTN', 'CTNS', 'QTY', 'TOTALQTY', 'ITLQTY', 'ITL QTY',
+            'UNIT', 'CBM', 'TOTAL CBM', 'KG', 'TOTAL KG',
+            'METAL BUCKLE', 'WATCH MOVEMENT', 'STEEL BOTTLE',
+            'MEHULPAID', 'ITEM NO', 'ITEM NO.', 'SAHILPAID', 'PINAKIN', 'GST',
+            'MOON LAMP', 'TRANSPARENT BOTTLE', 'PLASTIC FONDANT',
+        ];
+
+        $headerText      = implode(' ', array_map('strtoupper', $header));
+        $requiredHeaders = ['CTN', 'QTY', 'DESCRIPTION', 'DESC'];
+
+        $hasValidHeaders = false;
+        foreach ($requiredHeaders as $key) {
+            if (stripos($headerText, $key) !== false) {
+                $hasValidHeaders = true;
+                break;
+            }
+        }
+
+        if (!$hasValidHeaders) return false;
+
+        $dataPreview = '';
+        for ($i = 0; $i < min(5, count($rows)); $i++) {
+            $rowText = implode(' ', array_slice($rows[$i], 0, 10));
+            $dataPreview .= ' ' . strtoupper((string)$rowText);
+        }
+
+        $validMatches = 0;
+        foreach ($validKeywords as $keyword) {
+            if (stripos($headerText . $dataPreview, strtoupper($keyword)) !== false) {
+                $validMatches++;
+            }
+        }
+
+        return $validMatches >= 3;
+    }
+
+    private function normalizeKey($value): string
+    {
+        $norm = strtoupper((string)$value);
+        return str_replace([' ', '/', '-', '.'], '', $norm);
+    }
+
+    public function store(Request $request)
+    {
+        $request->validate([
+            'container_name'   => 'required|string',
+            'container_number' => 'required|string|unique:containers,container_number',
+            'container_date'   => 'required|date',
+            'excel_file'       => 'required|file|mimes:xls,xlsx',
+        ]);
+
+        $file   = $request->file('excel_file');
+        $sheets = Excel::toArray([], $file);
+        $rows   = $sheets[0] ?? [];
+
+        if (count($rows) < 2) {
+            return back()
+                ->withErrors(['excel_file' => 'Excel file is empty.'])
+                ->withInput();
+        }
+
+        // HEADER DETECTION
+        $headerRowIndex = null;
+        $header         = [];
+
+        foreach ($rows as $i => $row) {
+            $trimmed  = array_map(fn($v) => trim((string)$v), $row);
+            $nonEmpty = array_filter($trimmed, fn($v) => $v !== '');
+            if (empty($nonEmpty)) continue;
+
+            if (count($nonEmpty) >= 4) {
+                $headerRowIndex = $i;
+                $header         = $trimmed;
+                break;
+            }
+        }
+
+        if ($headerRowIndex === null) {
+            return back()
+                ->withErrors(['excel_file' => 'Header row not found in Excel.'])
+                ->withInput();
+        }
+
+        if (!$this->isValidExcelFormat($rows, $header)) {
+            return back()
+                ->withErrors(['excel_file' => 'Only MEHUL / SAHIL / PINAKIN / GST loading list formats allowed.'])
+                ->withInput();
+        }
+
+        // COLUMN INDEXES
+        $essentialColumns = [
+            'desc_col'      => null,
+            'ctn_col'       => null,
+            'qty_col'       => null,
+            'totalqty_col'  => null,
+            'unit_col'      => null,
+            'price_col'     => null,
+            'amount_col'    => null,
+            'cbm_col'       => null,
+            'totalcbm_col'  => null,
+            'kg_col'        => null,
+            'totalkg_col'   => null,
+            'itemno_col'    => null,
+            'shopno_col'    => null,
+        ];
+
+        foreach ($header as $colIndex => $headingText) {
+            if (empty($headingText)) continue;
+
+            $normalized = $this->normalizeKey($headingText);
+
+            if (strpos($normalized, 'DESCRIPTION') !== false || strpos($normalized, 'DESC') !== false) {
+                $essentialColumns['desc_col'] = $colIndex;
+            } elseif (strpos($normalized, 'CTN') !== false || strpos($normalized, 'CTNS') !== false) {
+                $essentialColumns['ctn_col'] = $colIndex;
+            } elseif (
+                strpos($normalized, 'ITLQTY') !== false ||
+                strpos($normalized, 'TOTALQTY') !== false ||
+                strpos($normalized, 'TTLQTY') !== false
+            ) {
+                $essentialColumns['totalqty_col'] = $colIndex;
+            } elseif (strpos($normalized, 'QTY') !== false) {
+                $essentialColumns['qty_col'] = $colIndex;
+            } elseif (strpos($normalized, 'UNIT') !== false) {
+                $essentialColumns['unit_col'] = $colIndex;
+            } elseif (strpos($normalized, 'PRICE') !== false) {
+                $essentialColumns['price_col'] = $colIndex;
+            } elseif (strpos($normalized, 'AMOUNT') !== false) {
+                $essentialColumns['amount_col'] = $colIndex;
+            } elseif (strpos($normalized, 'TOTALCBM') !== false || strpos($normalized, 'ITLCBM') !== false) {
+                $essentialColumns['totalcbm_col'] = $colIndex;
+            } elseif (strpos($normalized, 'CBM') !== false) {
+                $essentialColumns['cbm_col'] = $colIndex;
+            } elseif (strpos($normalized, 'TOTALKG') !== false || strpos($normalized, 'TTKG') !== false) {
+                $essentialColumns['totalkg_col'] = $colIndex;
+            } elseif (strpos($normalized, 'KG') !== false) {
+                $essentialColumns['kg_col'] = $colIndex;
+            } elseif (
+                strpos($normalized, 'MARKNO') !== false ||
+                strpos($normalized, 'MARK') !== false ||
+                strpos($normalized, 'ITEMNO') !== false ||
+                strpos($normalized, 'ITEM') !== false
+            ) {
+                $essentialColumns['itemno_col'] = $colIndex;
+            } elseif (
+                strpos($normalized, 'SHOPNO') !== false ||
+                strpos($normalized, 'SHOP') !== false
+            ) {
+                $essentialColumns['shopno_col'] = $colIndex;
+            }
+        }
+
+        if (is_null($essentialColumns['itemno_col'])) {
+            return back()
+                ->withErrors(['excel_file' => 'Mark / Item column not found in Excel (expected headers like MARK NO / Mark_No / Item_No).'])
+                ->withInput();
+        }
+
+        // ROWS CLEANING
+        $dataRows          = array_slice($rows, $headerRowIndex + 1);
+        $cleanedRows       = [];
+        $unmatchedRowsData = [];
+
+        foreach ($dataRows as $offset => $row) {
+            $trimmedRow    = array_map(fn($v) => trim((string)$v), $row);
+            $nonEmptyCells = array_filter($trimmedRow, fn($v) => $v !== '');
+            if (count($nonEmptyCells) < 2) continue;
+
+            $rowText = strtoupper(implode(' ', $trimmedRow));
+            if (
+                stripos($rowText, 'TOTAL') !== false ||
+                stripos($rowText, 'TTL')   !== false ||
+                stripos($rowText, 'GRAND') !== false
+            ) {
+                continue;
+            }
+
+            $descValue = '';
+            if ($essentialColumns['desc_col'] !== null) {
+                $descValue = trim($row[$essentialColumns['desc_col']] ?? '');
+            }
+
+            if ($essentialColumns['desc_col'] !== null && $descValue === '' && count($nonEmptyCells) >= 1) {
+                continue;
+            }
+
+            $cleanedRows[] = [
+                'row'    => $row,
+                'offset' => $offset,
+            ];
+        }
+
+        if (empty($cleanedRows)) {
+            return back()
+                ->withErrors(['excel_file' => 'No valid item rows found in Excel.'])
+                ->withInput();
+        }
+
+        // FORMULA CHECK
+        $cleanNumber = function ($value) {
+            if (is_string($value)) {
+                $value = str_replace(',', '', trim($value));
+            }
+            return is_numeric($value) ? (float)$value : 0;
+        };
+
+        $formulaErrors = [];
+
+        foreach ($cleanedRows as $item) {
+            $row    = $item['row'];
+            $offset = $item['offset'];
+
+            $ctn  = $essentialColumns['ctn_col']      !== null ? $cleanNumber($row[$essentialColumns['ctn_col']]      ?? 0) : 0;
+            $qty  = $essentialColumns['qty_col']      !== null ? $cleanNumber($row[$essentialColumns['qty_col']]      ?? 0) : 0;
+            $ttlQ = $essentialColumns['totalqty_col'] !== null ? $cleanNumber($row[$essentialColumns['totalqty_col']] ?? 0) : 0;
+            $cbm  = $essentialColumns['cbm_col']      !== null ? $cleanNumber($row[$essentialColumns['cbm_col']]      ?? 0) : 0;
+            $ttlC = $essentialColumns['totalcbm_col'] !== null ? $cleanNumber($row[$essentialColumns['totalcbm_col']] ?? 0) : 0;
+            $kg   = $essentialColumns['kg_col']       !== null ? $cleanNumber($row[$essentialColumns['kg_col']]       ?? 0) : 0;
+            $ttlK = $essentialColumns['totalkg_col']  !== null ? $cleanNumber($row[$essentialColumns['totalkg_col']]  ?? 0) : 0;
+
+            $price     = $essentialColumns['price_col']  !== null ? $cleanNumber($row[$essentialColumns['price_col']]  ?? 0) : 0;
+            $ttlAmount = $essentialColumns['amount_col'] !== null ? $cleanNumber($row[$essentialColumns['amount_col']] ?? 0) : 0;
+
+            $desc = $essentialColumns['desc_col']   !== null ? (string)($row[$essentialColumns['desc_col']]   ?? '') : '';
+            $mark = $essentialColumns['itemno_col'] !== null ? (string)($row[$essentialColumns['itemno_col']] ?? '') : '';
+
+            $expTtlQty    = $qty * $ctn;
+            $expTtlCbm    = $cbm * $ctn;
+            $expTtlKg     = $kg  * $ctn;
+            $expTtlAmount = ($qty * $ctn) * $price;
+
+            $rowErrors = [];
+
+            if (abs($ttlQ - $expTtlQty) > 0.01) {
+                $rowErrors['TOTAL QTY'] = [
+                    'actual'   => $ttlQ,
+                    'expected' => $expTtlQty,
+                ];
+            }
+
+            if (abs($ttlC - $expTtlCbm) > 0.0005) {
+                $rowErrors['TOTAL CBM'] = [
+                    'actual'   => $ttlC,
+                    'expected' => $expTtlCbm,
+                ];
+            }
+
+            if (abs($ttlK - $expTtlKg) > 0.01) {
+                $rowErrors['TOTAL KG'] = [
+                    'actual'   => $ttlK,
+                    'expected' => $expTtlKg,
+                ];
+            }
+
+            if ($essentialColumns['amount_col'] !== null && $essentialColumns['price_col'] !== null) {
+                if (abs($ttlAmount - $expTtlAmount) > 0.01) {
+                    $rowErrors['TOTAL AMOUNT'] = [
+                        'actual'   => $ttlAmount,
+                        'expected' => $expTtlAmount,
+                    ];
+                }
+            }
+
+            if (!empty($rowErrors)) {
+                $rowData = [];
+                foreach ($header as $colIndex => $headingText) {
+                    $value = $row[$colIndex] ?? null;
+                    if (is_string($value)) $value = trim($value);
+                    $rowData[$headingText] = $value;
+                }
+
+                $formulaErrors[] = [
+                    'excel_row'   => $headerRowIndex + 1 + $offset,
+                    'mark_no'     => $mark,
+                    'description' => $desc,
+                    'errors'      => $rowErrors,
+                    'data'        => $rowData,
+                ];
+            }
+        }
+
+        // MARK CHECK
+        $marksFromExcel = [];
+        foreach ($cleanedRows as $item) {
+            $row     = $item['row'];
+            $rawMark = $row[$essentialColumns['itemno_col']] ?? null;
+            $mark    = trim((string)($rawMark ?? ''));
+            if ($mark !== '') {
+                $marksFromExcel[] = $mark;
+            }
+        }
+
+        $marksFromExcel = array_values(array_unique($marksFromExcel));
+
+        if (empty($marksFromExcel)) {
+            return back()
+                ->withErrors(['excel_file' => 'No mark numbers found in Excel file.'])
+                ->withInput();
+        }
+
+        $validMarks = MarkList::whereIn('mark_no', $marksFromExcel)
+            ->where('status', 'active')
+            ->pluck('mark_no')
+            ->toArray();
+
+        $unmatchedMarks = array_values(array_diff($marksFromExcel, $validMarks));
+
+        $markErrors = [];
+
+        if (!empty($unmatchedMarks)) {
+            foreach ($cleanedRows as $item) {
+                $row    = $item['row'];
+                $offset = $item['offset'];
+                $rowMark = trim((string)($row[$essentialColumns['itemno_col']] ?? ''));
+
+                if ($rowMark === '' || !in_array($rowMark, $unmatchedMarks)) {
+                    continue;
+                }
+
+                $rowData = [];
+                foreach ($header as $colIndex => $headingText) {
+                    $value = $row[$colIndex] ?? null;
+                    if (is_string($value)) $value = trim($value);
+                    $rowData[$headingText] = $value;
+                }
+
+                $markErrors[] = [
+                    'excel_row' => $headerRowIndex + 1 + $offset,
+                    'mark_no'   => $rowMark,
+                    'data'      => $rowData,
+                ];
+            }
+        }
+
+        if (!empty($formulaErrors) || !empty($markErrors)) {
+            return back()
+                ->withInput()
+                ->with([
+                    'formula_errors' => $formulaErrors,
+                    'mark_errors'    => $markErrors,
+                ]);
+        }
+
+        // STEP 1: Marks → customers mapping + grouping
+        $markRecords = MarkList::whereIn('mark_no', $marksFromExcel)
+            ->where('status', 'active')
+            ->get();
+
+        $markToCustomerId = [];
+        $markToSnapshot   = [];
+
+        foreach ($markRecords as $mr) {
+            $markToCustomerId[$mr->mark_no] = $mr->customer_id;
+
+            $markToSnapshot[$mr->mark_no] = [
+                'customer_name' => $mr->customer_name,
+                'company_name'  => $mr->company_name,
+                'mobile_no'     => $mr->mobile_no,
+            ];
+        }
+
+        $groupedByCustomer = [];
+
+        foreach ($cleanedRows as $item) {
+            $row    = $item['row'];
+            $offset = $item['offset'];
+
+            $rawMark = $row[$essentialColumns['itemno_col']] ?? null;
+            $mark    = trim((string)($rawMark ?? ''));
+
+            if ($mark === '') {
+                continue;
+            }
+
+            $customerId = $markToCustomerId[$mark] ?? null;
+            if (!$customerId) {
+                continue;
+            }
+
+            if (!isset($groupedByCustomer[$customerId])) {
+                $groupedByCustomer[$customerId] = [];
+            }
+
+            $groupedByCustomer[$customerId][] = [
+                'row'    => $row,
+                'offset' => $offset,
+                'mark'   => $mark,
+            ];
+        }
+
+        // STEP 2: Container + ContainerRows save
+        $container = Container::create([
+            'container_name'   => $request->container_name,
+            'container_number' => $request->container_number,
+            'container_date'   => $request->container_date,
+            'status'           => 'pending',
+        ]);
+
+        $path = $file->store('containers');
+        $container->update(['excel_file' => $path]);
+
+        $savedCount = 0;
+
+        foreach ($cleanedRows as $item) {
+            $row    = $item['row'];
+            $offset = $item['offset'];
+
+            $data = [];
+            foreach ($header as $colIndex => $headingText) {
+                $value = $row[$colIndex] ?? null;
+                if (is_string($value)) $value = trim($value);
+                $data[$headingText] = $value;
+            }
+
+            ContainerRow::create([
+                'container_id' => $container->id,
+                'row_index'    => $headerRowIndex + 1 + $offset,
+                'data'         => $data,
+            ]);
+
+            $savedCount++;
+        }
+
+        // STEP 3: per-customer invoices + invoice items
+        $invoiceCount = 0;
+
+        foreach ($groupedByCustomer as $customerId => $rowsForCustomer) {
+            if (empty($rowsForCustomer)) {
+                continue;
+            }
+
+            $firstMark = $rowsForCustomer[0]['mark'];
+            $snap      = $markToSnapshot[$firstMark] ?? null;
+
+            $customerUser = \App\Models\User::where('customer_id', $customerId)->first();
+
+            $invoice = new Invoice();
+            $invoice->container_id = $container->id;
+            $invoice->customer_id  = $customerUser->id ?? null;
+            $invoice->mark_no      = $firstMark;
+
+            $invoice->invoice_number = $this->generateInvoiceNumber();
+
+            $invoice->invoice_date = $container->container_date;
+
+            $invoice->due_date = Carbon::parse($invoice->invoice_date)
+                ->addDays(10)
+                ->format('Y-m-d');
+
+            if ($snap) {
+                $invoice->customer_name   = $snap['customer_name'] ?? null;
+                $invoice->company_name    = $snap['company_name'] ?? null;
+                $invoice->customer_mobile = $snap['mobile_no'] ?? null;
+            }
+
+            if ($customerUser) {
+                $invoice->customer_email   = $customerUser->email   ?? null;
+                $invoice->customer_address = $customerUser->address ?? null;
+                $invoice->pincode          = $customerUser->pincode ?? null;
+            }
+
+            $invoice->final_amount          = 0;
+            $invoice->gst_percent           = 0;
+            $invoice->gst_amount            = 0;
+            $invoice->final_amount_with_gst = 0;
+
+            $uniqueMarks    = array_unique(array_column($rowsForCustomer, 'mark'));
+            $invoice->notes = 'Auto-created from Container ' . $container->container_number
+                . ' for Mark(s): ' . implode(', ', $uniqueMarks);
+            $invoice->pdf_path = null;
+            $invoice->status   = 'pending';
+
+            $invoice->save();
+            $invoiceCount++;
+
+            $totalAmount = 0;
+
+            foreach ($rowsForCustomer as $item) {
+                $row    = $item['row'];
+                $offset = $item['offset'];
+                $mark   = $item['mark']; // ✅ mark_no from Excel
+
+                $description = $essentialColumns['desc_col']      !== null ? ($row[$essentialColumns['desc_col']]      ?? null) : null;
+                $ctn         = $essentialColumns['ctn_col']       !== null ? (int)   ($row[$essentialColumns['ctn_col']]       ?? 0) : 0;
+                $qty         = $essentialColumns['qty_col']       !== null ? (int)   ($row[$essentialColumns['qty_col']]       ?? 0) : 0;
+                $ttlQty      = $essentialColumns['totalqty_col']  !== null ? (int)   ($row[$essentialColumns['totalqty_col']]  ?? 0) : $qty;
+                $unit        = $essentialColumns['unit_col']      !== null ? ($row[$essentialColumns['unit_col']]      ?? null) : null;
+                $price       = $essentialColumns['price_col']     !== null ? (float) ($row[$essentialColumns['price_col']]     ?? 0) : 0;
+                $ttlAmount   = $essentialColumns['amount_col']    !== null ? (float) ($row[$essentialColumns['amount_col']]    ?? 0) : 0;
+                $cbm         = $essentialColumns['cbm_col']       !== null ? (float) ($row[$essentialColumns['cbm_col']]       ?? 0) : 0;
+                $ttlCbm      = $essentialColumns['totalcbm_col']  !== null ? (float) ($row[$essentialColumns['totalcbm_col']]  ?? $cbm) : $cbm;
+                $kg          = $essentialColumns['kg_col']        !== null ? (float) ($row[$essentialColumns['kg_col']]        ?? 0) : 0;
+                $ttlKg       = $essentialColumns['totalkg_col']   !== null ? (float) ($row[$essentialColumns['totalkg_col']]   ?? $kg) : $kg;
+
+                $shopNo      = $essentialColumns['shopno_col']    !== null ? ($row[$essentialColumns['shopno_col']]    ?? null) : null;
+
+                $rowIndex = $headerRowIndex + 1 + $offset;
+
+                InvoiceItem::create([
+                    'invoice_id'          => $invoice->id,
+                    'container_id'        => $container->id,
+                    'container_row_index' => $rowIndex,
+                    'description'         => $description,
+                    'ctn'                 => $ctn,
+                    'qty'                 => $qty,
+                    'ttl_qty'             => $ttlQty,
+                    'unit'                => $unit,
+                    'price'               => $price,
+                    'ttl_amount'          => $ttlAmount,
+                    'cbm'                 => $cbm,
+                    'ttl_cbm'             => $ttlCbm,
+                    'kg'                  => $kg,
+                    'ttl_kg'              => $ttlKg,
+                    'shop_no'             => $shopNo,
+                    'mark_no'             => $mark, // ✅ save mark_no from Excel
+                ]);
+
+                $totalAmount += $ttlAmount;
+            }
+
+            $invoice->final_amount          = $totalAmount;
+            $invoice->gst_percent           = 0;
+            $invoice->gst_amount            = 0;
+            $invoice->final_amount_with_gst = $totalAmount;
+
+            $invoice->save();
+        }
+
+        $msg = "Container '{$container->container_number}' created with {$savedCount} rows and {$invoiceCount} customer invoice(s).";
+        return redirect()->route('containers.index')->with('success', $msg);
+    }
+
+    public function show(Container $container)
+    {
+        $container->load('rows');
+
+        $lockedRowIndexes = \App\Models\Invoice::whereIn('invoices.status', ['paid', 'paying'])
+            ->where('invoices.container_id', $container->id)
+            ->join('invoice_items', 'invoices.id', '=', 'invoice_items.invoice_id')
+            ->pluck('invoice_items.container_row_index')
+            ->filter()
+            ->unique()
+            ->values()
+            ->toArray();
+
+        return view('admin.container_show', compact('container', 'lockedRowIndexes'));
+    }
+
+    public function updateRows(Request $request, Container $container)
+    {
+        $rowsInput = $request->input('rows', []);
+
+        foreach ($rowsInput as $rowId => $cols) {
+            $row = ContainerRow::where('container_id', $container->id)
+                ->where('id', $rowId)
+                ->first();
+
+            if (!$row) {
+                continue;
+            }
+
+            $data = $row->data ?? [];
+            foreach ($cols as $colHeader => $value) {
+                $data[$colHeader] = $value;
+            }
+            $row->update(['data' => $data]);
+
+            $normalizedMap = [];
+            foreach ($data as $key => $value) {
+                if ($key === null || $key === '') {
+                    continue;
+                }
+
+                $normKey = strtoupper((string)$key);
+                $normKey = str_replace([' ', '/', '-', '.'], '', $normKey);
+                $normalizedMap[$normKey] = $value;
+            }
+
+            $getFirstNumeric = function (array $map, array $possibleKeys) {
+                foreach ($possibleKeys as $search) {
+                    $normSearch = strtoupper($search);
+                    $normSearch = str_replace([' ', '/', '-', '.'], '', $normSearch);
+
+                    foreach ($map as $nKey => $value) {
+                        if (strpos($nKey, $normSearch) !== false) {
+                            if (is_numeric($value)) {
+                                return (float)$value;
+                            }
+                            if (is_string($value) && is_numeric(trim($value))) {
+                                return (float)trim($value);
+                            }
+                        }
+                    }
+                }
+                return 0;
+            };
+
+            $ctnKeys    = ['CTN', 'CTNS'];
+            $qtyKeys    = ['QTY', 'PCS', 'PIECES'];
+            $ttlQtyKeys = ['ITLQTY', 'TOTALQTY', 'TTLQTY'];
+            $cbmKeys    = ['TOTALCBM', 'TTLCBM', 'ITLCBM', 'CBM'];
+            $kgKeys     = ['TOTALKG', 'TTKG', 'KG', 'WEIGHT'];
+            $amountKeys = ['AMOUNT', 'TTLAMOUNT', 'TOTALAMOUNT'];
+
+            $ctn = $getFirstNumeric($normalizedMap, $ctnKeys);
+
+            $qty = $getFirstNumeric($normalizedMap, $qtyKeys);
+
+            $ttlQ = $getFirstNumeric($normalizedMap, $ttlQtyKeys);
+
+            if ($ttlQ == 0 && $ctn && $qty) {
+                $ttlQ = $ctn * $qty;
+            }
+
+            $cbm  = $getFirstNumeric($normalizedMap, ['CBM']);
+            $ttlC = $getFirstNumeric($normalizedMap, ['TOTALCBM', 'TTLCBM', 'ITLCBM']);
+            if ($ttlC == 0 && $cbm && $ctn) {
+                $ttlC = $cbm * $ctn;
+            }
+
+            $kg   = $getFirstNumeric($normalizedMap, ['KG', 'WEIGHT']);
+            $ttlK = $getFirstNumeric($normalizedMap, ['TOTALKG', 'TTKG']);
+            if ($ttlK == 0 && $kg && $ctn) {
+                $ttlK = $kg * $ctn;
+            }
+
+            $price  = $getFirstNumeric($normalizedMap, ['PRICE', 'RATE']);
+            $amount = $getFirstNumeric($normalizedMap, $amountKeys);
+            if ($amount == 0 && $price && $ttlQ) {
+                $amount = $price * $ttlQ;
+            }
+
+            $desc = null;
+            foreach (['DESCRIPTION', 'DESC'] as $dKey) {
+                $normD = str_replace([' ', '/', '-', '.'], '', strtoupper($dKey));
+                foreach ($normalizedMap as $nKey => $v) {
+                    if (strpos($nKey, $normD) !== false) {
+                        $desc = is_string($v) ? trim($v) : $v;
+                        break 2;
+                    }
+                }
+            }
+
+            $shopNo = null;
+            foreach (['SHOPNO', 'SHOP'] as $sKey) {
+                $normS = str_replace([' ', '/', '-', '.'], '', strtoupper($sKey));
+                foreach ($normalizedMap as $nKey => $v) {
+                    if (strpos($nKey, $normS) !== false) {
+                        $shopNo = is_string($v) ? trim($v) : $v;
+                        break 2;
+                    }
+                }
+            }
+
+            // ✅ Get mark_no
+            $markNo = null;
+            foreach (['MARKNO', 'MARK', 'ITEMNO', 'ITEM'] as $mKey) {
+                $normM = str_replace([' ', '/', '-', '.'], '', strtoupper($mKey));
+                foreach ($normalizedMap as $nKey => $v) {
+                    if (strpos($nKey, $normM) !== false) {
+                        $markNo = is_string($v) ? trim($v) : $v;
+                        break 2;
+                    }
+                }
+            }
+
+            $rowIndex = $row->row_index;
+
+            $items = InvoiceItem::where('container_id', $container->id)
+                ->where('container_row_index', $rowIndex)
+                ->get();
+
+            if ($items->isEmpty() && $desc) {
+                $items = InvoiceItem::where('container_id', $container->id)
+                    ->whereNull('container_row_index')
+                    ->where('description', $desc)
+                    ->get();
+            }
+
+            foreach ($items as $item) {
+                $item->description = $desc;
+                $item->ctn         = $ctn;
+                $item->qty         = $qty;
+                $item->ttl_qty     = $ttlQ;
+                $item->price       = $price;
+                $item->ttl_amount  = $amount;
+                $item->cbm         = $cbm;
+                $item->ttl_cbm     = $ttlC;
+                $item->kg          = $kg;
+                $item->ttl_kg      = $ttlK;
+                $item->shop_no     = $shopNo;
+                $item->mark_no     = $markNo; // ✅ update mark_no
+                $item->save();
+
+                $invoice = $item->invoice;
+                if ($invoice) {
+                    $newBaseAmount = InvoiceItem::where('invoice_id', $invoice->id)
+                        ->sum('ttl_amount');
+
+                    $taxType     = $invoice->tax_type;
+                    $cgstPercent = (float) ($invoice->cgst_percent ?? 0);
+                    $sgstPercent = (float) ($invoice->sgst_percent ?? 0);
+                    $igstPercent = (float) ($invoice->igst_percent ?? 0);
+
+                    $gstPercent = 0;
+                    if ($taxType === 'gst') {
+                        $gstPercent = $cgstPercent + $sgstPercent;
+                    } elseif ($taxType === 'igst') {
+                        $gstPercent = $igstPercent;
+                    }
+
+                    $gstAmount    = $newBaseAmount * $gstPercent / 100;
+                    $finalWithGst = $newBaseAmount + $gstAmount;
+
+                    $invoice->final_amount          = $newBaseAmount;
+                    $invoice->gst_amount            = $gstAmount;
+                    $invoice->final_amount_with_gst = $finalWithGst;
+                    $invoice->gst_percent           = $gstPercent;
+                    $invoice->save();
+                }
+            }
+        }
+
+        return redirect()
+            ->route('containers.show', $container->id)
+            ->with('success', 'Excel rows updated successfully.');
+    }
+
+    public function updateStatus(Request $request, Container $container)
+    {
+        $request->validate([
+            'status' => 'required|in:container-ready,export-custom,international-transit,arrived-at-india,import-custom,warehouse,domestic-distribution,out-for-delivery,delivered',
+        ]);
+
+        $container->status = $request->status;
+        $container->save();
+
+        if ($request->wantsJson() || $request->ajax()) {
+            return response()->json([
+                'success' => true,
+                'status'  => $container->status,
+            ]);
+        }
+
+        return back()->with('success', 'Container status updated.');
+    }
+
+    public function destroy(Container $container)
+    {
+        $container->delete();
+
+        if (request()->wantsJson() || request()->ajax()) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Container deleted',
+            ]);
+        }
+
+        return redirect()
+            ->route('containers.index')
+            ->with('success', 'Container deleted.');
+    }
+
+    private function generateInvoiceNumber(): string
+    {
+        $year = now()->format('Y');
+
+        $last = Invoice::whereYear('created_at', $year)
+            ->orderBy('id', 'desc')
+            ->first();
+
+        if ($last) {
+            $parts = explode('-', $last->invoice_number);
+            $seq   = 0;
+
+            if (count($parts) === 3) {
+                $seq = (int) $parts[2];
+            }
+
+            $nextSeq = $seq + 1;
+        } else {
+            $nextSeq = 1;
+        }
+
+        return 'INV-' . $year . '-' . str_pad($nextSeq, 6, '0', STR_PAD_LEFT);
+    }
+
+    public function downloadPdf(Container $container)
+    {
+        $container->load('rows');
+
+        $pdf = Pdf::loadView('admin.container_pdf', [
+            'container' => $container,
+        ])->setPaper('a4', 'landscape');
+
+        $fileName = 'container-'.$container->container_number.'.pdf';
+
+        return $pdf->download($fileName);
+    }
+
+    public function downloadExcel(Container $container)
+    {
+        if (!$container->excel_file) {
+            abort(404, 'Excel file not found on record.');
+        }
+
+        $path = $container->excel_file;
+
+        if (!Storage::exists($path)) {
+            abort(404, 'Excel file missing on server.');
+        }
+
+        $fileName = 'container-'.$container->container_number.'.xlsx';
+
+        return Storage::download($path, $fileName);
+    }
+
+    public function popupPopup(Container $container)
+    {
+        $container->load('rows');
+
+        $rows = $container->rows ?? collect();
+
+        $totalCtn = 0;
+        $totalQty = 0;
+        $totalCbm = 0;
+        $totalKg  = 0;
+
+        $ctnKeys = ['CTN', 'CTNS'];
+        $qtyKeys = ['ITLQTY', 'TOTALQTY', 'TTLQTY', 'QTY', 'PCS', 'PIECES'];
+        $cbmKeys = ['TOTALCBM', 'TTLCBM', 'ITLCBM', 'CBM'];
+        $kgKeys  = ['TOTALKG', 'TTKG', 'KG', 'WEIGHT'];
+
+        $getFirstNumeric = function (array $data, array $possibleKeys) {
+            $normalizedMap = [];
+            foreach ($data as $key => $value) {
+                if ($key === null) continue;
+                $normKey = strtoupper((string)$key);
+                $normKey = str_replace([' ', ',', '-', '.', "\n", "\r", "\t"], '', $normKey);
+                $normalizedMap[$normKey] = $value;
+            }
+
+            foreach ($possibleKeys as $search) {
+                $normSearch = strtoupper($search);
+                $normSearch = str_replace([' ', ',', '-', '.', "\n", "\r", "\t"], '', $normSearch);
+
+                foreach ($normalizedMap as $nKey => $value) {
+                    if (strpos($nKey, $normSearch) !== false) {
+                        if (is_numeric($value)) {
+                            return (float)$value;
+                        }
+                        if (is_string($value) && is_numeric(trim($value))) {
+                            return (float)trim($value);
+                        }
+                    }
+                }
+            }
+            return 0;
+        };
+
+        foreach ($rows as $row) {
+            $data = $row->data ?? [];
+            if (!is_array($data)) continue;
+
+            $totalCtn += $getFirstNumeric($data, $ctnKeys);
+            $totalQty += $getFirstNumeric($data, $qtyKeys);
+            $totalCbm += $getFirstNumeric($data, $cbmKeys);
+            $totalKg  += $getFirstNumeric($data, $kgKeys);
+        }
+
+        $summary = [
+            'total_ctn' => round($totalCtn, 2),
+            'total_qty' => round($totalQty, 2),
+            'total_cbm' => round($totalCbm, 3),
+            'total_kg'  => round($totalKg, 2),
+        ];
+
+        return view('admin.partials.container_popup_readonly', [
+            'container' => $container,
+            'summary'   => $summary,
+        ]);
+    }
+}

app/Http/Controllers/user/UserOrderController.php

@@ -21,23 +21,33 @@ class UserOrderController extends Controller
         }
 
         // -------------------------------------
-        // Get all orders
+        // Get customer invoices with containers
         // -------------------------------------
-        $orders = $user->orders()->with('invoice')->get();
+        $invoices = $user->invoices()->with('container')->get();
+
+        // Unique containers for this customer
+        $containers = $invoices->pluck('container')->filter()->unique('id');
 
         // -------------------------------------
-        // Counts
+        // Counts based on container status
         // -------------------------------------
-        $totalOrders = $orders->count();
-        $delivered   = $orders->where('status', 'delivered')->count();
-        $inTransit   = $orders->where('status', '!=', 'delivered')->count();
-        $active      = $totalOrders;
+        $totalOrders = $containers->count();
+
+        $delivered = $containers->where('status', 'delivered')->count();
+
+        $inTransit = $containers->whereNotIn('status', [
+            'delivered',
+            'warehouse',
+            'domestic-distribution'
+        ])->count();
+
+        $active = $totalOrders;
 
         // -------------------------------------
-        // Total Amount = Invoice.total_with_gst
+        // Total Amount = sum of invoice totals
         // -------------------------------------
-        $totalAmount = $orders->sum(function ($o) {
-            return $o->invoice->final_amount_with_gst ?? 0;
+        $totalAmount = $invoices->sum(function ($invoice) {
+            return $invoice->final_amount_with_gst ?? 0;
         });
 
         // Format total amount in K, L, Cr
@@ -45,13 +55,12 @@ class UserOrderController extends Controller
 
         return response()->json([
             'status' => true,
-
             'summary' => [
                 'active_orders'     => $active,
                 'in_transit_orders' => $inTransit,
                 'delivered_orders'  => $delivered,
-                'total_value'       => $formattedAmount,  // formatted value
-                'total_raw'         => $totalAmount       // original value
+                'total_value'       => $formattedAmount,
+                'total_raw'         => $totalAmount
             ]
         ]);
     }
@@ -90,20 +99,28 @@ class UserOrderController extends Controller
         ], 401);
     }
 
-    // Fetch orders for this user
-    $orders = $user->orders()
-        ->with(['invoice', 'shipments'])
+    // Get invoices with containers for this customer
+    $invoices = $user->invoices()
+        ->with('container')
         ->orderBy('id', 'desc')
-        ->get()
-        ->map(function ($o) {
-            return [
-                'order_id'   => $o->order_id,
-                'status'     => $o->status,
-                'amount'     => $o->ttl_amount,
-                'description'=> "Order from {$o->origin} to {$o->destination}",
-                'created_at' => $o->created_at,
-            ];
-        });
+        ->get();
+
+    // Extract unique containers
+    $containers = $invoices->pluck('container')
+        ->filter()
+        ->unique('id')
+        ->values();
+
+    $orders = $containers->map(function ($container) {
+
+        return [
+            'order_id'          => $container->id,
+            'container_number'  => $container->container_number,
+            'status'            => $container->status,
+            'container_date'    => $container->container_date,
+            'created_at'        => $container->created_at,
+        ];
+    });
 
     return response()->json([
         'success' => true,
@@ -115,45 +132,73 @@ public function orderDetails($order_id)
 {
     $user = JWTAuth::parseToken()->authenticate();
 
-    $order = $user->orders()
+    if (!$user) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Unauthorized'
+        ], 401);
+    }
+
+    // Find container first
+    $container = \App\Models\Container::find($order_id);
+
+    if (!$container) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Container not found'
+        ], 404);
+    }
+
+    // Find invoice belonging to this user for this container
+    $invoice = \App\Models\Invoice::where('customer_id', $user->id)
+        ->where('container_id', $container->id)
         ->with(['items'])
-        ->where('order_id', $order_id)
         ->first();
 
-    if (!$order) {
-        return response()->json(['success' => false, 'message' => 'Order not found'], 404);
+    if (!$invoice) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Order not found for this user'
+        ], 404);
     }
 
     return response()->json([
         'success' => true,
-        'order'   => $order
+        'order' => [
+            'container_id'     => $container->id,
+            'container_number' => $container->container_number,
+            'container_date'   => $container->container_date,
+            'status'           => $container->status,
+            'invoice_id'       => $invoice->id,
+            'items'            => $invoice->items
+        ]
     ]);
 }
 
 
-public function orderShipment($order_id)
-{
-    $user = JWTAuth::parseToken()->authenticate();
+// public function orderShipment($order_id)
+// {
+//     $user = JWTAuth::parseToken()->authenticate();
 
-    // Get order
-    $order = $user->orders()->where('order_id', $order_id)->first();
+//     // Get order
+//     $order = $user->orders()->where('order_id', $order_id)->first();
 
-    if (!$order) {
-        return response()->json(['success' => false, 'message' => 'Order not found'], 404);
-    }
+//     if (!$order) {
+//         return response()->json(['success' => false, 'message' => 'Order not found'], 404);
+//     }
 
-    // Find shipment only for this order
-    $shipment = $order->shipments()
-        ->with(['items' => function ($q) use ($order) {
-            $q->where('order_id', $order->id);
-        }])
-        ->first();
+//     // Find shipment only for this order
+//     $shipment = $order->shipments()
+//         ->with(['items' => function ($q) use ($order) {
+//             $q->where('order_id', $order->id);
+//         }])
+//         ->first();
 
-    return response()->json([
-        'success' => true,
-        'shipment' => $shipment
-    ]);
-}
+//     return response()->json([
+//         'success' => true,
+//         'shipment' => $shipment
+//     ]);
+// }
 
 
 public function orderInvoice($order_id)
@@ -179,23 +224,35 @@ public function trackOrder($order_id)
 {
     $user = JWTAuth::parseToken()->authenticate();
 
-    $order = $user->orders()
-        ->with('shipments')
-        ->where('order_id', $order_id)
-        ->first();
-
-    if (!$order) {
-        return response()->json(['success' => false, 'message' => 'Order not found'], 404);
+    if (!$user) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Unauthorized'
+        ], 401);
     }
 
-    $shipment = $order->shipments()->first();
+    // Ensure the container belongs to this customer via invoice
+    $invoice = \App\Models\Invoice::where('customer_id', $user->id)
+        ->where('container_id', $order_id)
+        ->with('container')
+        ->first();
+
+    if (!$invoice || !$invoice->container) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Order not found'
+        ], 404);
+    }
+
+    $container = $invoice->container;
 
     return response()->json([
         'success' => true,
         'track' => [
-            'order_id' => $order->order_id,
-            'shipment_status' => $shipment->status ?? 'pending',
-            'shipment_date'   => $shipment->shipment_date ?? null,
+            'order_id'         => $container->id,
+            'container_number' => $container->container_number,
+            'status'           => $container->status,
+            'container_date'   => $container->container_date,
         ]
     ]);
 }
@@ -289,44 +346,44 @@ public function invoiceDetails($invoice_id)
     ]);
 }
 
-public function confirmOrder($order_id)
-{
-    $user = JWTAuth::parseToken()->authenticate();
+// public function confirmOrder($order_id)
+// {
+//     $user = JWTAuth::parseToken()->authenticate();
 
-    if (! $user) {
-        return response()->json([
-            'success' => false,
-            'message' => 'Unauthorized'
-        ], 401);
-    }
+//     if (! $user) {
+//         return response()->json([
+//             'success' => false,
+//             'message' => 'Unauthorized'
+//         ], 401);
+//     }
 
-    $order = $user->orders()
-        ->where('order_id', $order_id)
-        ->first();
+//     $order = $user->orders()
+//         ->where('order_id', $order_id)
+//         ->first();
 
-    if (! $order) {
-        return response()->json([
-            'success' => false,
-            'message' => 'Order not found'
-        ], 404);
-    }
+//     if (! $order) {
+//         return response()->json([
+//             'success' => false,
+//             'message' => 'Order not found'
+//         ], 404);
+//     }
 
-    // 🚫 Only allow confirm from order_placed
-    if ($order->status !== 'order_placed') {
-        return response()->json([
-            'success' => false,
-            'message' => 'Order cannot be confirmed'
-        ], 422);
-    }
+//     // 🚫 Only allow confirm from order_placed
+//     if ($order->status !== 'order_placed') {
+//         return response()->json([
+//             'success' => false,
+//             'message' => 'Order cannot be confirmed'
+//         ], 422);
+//     }
 
-    $order->status = 'order_confirmed';
-    $order->save();
+//     $order->status = 'order_confirmed';
+//     $order->save();
 
-    return response()->json([
-        'success' => true,
-        'message' => 'Order confirmed successfully'
-    ]);
-}
+//     return response()->json([
+//         'success' => true,
+//         'message' => 'Order confirmed successfully'
+//     ]);
+// }
 
 
 

app/Models/ChatMessage.php

@@ -20,8 +20,6 @@ class ChatMessage extends Model
     'read_by_user',
     'client_id',
 ];
-
-
     /**
      * The ticket this message belongs to.
      */

app/Models/Container.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Container extends Model
+{
+    protected $fillable = [
+        'container_name',
+        'container_number',
+        'container_date',
+        'status',
+        'excel_file',
+    ];
+
+    protected $casts = [
+        'container_date' => 'date',
+    ];
+
+    public function rows()
+    {
+        return $this->hasMany(ContainerRow::class);
+    }
+
+    public function invoices()
+    {
+        return $this->hasMany(Invoice::class);
+    }
+}

app/Models/ContainerRow.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ContainerRow extends Model
+{
+    protected $fillable = [
+        'container_id',
+        'row_index',
+        'data',
+    ];
+
+    protected $casts = [
+        'data' => 'array',
+    ];
+
+    public function container()
+    {
+        return $this->belongsTo(Container::class);
+    }
+}

app/Models/Invoice.php

@@ -9,41 +9,36 @@ class Invoice extends Model
 {
     use HasFactory;
 
- protected $fillable = [
-    'order_id',
-    'customer_id',
-    'mark_no',
-
-    'invoice_number',
-    'invoice_date',
-    'due_date',
-
-    'payment_method',
-    'reference_no',
-    'status',
-
-    'final_amount', // without tax
-
-    'tax_type',     // gst / igst
-    'gst_percent',  // only used for gst UI input
-    'cgst_percent',
-    'sgst_percent',
-    'igst_percent',
-
-    'gst_amount',   // total tax amount
-    'final_amount_with_gst',
-
-    'customer_name',
-    'company_name',
-    'customer_email',
-    'customer_mobile',
-    'customer_address',
-    'pincode',
-
-    'pdf_path',
-    'notes',
-];
-
+    protected $fillable = [
+        'container_id',
+        'customer_id',
+        'mark_no',
+        'invoice_number',
+        'invoice_date',
+        'due_date',
+        'payment_method',
+        'reference_no',
+        'status',
+        'final_amount',
+        'gst_percent',
+        'gst_amount',
+        'final_amount_with_gst',
+        'customer_name',
+        'company_name',
+        'customer_email',
+        'customer_mobile',
+        'customer_address',
+        'pincode',
+        'pdf_path',
+        'notes',
+        // totals from charge groups
+        'charge_groups_total',
+        'grand_total_with_charges',
+        'tax_type',
+        'cgst_percent',
+        'sgst_percent',
+        'igst_percent',
+    ];
 
     /****************************
      * Relationships
@@ -54,29 +49,38 @@ class Invoice extends Model
         return $this->hasMany(InvoiceItem::class)->orderBy('id', 'ASC');
     }
 
-    public function order()
-    {
-        return $this->belongsTo(Order::class);
-    }
+    // public function container()
+    // {
+    //     return $this->belongsTo(Container::class);
+    // }
 
     public function customer()
     {
         return $this->belongsTo(User::class, 'customer_id');
     }
 
+    public function installments()
+    {
+        return $this->hasMany(InvoiceInstallment::class);
+    }
+
+    public function chargeGroups()
+    {
+        return $this->hasMany(InvoiceChargeGroup::class, 'invoice_id');
+    }
+
     /****************************
      * Helper Functions
      ****************************/
 
-    // Auto calculate GST fields (you can call this in controller before saving)
+    // (Items based calculateTotals वापरणार नाहीस तरी ठेवू शकतोस)
     public function calculateTotals()
     {
         $gst = ($this->final_amount * $this->gst_percent) / 100;
-        $this->gst_amount = $gst;
+        $this->gst_amount            = $gst;
         $this->final_amount_with_gst = $this->final_amount + $gst;
     }
 
-    // Check overdue status condition
     public function isOverdue()
     {
         return $this->status === 'pending' && now()->gt($this->due_date);
@@ -84,28 +88,46 @@ class Invoice extends Model
 
     public function getShipment()
     {
-        return $this->order?->shipments?->first();
+        return null;
     }
 
-    public function installments()
+    // ✅ Charge groups base total (WITHOUT GST)
+    public function getChargeGroupsTotalAttribute()
+    {
+        // base = total_charge sum
+        return (float) $this->chargeGroups->sum('total_charge');
+    }
+
+    // ✅ Grand total: Charge groups base + GST (items ignore)
+    public function getGrandTotalWithChargesAttribute()
+    {
+        $base = (float) ($this->charge_groups_total ?? 0);
+        $gst  = (float) ($this->gst_amount ?? 0);
+
+        return $base + $gst;
+    }
+
+    public function totalPaid(): float
+    {
+        return (float) $this->installments()->sum('amount');
+    }
+
+    public function remainingAmount(): float
+    {
+        $grand = (float) $this->grand_total_with_charges;
+        $paid  = (float) $this->totalPaid();
+
+        return max(0, $grand - $paid);
+    }
+
+    public function isLockedForEdit(): bool
+    {
+        return $this->status === 'paid';
+    }
+
+    public function container()
 {
-    return $this->hasMany(InvoiceInstallment::class);
+    return $this->belongsTo(\App\Models\Container::class, 'container_id');
 }
-
-// App\Models\Invoice.php
-
-public function totalPaid()
-{
-    return $this->installments()->sum('amount');
-}
-
-public function remainingAmount()
-{
-    return max(
-        ($this->final_amount_with_gst ?? 0) - $this->totalPaid(),
-        0
-    );
-}
-
-
+    
 }

app/Models/InvoiceChargeGroup.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class InvoiceChargeGroup extends Model
+{
+    protected $fillable = [
+        'invoice_id',
+        'group_name',
+        'basis_type',
+        'basis_value',
+        'rate',
+        'total_charge',
+
+        'tax_type',
+        'gst_percent',
+        'total_with_gst',
+    ];
+
+    public function invoice()
+    {
+        return $this->belongsTo(Invoice::class);
+    }
+
+    public function items()
+    {
+        return $this->hasMany(InvoiceChargeGroupItem::class, 'group_id');
+    }
+}

app/Models/InvoiceChargeGroupItem.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class InvoiceChargeGroupItem extends Model
+{
+    protected $fillable = [
+        'group_id',
+        'invoice_item_id',
+    ];
+
+    public function group()
+    {
+        return $this->belongsTo(InvoiceChargeGroup::class, 'group_id');
+    }
+
+    public function item()
+    {
+        return $this->belongsTo(InvoiceItem::class, 'invoice_item_id');
+    }
+}

app/Models/InvoiceItem.php

@@ -11,6 +11,8 @@ class InvoiceItem extends Model
 
     protected $fillable = [
         'invoice_id',
+        'container_id',        // Container mapping
+        'container_row_index', // Container row index
 
         'description',
         'ctn',
@@ -27,6 +29,7 @@ class InvoiceItem extends Model
         'ttl_kg',
 
         'shop_no',
+        'mark_no',
     ];
 
     /****************************
@@ -37,4 +40,79 @@ class InvoiceItem extends Model
     {
         return $this->belongsTo(Invoice::class);
     }
+
+    public function chargeGroupItems()
+    {
+        return $this->hasMany(InvoiceChargeGroupItem::class, 'invoice_item_id');
+    }
+
+    // हे helper: पहिला group fetch करून त्यावरून rate/total काढणे
+    public function getChargeRateAttribute()
+    {
+        $pivot = $this->chargeGroupItems->first();
+        if (!$pivot || !$pivot->group) {
+            return 0;
+        }
+
+        $group = $pivot->group;
+
+        // basis नुसार या item चा basis value
+        $basis = 0;
+        switch ($group->basis_type) {
+            case 'ttl_qty':
+                $basis = $this->ttl_qty;
+                break;
+            case 'amount':
+                $basis = $this->ttl_amount;
+                break;
+            case 'ttl_cbm':
+                $basis = $this->ttl_cbm;
+                break;
+            case 'ttl_kg':
+                $basis = $this->ttl_kg;
+                break;
+        }
+
+        if ($basis <= 0 || ($group->basis_value ?? 0) <= 0) {
+            return 0;
+        }
+
+        // group चा rate field आधीच आहे, ते direct वापरू
+        return (float) $group->rate;
+    }
+
+    public function getChargeTotalAttribute()
+    {
+        $pivot = $this->chargeGroupItems->first();
+        if (!$pivot || !$pivot->group) {
+            return 0;
+        }
+
+        $group = $pivot->group;
+
+        $basis = 0;
+        switch ($group->basis_type) {
+            case 'ttl_qty':
+                $basis = $this->ttl_qty;
+                break;
+            case 'amount':
+                $basis = $this->ttl_amount;
+                break;
+            case 'ttl_cbm':
+                $basis = $this->ttl_cbm;
+                break;
+            case 'ttl_kg':
+                $basis = $this->ttl_kg;
+                break;
+        }
+
+        if ($basis <= 0 || ($group->basis_value ?? 0) <= 0) {
+            return 0;
+        }
+
+        // per unit rate
+        $rate = (float) $group->rate;
+        // item total = basis * rate
+        return $basis * $rate;
+    }
 }

app/Models/Order.php

@@ -58,10 +58,10 @@ class Order extends Model
         return $this->belongsToMany(\App\Models\Shipment::class, 'shipment_items', 'order_id', 'shipment_id');
     }
 
-        public function invoice()
-    {
-        return $this->hasOne(\App\Models\Invoice::class, 'order_id', 'id');
-    }
+    //     public function invoice()
+    // {
+    //     return $this->hasOne(\App\Models\Invoice::class, 'order_id', 'id');
+    // }
 
 
     const STATUS_LABELS = [

app/Models/User.php

@@ -89,10 +89,8 @@ class User extends Authenticatable implements JWTSubject
     {
         return [];
     }
-public function invoices()
-{
-    return $this->hasMany(\App\Models\Invoice::class, 'customer_id', 'id');
-}
+
+    
 
 // App\Models\User.php
 
@@ -107,6 +105,10 @@ public function invoiceInstallments()
     );
 }
 
+public function invoices()
+{
+    return $this->hasMany(\App\Models\Invoice::class, 'customer_id', 'id');
+}
 
 
 }

database/migrations/2025_11_15_120425_create_invoice_items_table.php

@@ -33,6 +33,9 @@ class CreateInvoiceItemsTable extends Migration
             $table->string('shop_no')->nullable();
 
             $table->timestamps();
+            
+            $table->unsignedBigInteger('container_id')->nullable()->after('invoice_id');
+            $table->integer('container_row_index')->nullable()->after('container_id');
 
             // FK
             $table->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
@@ -49,4 +52,6 @@ class CreateInvoiceItemsTable extends Migration
         });
         Schema::dropIfExists('invoice_items');
     }
+
+    
 }

database/migrations/2026_02_07_061825_create_containers_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::create('containers', function (Blueprint $table) {
+            $table->id();
+            $table->string('container_name');
+            $table->string('container_number')->unique();
+            $table->date('container_date');
+            $table->string('excel_file')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('containers');
+    }
+};

database/migrations/2026_02_07_071829_create_loading_list_items_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::create('loading_list_items', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('container_id')
+                  ->constrained('containers')
+                  ->onDelete('cascade');
+
+            $table->string('mark')->nullable();          // MARK / ITEM NO
+            $table->string('description')->nullable();
+            $table->integer('ctn')->nullable();
+            $table->integer('qty')->nullable();
+            $table->integer('total_qty')->nullable();
+            $table->string('unit')->nullable();
+            $table->decimal('price', 15, 3)->nullable(); // SAHIL format साठी
+            $table->decimal('cbm', 15, 5)->nullable();
+            $table->decimal('total_cbm', 15, 5)->nullable();
+            $table->decimal('kg', 15, 3)->nullable();
+            $table->decimal('total_kg', 15, 3)->nullable();
+
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('loading_list_items');
+    }
+};

database/migrations/2026_02_07_113151_create_container_rows_table.php

@@ -0,0 +1,31 @@
+<?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::create('container_rows', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('container_id')
+                  ->constrained('containers')
+                  ->onDelete('cascade');
+
+            // Excel मधल्या row क्रमांकासाठी (optional)
+            $table->unsignedInteger('row_index')->nullable();
+
+            // या row चा full data: "heading text" => "cell value"
+            $table->json('data');
+
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('container_rows');
+    }
+};

database/migrations/2026_02_07_132057_add_status_to_containers_table.php

@@ -0,0 +1,24 @@
+<?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('containers', function (Blueprint $table) {
+            $table->string('status', 21)
+                  ->default('pending')
+                  ->after('container_date');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('containers', function (Blueprint $table) {
+            $table->dropColumn('status');
+        });
+    }
+};

database/migrations/2026_02_16_060157_update_invoices_for_container_relation.php

@@ -0,0 +1,43 @@
+<?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('invoices', function (Blueprint $table) {
+            // 1) order_id foreign key काढा
+            $table->dropForeign(['order_id']);
+
+            // 2) order_id column काढा
+            $table->dropColumn('order_id');
+
+            // 3) container_id add करा
+            $table->unsignedBigInteger('container_id')->nullable()->after('id');
+
+            // 4) container_id FK
+            $table->foreign('container_id')
+                ->references('id')
+                ->on('containers')
+                ->onDelete('cascade');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            // rollback: container_id काढून order_id परत add
+            $table->dropForeign(['container_id']);
+            $table->dropColumn('container_id');
+
+            $table->unsignedBigInteger('order_id')->index();
+            $table->foreign('order_id')
+                ->references('id')
+                ->on('orders')
+                ->onDelete('cascade');
+        });
+    }
+};

database/migrations/2026_02_17_163431_create_invoice_charge_groups_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('invoice_charge_groups', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('invoice_id');
+            $table->string('group_name')->nullable();          // उदा. "FREIGHT", "HANDLING"
+            $table->enum('basis_type', ['ttl_qty', 'amount', 'ttl_cbm', 'ttl_kg']);
+            $table->decimal('basis_value', 15, 3)->default(0); // auto calculate केलेला total basis
+            $table->decimal('rate', 15, 3)->default(0);        // per basis rate (helper)
+            $table->decimal('total_charge', 15, 2);            // admin नी manually टाकलेला total
+            $table->timestamps();
+    
+            $table->foreign('invoice_id')
+                  ->references('id')->on('invoices')
+                  ->onDelete('cascade');
+        });
+    }
+    
+    public function down(): void
+    {
+        Schema::dropIfExists('invoice_charge_groups');
+    }
+    
+
+    
+};

database/migrations/2026_02_17_163544_create_invoice_charge_group_items_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('invoice_charge_group_items', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('group_id');
+            $table->unsignedBigInteger('invoice_item_id');
+            $table->timestamps();
+    
+            $table->foreign('group_id')
+                  ->references('id')->on('invoice_charge_groups')
+                  ->onDelete('cascade');
+    
+            $table->foreign('invoice_item_id')
+                  ->references('id')->on('invoice_items')
+                  ->onDelete('cascade');
+        });
+    }
+    
+    public function down(): void
+    {
+        Schema::dropIfExists('invoice_charge_group_items');
+    }
+    
+};

database/migrations/2026_02_21_101207_add_container_link_to_invoice_items.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('invoice_items', function (Blueprint $table) {
+            $table->unsignedBigInteger('container_id')->nullable()->after('invoice_id');
+            $table->integer('container_row_index')->nullable()->after('container_id');
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('invoice_items', function (Blueprint $table) {
+            $table->dropColumn(['container_id', 'container_row_index']);
+        });
+    }
+    
+};

database/migrations/2026_02_28_051812_add_duedate_to_invoices_table.php

@@ -0,0 +1,29 @@
+<?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('invoices', function (Blueprint $table) {
+            // column आधीच आहे का हे check करून, नसेल तरच add करायचा
+            if (!Schema::hasColumn('invoices', 'due_date')) {
+                $table->date('due_date')
+                      ->nullable()
+                      ->after('invoice_date');
+            }
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            if (Schema::hasColumn('invoices', 'due_date')) {
+                $table->dropColumn('due_date');
+            }
+        });
+    }
+};

database/migrations/2026_03_01_075242_alter_status_length_on_containers_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
+{
+    /**
+     * Run the migrations.
+     */
+  public function up(): void
+{
+    Schema::table('containers', function (Blueprint $table) {
+        $table->string('status', 50)->change();
+    });
+}
+
+public function down(): void
+{
+    Schema::table('containers', function (Blueprint $table) {
+        $table->string('status', 20)->change();
+    });
+}
+
+};

database/migrations/2026_03_11_050402_add_tax_fields_to_invoice_charge_groups_table.php

@@ -0,0 +1,23 @@
+<?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('invoice_charge_groups', function (Blueprint $table) {
+            $table->string('tax_type')->nullable()->after('total_charge');
+            $table->decimal('gst_percent', 5, 2)->default(0)->after('tax_type');
+            $table->decimal('total_with_gst', 15, 2)->default(0)->after('gst_percent');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('invoice_charge_groups', function (Blueprint $table) {
+            $table->dropColumn(['tax_type', 'gst_percent', 'total_with_gst']);
+        });
+    }
+};

database/migrations/2026_03_12_053830_add_charge_columns_to_invoices_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddChargeColumnsToInvoicesTable extends Migration
+{
+    public function up()
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            if (!Schema::hasColumn('invoices', 'charge_groups_total')) {
+                $table->decimal('charge_groups_total', 15, 2)
+                      ->nullable()
+                      ->after('final_amount_with_gst');
+            }
+
+            if (!Schema::hasColumn('invoices', 'grand_total_with_charges')) {
+                $table->decimal('grand_total_with_charges', 15, 2)
+                      ->nullable()
+                      ->after('charge_groups_total');
+            }
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            if (Schema::hasColumn('invoices', 'charge_groups_total')) {
+                $table->dropColumn('charge_groups_total');
+            }
+            if (Schema::hasColumn('invoices', 'grand_total_with_charges')) {
+                $table->dropColumn('grand_total_with_charges');
+            }
+        });
+    }
+}

database/migrations/2026_03_12_091307_alter_invoices_status_add_paying.php

@@ -0,0 +1,23 @@
+<?php
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        DB::statement("
+            ALTER TABLE `invoices`
+            MODIFY `status` ENUM('pending','paying','paid','overdue')
+            NOT NULL DEFAULT 'pending'
+        ");
+    }
+
+    public function down(): void
+    {
+        DB::statement("
+            ALTER TABLE `invoices`
+            MODIFY `status` ENUM('pending','paid','overdue')
+            NOT NULL DEFAULT 'pending'
+        ");
+    }
+};

database/migrations/2026_03_13_120013_add_mark_no_to_invoice_items_table.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('invoice_items', function (Blueprint $table) {
+            $table->string('mark_no')->nullable(); // after() काहीही नको
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('invoice_items', function (Blueprint $table) {
+            $table->dropColumn('mark_no');
+        });
+    }
+    
+
+};

database/seeders/PermissionSeeder.php

@@ -25,6 +25,12 @@ class PermissionSeeder extends Seeder
             // EXTRA (ORDERS)
             'orders.view',  // you added this separately
 
+            // CONTAINER
+            'container.view',
+            'container.create',
+            'container.update',
+            'container.delete',
+
             // SHIPMENT
             'shipment.view',
             'shipment.create',

resources/views/admin/Partials/container_popup_readonly.blade.php

@@ -0,0 +1,102 @@
+<div class="container-fluid py-2">
+
+    {{-- Top info cards (container / date / status) --}}
+    <div class="row mb-3">
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Container Name</small>
+                <div class="fw-semibold">{{ $container->container_name ?? '-' }}</div>
+            </div>
+        </div>
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Container No</small>
+                <div class="fw-semibold">{{ $container->container_number ?? '-' }}</div>
+            </div>
+        </div>
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Container Date</small>
+                <div class="fw-semibold">
+                    {{ $container->container_date ? \Carbon\Carbon::parse($container->container_date)->format('d-m-Y') : '-' }}
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Status</small>
+                <div class="fw-semibold text-capitalize">{{ $container->status ?? '-' }}</div>
+            </div>
+        </div>
+    </div>
+
+    {{-- Totals (CTN / Qty / CBM / KG) --}}
+    <div class="row mb-3">
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Total CTN</small>
+                <div class="fw-semibold">{{ $summary['total_ctn'] ?? '-' }}</div>
+            </div>
+        </div>
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Total Qty</small>
+                <div class="fw-semibold">{{ $summary['total_qty'] ?? '-' }}</div>
+            </div>
+        </div>
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Total CBM</small>
+                <div class="fw-semibold">{{ $summary['total_cbm'] ?? '-' }}</div>
+            </div>
+        </div>
+        <div class="col-md-3 mb-2">
+            <div class="card p-2">
+                <small class="text-muted">Total KG</small>
+                <div class="fw-semibold">{{ $summary['total_kg'] ?? '-' }}</div>
+            </div>
+        </div>
+    </div>
+
+    {{-- Excel rows – same headings as container_show --}}
+    @php
+        $allHeadings = [];
+        foreach ($container->rows as $row) {
+            if (is_array($row->data)) {
+                $allHeadings = array_unique(array_merge($allHeadings, array_keys($row->data)));
+            }
+        }
+    @endphp
+
+    <div class="table-responsive" style="max-height: 500px; border-radius: 8px;">
+        <table class="table table-sm table-bordered align-middle">
+            <thead class="table-warning">
+            <tr>
+                <th style="width: 40px;">#</th>
+                @foreach($allHeadings as $heading)
+                    <th>{{ $heading }}</th>
+                @endforeach
+            </tr>
+            </thead>
+            <tbody>
+            @forelse($container->rows as $index => $row)
+                <tr>
+                    <td>{{ $index + 1 }}</td>
+                    @foreach($allHeadings as $heading)
+                        @php
+                            $val = is_array($row->data) ? ($row->data[$heading] ?? '') : '';
+                        @endphp
+                        <td>{{ $val }}</td>
+                    @endforeach
+                </tr>
+            @empty
+                <tr>
+                    <td colspan="{{ count($allHeadings) + 1 }}" class="text-center text-muted py-3">
+                        No Excel rows for this container.
+                    </td>
+                </tr>
+            @endforelse
+            </tbody>
+        </table>
+    </div>
+</div>

resources/views/admin/account.blade.php

@@ -6,6 +6,7 @@
 <meta name="csrf-token" content="{{ csrf_token() }}">
 <style>
 /* ---------- Base ---------- */
+
 :root{
   --primary-1:#1a2951;
   --primary-2:#243a72;
@@ -37,7 +38,7 @@ body {
 /* header */
 .account-header {
   margin-bottom: 18px;
-  background: linear-gradient(90deg,var(--primary-1),var(--primary-2));
+  background:linear-gradient(135deg, #667eea 0%, #764ba2 100%);
   padding: 22px 26px;
   border-radius: var(--rounded);
   box-shadow: 0 6px 18px rgba(34,50,90,0.12);
@@ -62,7 +63,7 @@ body {
 
 .btn {
   display:inline-flex; align-items:center; justify-content:center; gap:8px;
-  background: linear-gradient(90deg,var(--primary-1),var(--primary-2));
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
   color:#fff; border:none; padding:10px 16px; border-radius:10px; font-weight:600;
   cursor:pointer; transition: transform .15s ease, box-shadow .15s;
 }
@@ -334,7 +335,7 @@ tr:hover td{ background:#fbfdff; }
     display: flex;
     align-items: center;
     gap: 8px;
-    /* margin-right:-550px; */
+    margin-right:-550px; 
     
 }
 
@@ -342,7 +343,7 @@ tr:hover td{ background:#fbfdff; }
     display: flex;
     align-items: center;
     gap: 8px;
-    margin-right:-550px;
+    margin-right:8=500px;
     
 }
 
@@ -492,7 +493,7 @@ tr:hover td{ background:#fbfdff; }
 .entry-summary-cards { 
   display:flex; 
   gap:16px; 
-  margin-bottom:20px; 
+  margin-top:25px; 
   flex-wrap:wrap; 
 }
 .entry-summary-card { 
@@ -572,7 +573,7 @@ tr:hover td{ background:#fbfdff; }
 }
 
 .entry-orders-header {
-    background: linear-gradient(90deg, var(--primary-1), var(--primary-2));
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
     padding: 24px 30px;
     color: white;
     border-radius: 16px 16px 0 0;
@@ -656,7 +657,9 @@ tr:hover td{ background:#fbfdff; }
     justify-content: space-between;
     align-items: center;
     padding: 16px 20px;
-    background: linear-gradient(90deg, #f8fbff, #f5f9ff);
+    background: linear-gradient(90deg, #e6ebf5 0%, #f9fbff 100%);
+
+
     border-radius: 10px;
     margin-top: 20px;
     border: 1px solid #eef3fb;
@@ -1007,7 +1010,10 @@ tr:hover td{ background:#fbfdff; }
     flex-wrap: wrap;
     margin-bottom: 16px;
     padding: 12px 14px;
-    background: linear-gradient(90deg, #f9fbff, #f7faff);
+    background:linear-gradient(90deg, #e6ebf5 0%, #f9fbff 100%);
+
+
+
     border-radius: 8px;
     border: 1px solid #eef3fb;
 }
@@ -1291,6 +1297,8 @@ tr:hover td{ background:#fbfdff; }
   }
   
   /* Responsive modals */
+
+ 
   .entry-details-modal .modal-box1,
   .entry-orders-modal .modal-box1 {
     margin: 10px;
@@ -1539,7 +1547,7 @@ html, body {
 <!-- CREATE ORDER POPUP MODAL -->
 <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="display:flex; align-items:center; justify-content:space-between; margin-bottom:16px; background:linear-gradient(135deg, #667eea 0%, #764ba2 100%); padding:20px; border-radius:12px; color:white; margin-top:-20px; margin-left:-20px; margin-right:-15px; margin-top:-15px;">
             <div style="font-size:20px; font-weight:800;">Create New Installment</div>
             <button class="btn ghost" id="closeCreateModal" title="Close create form">✕</button>
         </div>
@@ -1634,8 +1642,8 @@ html, body {
 <!-- ENTRY DETAILS MODAL (Enhanced) -->
 <div class="modal-fade1 entry-details-modal" id="entryDetailsModal">
     <div class="modal-box1">
-        <div class="entry-details-header">
-            <h2>Entry Details</h2>
+        <div class="entry-details-header" >
+            <h2 >Entry Details</h2>
             <div class="subtitle">
                 <span id="entryDetailsId">Loading...</span>
                 <span>• Complete view of all installments for this entry</span>
@@ -1783,7 +1791,7 @@ html, body {
 <!-- Installment Modal -->
 <div class="modal-fade1" id="installmentModal">
     <div class="modal-box1" style="max-width:720px;">
-        <div style="display:flex;align-items:center; justify-content:space-between; margin-bottom:12px;">
+        <div style="display:flex;align-items:center; justify-content:space-between; margin-bottom:12px; background:linear-gradient(135deg, #667eea 0%, #764ba2 100%); padding:16px; border-radius:8px; color:white; margin-top:-15px; margin-left:-20px; margin-right:-15px;">
             <div style="font-size:18px;font-weight:800;color:#243a72;">+ Add New Installment</div>
             <button class="btn ghost" onclick="closeInstallmentModal()">✕</button>
         </div>
@@ -2595,11 +2603,12 @@ function renderPaymentTable(list){
             <td>${escapeHtml(entry.entry_date)}</td>
             <td>${escapeHtml(entry.description)}</td>
 
+            <!-- Order Quantity - Clickable number without box -->
             <td>
-                <button type="button" class="entry-link"
-                        onclick="openEntryOrdersModal('${escapeHtml(entry.entry_no)}')">
+                <span onclick="openEntryOrdersModal('${escapeHtml(entry.entry_no)}')" 
+                      style="cursor: pointer; color: #276dea; font-weight: 600; text-decoration: underline; text-decoration-color: #ccc;">
                     ${entry.order_quantity ?? '-'}
-                </button>
+                </span>
             </td>
 
             <td>${escapeHtml(entry.region)}</td>
@@ -2672,7 +2681,6 @@ function renderPaymentTable(list){
 
 
 
-
   function cycleToggle(btn) {
     // वर्तमान position घेऊन पुढचा स्टेट कॅल्क्युलेट करा
     let pos = parseInt(btn.dataset.pos || '0', 10);   // 0 = unpaid, 1 = pending, 2 = paid

resources/views/admin/container.blade.php

@@ -0,0 +1,855 @@
+@extends('admin.layouts.app')
+
+@section('page-title', 'Containers')
+
+@section('content')
+<style>
+    :root {
+        --primary-color: #4c6fff;
+        --primary-gradient: linear-gradient(135deg, #4c6fff, #8e54e9);
+        --success-color: #10b981;
+        --warning-color: #f59e0b;
+        --danger-color: #ef4444;
+        --info-color: #3b82f6;
+        --light-bg: #f8fafc;
+        --dark-text: #1e293b;
+        --gray-text: #64748b;
+        --border-color: #e2e8f0;
+        --shadow-sm: 0 1px 3px rgba(0,0,0,0.1);
+        --shadow-md: 0 4px 6px -1px rgba(0,0,0,0.1);
+        --shadow-lg: 0 10px 25px -5px rgba(0,0,0,0.1);
+        --radius-lg: 16px;
+        --radius-md: 12px;
+        --radius-sm: 8px;
+    }
+
+    .containers-wrapper {
+        min-height: calc(100vh - 180px);
+        padding: 20px 15px;
+        background: linear-gradient(135deg, #f6f9ff 0%, #f0f4ff 100%);
+    }
+
+    .page-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 30px;
+        padding: 0 10px;
+    }
+
+    .header-content h1 {
+        font-size: 28px;
+        font-weight: 700;
+        background: var(--primary-gradient);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        background-clip: text;
+        margin-bottom: 5px;
+    }
+
+    .header-subtitle {
+        color: var(--gray-text);
+        font-size: 14px;
+        font-weight: 500;
+    }
+
+    .add-container-btn {
+        background: var(--primary-gradient);
+        color: white;
+        border: none;
+        padding: 12px 28px;
+        border-radius: var(--radius-md);
+        font-weight: 600;
+        font-size: 14px;
+        transition: all 0.3s ease;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        box-shadow: 0 4px 12px rgba(76, 111, 255, 0.3);
+    }
+
+    .add-container-btn:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 6px 20px rgba(76, 111, 255, 0.4);
+        color: white;
+    }
+
+    .add-container-btn i {
+        font-size: 16px;
+    }
+
+    .filter-card {
+        background: white;
+        border-radius: var(--radius-lg);
+        padding: 24px;
+        margin-bottom: 30px;
+        box-shadow: var(--shadow-lg);
+        border: 1px solid rgba(255,255,255,0.9);
+        backdrop-filter: blur(10px);
+    }
+
+    .filter-title {
+        font-size: 16px;
+        font-weight: 600;
+        color: var(--dark-text);
+        margin-bottom: 20px;
+        display: flex;
+        align-items: center;
+        gap: 10px;
+    }
+
+    .filter-title i { color: var(--primary-color); }
+
+    .filter-grid {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+        gap: 15px;
+    }
+
+    .filter-group { position: relative; }
+
+    .filter-group label {
+        display: block;
+        font-size: 12px;
+        font-weight: 600;
+        color: var(--gray-text);
+        margin-bottom: 8px;
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+    }
+
+    .filter-input, .filter-select, .filter-date {
+        width: 100%;
+        padding: 12px 16px;
+        border: 2px solid var(--border-color);
+        border-radius: var(--radius-md);
+        font-size: 14px;
+        color: var(--dark-text);
+        background: white;
+        transition: all 0.3s ease;
+    }
+
+    .filter-input:focus, .filter-select:focus, .filter-date:focus {
+        outline: none;
+        border-color: var(--primary-color);
+        box-shadow: 0 0 0 3px rgba(76, 111, 255, 0.1);
+    }
+
+    .filter-input::placeholder { color: #94a3b8; }
+
+    .filter-actions {
+        display: flex;
+        gap: 10px;
+        align-items: flex-end;
+    }
+
+    .apply-btn {
+        background: var(--primary-gradient);
+        color: white;
+        border: none;
+        padding: 12px 24px;
+        border-radius: var(--radius-md);
+        font-weight: 600;
+        font-size: 14px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        min-height: 46px;
+        width: 100%;
+    }
+
+    .apply-btn:hover {
+        transform: translateY(-1px);
+        box-shadow: 0 6px 20px rgba(76, 111, 255, 0.3);
+    }
+
+    .reset-btn {
+        background: white;
+        color: var(--gray-text);
+        border: 2px solid var(--border-color);
+        padding: 12px 24px;
+        border-radius: var(--radius-md);
+        font-weight: 600;
+        font-size: 14px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        min-height: 46px;
+        width: 100%;
+    }
+
+    .reset-btn:hover {
+        border-color: var(--primary-color);
+        color: var(--primary-color);
+    }
+
+    .main-card {
+        background: white;
+        border-radius: var(--radius-lg);
+        overflow: hidden;
+        box-shadow: var(--shadow-lg);
+        margin-bottom: 30px;
+        border: 1px solid rgba(255,255,255,0.9);
+    }
+
+    .card-header {
+        padding: 24px;
+        background: linear-gradient(135deg, #4c6fff, #8e54e9);
+        color: white;
+    }
+
+    .card-header h2 {
+        font-size: 20px;
+        font-weight: 700;
+        color: white;
+        margin: 0;
+        display: flex;
+        align-items: center;
+        gap: 12px;
+    }
+
+    .card-header h2 i { color: white; }
+
+    .stats-badge {
+        background: rgba(255, 255, 255, 0.2);
+        color: white;
+        font-size: 12px;
+        font-weight: 600;
+        padding: 4px 12px;
+        border-radius: 20px;
+        margin-left: 10px;
+        backdrop-filter: blur(10px);
+    }
+
+    .container-item {
+        padding: 16px 20px;
+        border-bottom: 1px solid var(--border-color);
+        transition: all 0.3s ease;
+        background: white;
+    }
+
+    .container-item:hover {
+        background: #f8fafc;
+        transform: translateX(4px);
+    }
+
+    .container-item:last-child { border-bottom: none; }
+
+    .container-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 16px;
+    }
+
+    .container-info {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+    }
+
+    .container-avatar {
+        width: 40px;
+        height: 40px;
+        border-radius: 50%;
+        background: var(--primary-gradient);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: white;
+        font-size: 16px;
+        font-weight: 700;
+        flex-shrink: 0;
+        box-shadow: 0 4px 12px rgba(76, 111, 255, 0.3);
+    }
+
+    .container-details h3 {
+        font-size: 16px;
+        font-weight: 700;
+        color: var(--dark-text);
+        margin: 0 0 4px 0;
+    }
+
+    .container-meta {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        font-size: 12px;
+        color: var(--gray-text);
+    }
+
+    .meta-item {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+    }
+
+    .meta-item i {
+        font-size: 12px;
+        color: #94a3b8;
+    }
+
+    /* STATUS DROPDOWN (badge look) */
+    .status-dropdown {
+        position: relative;
+        min-width: 190px;
+        cursor: pointer;
+    }
+
+    .status-dropdown-toggle {
+        padding: 8px 16px;
+        border-radius: 999px;
+        border: 1px solid var(--border-color);
+        background: #ffffff;
+        font-size: 13px;
+        font-weight: 600;
+        color: var(--dark-text);
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 6px;
+    }
+
+    .status-dropdown-toggle span { white-space: nowrap; }
+
+    .status-dropdown-menu {
+        position: absolute;
+        top: -230%;
+        right: 0;
+        z-index: 30;
+        background: #ffffff;
+        border-radius: 14px;
+        padding: 8px 0;
+        box-shadow: var(--shadow-lg);
+        border: 1px solid var(--border-color);
+        width: 220px;
+        max-height: 340px;
+        overflow-y: auto;
+        display: none;
+    }
+
+    .status-dropdown-menu.open { display: block; }
+
+    .status-option {
+        padding: 6px 14px;
+        font-size: 13px;
+        color: var(--dark-text);
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        transition: background 0.15s;
+        line-height: 1.3;
+    }
+
+    .status-option:hover { background: #eef2ff; }
+
+    .status-option .dot {
+        width: 8px;
+        height: 8px;
+        border-radius: 999px;
+        background: #9ca3af;
+    }
+
+    .status-option.active .dot {
+        background: #22c55e;
+    }
+
+    /* COLOR MAPPING per status – dropdown tint + main toggle text color */
+    .status-option.status-container-ready   { background: #eff6ff; color: #1d4ed8; }
+    .status-option.status-export-custom     { background: #fff7ed; color: #b45309; }
+    .status-option.status-international-transit { background: #f5f3ff; color: #4c1d95; }
+    .status-option.status-arrived-at-india  { background: #ecfdf5; color: #15803d; }
+    .status-option.status-import-custom     { background: #fffbeb; color: #92400e; }
+    .status-option.status-warehouse         { background: #f4f4f5; color: #374151; }
+    .status-option.status-domestic-distribution { background: #faf5ff; color: #6d28d9; }
+    .status-option.status-out-for-delivery  { background: #eff6ff; color: #1d4ed8; }
+    .status-option.status-delivered         { background: #ecfdf5; color: #15803d; }
+
+    .status-dropdown-toggle.status-container-ready   { background: #eff6ff; color: #1d4ed8; }
+    .status-dropdown-toggle.status-export-custom     { background: #fff7ed; color: #b45309; }
+    .status-dropdown-toggle.status-international-transit { background: #f5f3ff; color: #4c1d95; }
+    .status-dropdown-toggle.status-arrived-at-india  { background: #ecfdf5; color: #15803d; }
+    .status-dropdown-toggle.status-import-custom     { background: #fffbeb; color: #92400e; }
+    .status-dropdown-toggle.status-warehouse         { background: #f4f4f5; color: #374151; }
+    .status-dropdown-toggle.status-domestic-distribution { background: #faf5ff; color: #6d28d9; }
+    .status-dropdown-toggle.status-out-for-delivery  { background: #eff6ff; color: #1d4ed8; }
+    .status-dropdown-toggle.status-delivered         { background: #ecfdf5; color: #15803d; }
+
+    .action-buttons {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        flex-wrap: wrap;
+    }
+
+    .action-btn {
+        padding: 8px 16px;
+        border-radius: var(--radius-md);
+        font-size: 13px;
+        font-weight: 600;
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        transition: all 0.3s ease;
+        text-decoration: none;
+    }
+
+    .view-btn {
+        background: #e0f2fe;
+        color: #0369a1;
+        border: none;
+    }
+
+    .view-btn:hover {
+        background: #0ea5e9;
+        color: white;
+    }
+
+    .delete-btn {
+        background: #fef2f2;
+        color: #dc2626;
+        border: 1px solid #fecaca;
+    }
+
+    .delete-btn:hover {
+        background: #dc2626;
+        color: white;
+    }
+
+    .update-form { position: relative; }
+
+    .no-results {
+        text-align: center;
+        padding: 60px 20px;
+    }
+
+    .no-results-icon {
+        font-size: 64px;
+        color: var(--border-color);
+        margin-bottom: 20px;
+    }
+
+    .no-results h4 {
+        font-size: 18px;
+        color: var(--gray-text);
+        margin-bottom: 10px;
+    }
+
+    .no-results p {
+        color: #94a3b8;
+        font-size: 14px;
+        max-width: 400px;
+        margin: 0 auto;
+    }
+
+    .success-message {
+        background: linear-gradient(135deg, #10b981, #059669);
+        color: white;
+        padding: 16px 24px;
+        border-radius: var(--radius-md);
+        margin-bottom: 24px;
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        box-shadow: var(--shadow-md);
+        animation: slideIn 0.3s ease;
+    }
+
+    .success-message i { font-size: 20px; }
+
+    @keyframes slideIn {
+        from { opacity: 0; transform: translateY(-10px); }
+        to   { opacity: 1; transform: translateY(0); }
+    }
+
+    .totals-section {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
+        gap: 12px;
+        margin-top: 16px;
+        padding: 16px;
+        background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%);
+        border-radius: var(--radius-md);
+        border-left: 4px solid var(--primary-color);
+    }
+
+    .total-card {
+        text-align: center;
+        padding: 12px;
+        background: white;
+        border-radius: var(--radius-sm);
+        box-shadow: var(--shadow-sm);
+        transition: all 0.3s ease;
+    }
+
+    .total-card:hover {
+        transform: translateY(-2px);
+        box-shadow: var(--shadow-md);
+    }
+
+    .total-value {
+        font-size: 20px;
+        font-weight: 800;
+        color: var(--primary-color);
+        margin-bottom: 4px;
+    }
+
+    .total-label {
+        font-size: 11px;
+        font-weight: 600;
+        color: var(--gray-text);
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+    }
+
+    @media (max-width: 768px) {
+        .page-header {
+            flex-direction: column;
+            align-items: flex-start;
+            gap: 16px;
+        }
+        .add-container-btn {
+            width: 100%;
+            justify-content: center;
+        }
+        .filter-grid { grid-template-columns: 1fr; }
+        .container-header {
+            flex-direction: column;
+            align-items: flex-start;
+            gap: 16px;
+        }
+        .action-buttons {
+            width: 100%;
+            justify-content: flex-start;
+        }
+    }
+
+    @media (max-width: 576px) {
+        .update-form { width: 100%; }
+        .status-dropdown { width: 100%; }
+    }
+</style>
+
+<div class="containers-wrapper">
+    <div class="page-header">
+        <div class="header-content">
+            <h1>Container Management</h1>
+            <div class="header-subtitle">
+                Manage all containers, track status, and view entries in real-time
+            </div>
+        </div>
+        @can('container.create')
+        <a href="{{ route('containers.create') }}" class="add-container-btn">
+            <i class="fas fa-plus-circle"></i>
+            Add New Container
+        </a>
+        @endcan
+    </div>
+
+    @if(session('success'))
+        <div class="success-message">
+            <i class="fas fa-check-circle"></i>
+            <span>{{ session('success') }}</span>
+        </div>
+    @endif
+
+    <div class="filter-card">
+        <div class="filter-title">
+            <i class="fas fa-filter"></i>
+            Filter Containers
+        </div>
+        <form method="GET" class="filter-grid">
+            <div class="filter-group">
+                <label><i class="fas fa-search"></i> Search</label>
+                <input type="text" name="search" class="filter-input"
+                       placeholder="Search by container name or number..."
+                       value="{{ request('search') }}">
+            </div>
+
+            <div class="filter-group">
+                <label><i class="fas fa-tag"></i> Status</label>
+                <select name="status" class="filter-select">
+                    <option value="">All Status</option>
+                    <option value="container-ready" {{ request('status') == 'container-ready' ? 'selected' : '' }}>Container Ready</option>
+                    <option value="export-custom" {{ request('status') == 'export-custom' ? 'selected' : '' }}>Export Custom</option>
+                    <option value="international-transit" {{ request('status') == 'international-transit' ? 'selected' : '' }}>International Transit</option>
+                    <option value="arrived-at-india" {{ request('status') == 'arrived-at-india' ? 'selected' : '' }}>Arrived at India</option>
+                    <option value="import-custom" {{ request('status') == 'import-custom' ? 'selected' : '' }}>Import Custom</option>
+                    <option value="warehouse" {{ request('status') == 'warehouse' ? 'selected' : '' }}>Warehouse</option>
+                    <option value="domestic-distribution" {{ request('status') == 'domestic-distribution' ? 'selected' : '' }}>Domestic Distribution</option>
+                    <option value="out-for-delivery" {{ request('status') == 'out-for-delivery' ? 'selected' : '' }}>Out for Delivery</option>
+                    <option value="delivered" {{ request('status') == 'delivered' ? 'selected' : '' }}>Delivered</option>
+                </select>
+            </div>
+
+            <div class="filter-group">
+                <label><i class="fas fa-calendar"></i> Date</label>
+                <input type="date" name="date" class="filter-date" value="{{ request('date') }}">
+            </div>
+
+            <div class="filter-actions">
+                <button type="submit" class="apply-btn">
+                    <i class="fas fa-search"></i> Apply Filters
+                </button>
+                <a href="{{ route('containers.index') }}" class="reset-btn">
+                    <i class="fas fa-redo"></i> Reset
+                </a>
+            </div>
+        </form>
+    </div>
+
+    <div class="main-card">
+        <div class="card-header">
+            <h2>
+                <i class="fas fa-boxes"></i>
+                Containers List
+                <span class="stats-badge">{{ $containers->count() }} containers</span>
+            </h2>
+        </div>
+
+        @if($containers->isEmpty())
+            <div class="no-results">
+                <div class="no-results-icon">
+                    <i class="fas fa-box-open"></i>
+                </div>
+                <h4>No containers found</h4>
+                <p>Get started by creating your first container</p>
+            </div>
+        @else
+            @php
+                $labels = [
+                    'container-ready'        => 'Container Ready',
+                    'export-custom'          => 'Export Custom',
+                    'international-transit'  => 'International Transit',
+                    'arrived-at-india'       => 'Arrived at India',
+                    'import-custom'          => 'Import Custom',
+                    'warehouse'              => 'Warehouse',
+                    'domestic-distribution'  => 'Domestic Distribution',
+                    'out-for-delivery'       => 'Out for Delivery',
+                    'delivered'              => 'Delivered',
+                ];
+            @endphp
+
+            @foreach($containers as $container)
+                @php
+                    $status = $container->status ?? 'container-ready';
+                    $statusLabel = $labels[$status] ?? ucfirst(str_replace('-', ' ', $status));
+                @endphp
+
+                <div class="container-item">
+                    <div class="container-header">
+                        <div class="container-info">
+                            <div class="container-avatar">
+                                {{ strtoupper(substr($container->container_name, 0, 2)) }}
+                            </div>
+                            <div class="container-details">
+                                <h3>{{ $container->container_name }}</h3>
+                                <div class="container-meta">
+                                    <div class="meta-item">
+                                        <i class="fas fa-hashtag"></i>
+                                        <span>{{ $container->container_number }}</span>
+                                    </div>
+                                    <div class="meta-item">
+                                        <i class="fas fa-calendar"></i>
+                                        <span>{{ $container->container_date?->format('M d, Y') ?: 'No date' }}</span>
+                                    </div>
+                                    <div class="meta-item">
+                                        <i class="fas fa-list"></i>
+                                        <span>{{ $container->rows->count() }} entries</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="action-buttons">
+                            @can('containers.update_status')
+                                <form action="{{ route('containers.update-status', $container->id) }}"
+                                      method="POST"
+                                      class="update-form ajax-status-form"
+                                      data-container-id="{{ $container->id }}">
+                                    @csrf
+
+                                    @php $statusClass = 'status-' . $status; @endphp
+
+                                    <div class="status-dropdown">
+                                        <div class="status-dropdown-toggle {{ $statusClass }}">
+                                            <span class="status-dropdown-label">
+                                                {{ $statusLabel }}
+                                            </span>
+                                            <i class="fas fa-chevron-down" style="font-size:11px;color:#4b5563;"></i>
+                                        </div>
+                                        <div class="status-dropdown-menu">
+                                            @foreach($labels as $value => $label)
+                                                @php $optClass = 'status-' . $value; @endphp
+                                                <div class="status-option {{ $optClass }} {{ $status === $value ? 'active' : '' }}"
+                                                     data-status="{{ $value }}">
+                                                    <span class="dot"></span>
+                                                    <span>{{ $label }}</span>
+                                                </div>
+                                            @endforeach
+                                        </div>
+                                    </div>
+                                </form>
+                            @endcan
+
+                            @can('container.update')
+                                <a href="{{ route('containers.show', $container->id) }}" class="action-btn view-btn">
+                                    <i class="fas fa-eye"></i> View
+                                </a>
+                            @endcan
+
+                            @can('container.delete')
+                                <form action="{{ route('containers.destroy', $container->id) }}" method="POST"
+                                      class="delete-form"
+                                      data-container-id="{{ $container->id }}">
+                                    @csrf
+                                    @method('DELETE')
+                                    <button type="submit" class="action-btn delete-btn">
+                                        <i class="fas fa-trash"></i> Delete
+                                    </button>
+                                </form>
+                            @endcan
+                        </div>
+                    </div>
+
+                    <div class="totals-section">
+                        <div class="total-card">
+                            <div class="total-value">{{ number_format($container->summary['total_ctn'], 1) }}</div>
+                            <div class="total-label">Total CTN</div>
+                        </div>
+                        <div class="total-card">
+                            <div class="total-value">{{ number_format($container->summary['total_qty'], 0) }}</div>
+                            <div class="total-label">Total QTY</div>
+                        </div>
+                        <div class="total-card">
+                            <div class="total-value">{{ number_format($container->summary['total_cbm'], 3) }}</div>
+                            <div class="total-label">Total CBM</div>
+                        </div>
+                        <div class="total-card">
+                            <div class="total-value">{{ number_format($container->summary['total_kg'], 1) }}</div>
+                            <div class="total-label">Total KG</div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        @endif
+    </div>
+</div>
+
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    // STATUS DROPDOWN
+    document.querySelectorAll('.status-dropdown').forEach(function (wrapper) {
+        const toggle = wrapper.querySelector('.status-dropdown-toggle');
+        const menu   = wrapper.querySelector('.status-dropdown-menu');
+
+        toggle.addEventListener('click', function (e) {
+            e.stopPropagation();
+            document.querySelectorAll('.status-dropdown-menu.open').forEach(m => {
+                if (m !== menu) m.classList.remove('open');
+            });
+            menu.classList.toggle('open');
+        });
+
+        menu.querySelectorAll('.status-option').forEach(function (opt) {
+            opt.addEventListener('click', function () {
+                const status  = this.dataset.status;
+                const form    = wrapper.closest('form');
+                const labelEl = wrapper.querySelector('.status-dropdown-label');
+                const toggleEl= wrapper.querySelector('.status-dropdown-toggle');
+
+                // UI: dropdown label + active item
+                menu.querySelectorAll('.status-option').forEach(o => o.classList.remove('active'));
+                this.classList.add('active');
+                labelEl.textContent = this.querySelector('span:nth-child(2)').textContent;
+                menu.classList.remove('open');
+
+                // toggle रंग class reset करून नवा status-* दे
+                toggleEl.className = 'status-dropdown-toggle';
+                toggleEl.classList.add('status-' + status);
+
+                const url   = form.getAttribute('action');
+                const token = form.querySelector('input[name="_token"]').value;
+
+                const formData = new FormData();
+                formData.append('_token', token);
+                formData.append('status', status);
+
+                fetch(url, {
+                    method: 'POST',
+                    headers: {
+                        'X-Requested-With': 'XMLHttpRequest',
+                        'Accept': 'application/json',
+                    },
+                    body: formData
+                })
+                .then(async res => {
+                    let data = null;
+                    try { data = await res.json(); } catch (e) {}
+                    if (!res.ok || !data || !data.success) {
+                        alert('Status update failed');
+                        return;
+                    }
+                })
+                .catch(() => {
+                    alert('Network error while updating status');
+                });
+            });
+        });
+    });
+
+    document.addEventListener('click', function () {
+        document.querySelectorAll('.status-dropdown-menu.open')
+            .forEach(m => m.classList.remove('open'));
+    });
+
+    // DELETE VIA AJAX
+    document.querySelectorAll('.delete-form').forEach(function (form) {
+        form.addEventListener('submit', function (e) {
+            e.preventDefault();
+
+            if (!confirm('Are you sure you want to delete this container and all its entries?')) {
+                return;
+            }
+
+            const url   = form.getAttribute('action');
+            const token = form.querySelector('input[name="_token"]').value;
+            const item  = form.closest('.container-item');
+
+            const formData = new FormData();
+            formData.append('_token', token);
+            formData.append('_method', 'DELETE');
+
+            fetch(url, {
+                method: 'POST',
+                headers: {
+                    'X-Requested-With': 'XMLHttpRequest',
+                    'Accept': 'application/json',
+                },
+                body: formData
+            })
+            .then(async res => {
+                let data = null;
+                try { data = await res.json(); } catch (e) {}
+
+                if (!res.ok || !data || !data.success) {
+                    alert('Delete failed');
+                    return;
+                }
+
+                if (item) {
+                    item.style.opacity = '0';
+                    item.style.transform = 'translateX(-10px)';
+                    setTimeout(() => item.remove(), 200);
+                }
+            })
+            .catch(() => {
+                alert('Network error while deleting container');
+            });
+        });
+    });
+});
+</script>
+
+<link rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
+@endsection

resources/views/admin/container_create.blade.php

@@ -0,0 +1,349 @@
+@extends('admin.layouts.app')
+
+@section('page-title', 'Add Container')
+
+@section('content')
+<style>
+    .cm-add-wrapper { padding: 10px 0 20px 0; }
+    .cm-add-header-card {
+        border-radius: 14px;
+        border: none;
+        margin-bottom: 18px;
+        background: linear-gradient(90deg,#4c6fff,#8e54e9);
+        box-shadow: 0 6px 18px rgba(15,35,52,0.18);
+        color: #ffffff;
+    }
+    .cm-add-header-card .card-body {
+        padding: 14px 18px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 10px;
+    }
+    .cm-add-title { margin: 0; font-size: 20px; font-weight: 600; }
+    .cm-add-sub { font-size: 12px; opacity: 0.9; }
+
+    .cm-add-main-card {
+        border-radius: 14px;
+        border: none;
+        box-shadow: 0 6px 18px rgba(15,35,52,0.12);
+    }
+    .cm-add-main-card .card-header {
+        background:#ffffff;
+        border-bottom: 1px solid #edf0f5;
+        padding: 10px 18px;
+    }
+    .cm-add-main-card .card-header h5 {
+        margin: 0;
+        font-size: 16px;
+        font-weight: 600;
+    }
+
+    .cm-form-label { font-size: 13px; font-weight: 500; color:#495057; margin-bottom: 4px; }
+    .cm-form-control {
+        font-size: 13px;
+        border-radius: 10px;
+        border:1px solid #d0d7e2;
+        padding: 8px 11px;
+    }
+    .cm-form-control:focus {
+        border-color:#4c6fff;
+        box-shadow:0 0 0 0.15rem rgba(76,111,255,.25);
+    }
+
+    .cm-help-text { font-size: 11px; color:#868e96; margin-top: 2px; }
+    .cm-btn-primary { border-radius: 20px; padding: 6px 22px; font-size: 13px; font-weight: 500; }
+    .cm-btn-secondary { border-radius: 20px; padding: 6px 18px; font-size: 13px; }
+
+    .error-card {
+        border-radius: 12px;
+        border: 1px solid #f5c2c7;
+        box-shadow: 0 4px 12px rgba(0,0,0,0.06);
+    }
+
+    .error-row-box {
+        border: 1px solid #e9ecef;
+        border-radius: 8px;
+        padding: 10px;
+        margin-bottom: 10px;
+        background: #f8f9fa;
+    }
+
+    .error-title {
+        font-weight: 600;
+        font-size: 13px;
+        margin-bottom: 6px;
+    }
+
+    .error-item {
+        font-size: 12px;
+        margin-left: 10px;
+    }
+
+    .error-item span {
+        font-weight: 500;
+    }
+</style>
+
+<div class="container-fluid cm-add-wrapper">
+
+    <div class="card cm-add-header-card">
+        <div class="card-body">
+            <div>
+                <h4 class="cm-add-title">Create New Container</h4>
+                <div class="cm-add-sub">
+                    Add container details and upload Kent loading list Excel file.
+                </div>
+            </div>
+            <a href="{{ route('containers.index') }}" class="btn btn-light btn-sm">
+                Back to Containers
+            </a>
+        </div>
+    </div>
+
+    <div class="card cm-add-main-card">
+        <div class="card-header">
+            <h5>Add Container</h5>
+        </div>
+        <div class="card-body">
+
+            {{-- SUCCESS --}}
+            @if (session('success'))
+                <div class="alert alert-success">
+                    {{ session('success') }}
+                </div>
+            @endif
+
+            {{-- VALIDATION --}}
+            @if ($errors->any())
+                <div class="alert alert-danger">
+                    <ul class="mb-0">
+                        @foreach ($errors->all() as $error)
+                            <li>{{ $error }}</li>
+                        @endforeach
+                    </ul>
+                </div>
+            @endif
+
+            {{-- COMBINED ERROR PANEL (summary text) --}}
+            @if(session('formula_errors') || session('mark_errors'))
+
+                <div class="card error-card mb-3">
+                    <div class="card-header bg-danger text-white small">
+                        ⚠ Excel Validation Issues Found
+                    </div>
+                    <div class="card-body">
+                        <div class="small mb-1">
+                            Some rows in your Excel file have formula or mark issues.
+                            See the table below, and detailed messages after the table.
+                        </div>
+                        <ul class="small mb-0 ps-3">
+                            <li>Red highlighted rows indicate formula mismatches in the uploaded Excel data.</li>
+                            <li>Yellow highlighted rows indicate marks from the Excel file that do not match any record in the system.</li>
+                        </ul>
+                    </div>
+                </div>
+
+                {{-- 1) Excel-style table at top --}}
+                @php
+                    $formulaErrors = session('formula_errors') ?? [];
+                    $markErrors    = session('mark_errors') ?? [];
+
+                    $allRowsData = [];
+
+                    foreach ($formulaErrors as $fe) {
+                        if (!empty($fe['data'] ?? null)) {
+                            $allRowsData[] = $fe['data'];
+                        }
+                    }
+
+                    foreach ($markErrors as $me) {
+                        if (!empty($me['data'] ?? null)) {
+                            $allRowsData[] = $me['data'];
+                        }
+                    }
+
+                    $headings = [];
+                    if (!empty($allRowsData)) {
+                        $headings = array_keys($allRowsData[0]);
+                    }
+                @endphp
+
+                @if(!empty($headings))
+                    <div class="card mb-3">
+                        <div class="card-header small">
+                            Error rows in Excel view
+                        </div>
+                        <div class="card-body p-2">
+                            <div class="table-responsive" style="max-height:260px; overflow:auto;">
+                                <table class="table table-sm table-bordered mb-0" style="font-size:11.5px;">
+                                    <thead class="table-light">
+                                        <tr>
+                                            <th>Excel Row</th>
+                                            <th>Mark No</th>
+                                            @foreach($headings as $head)
+                                                <th>{{ $head }}</th>
+                                            @endforeach
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {{-- Formula error rows (red – formula mismatch, critical) --}}
+                                        @foreach($formulaErrors as $fe)
+                                            @php $rowData = $fe['data'] ?? []; @endphp
+                                            @if(!empty($rowData))
+                                                <tr class="table-danger">
+                                                    <td>{{ $fe['excel_row'] }}</td>
+                                                    <td>{{ $fe['mark_no'] }}</td>
+                                                    @foreach($headings as $head)
+                                                        <td>{{ $rowData[$head] ?? '' }}</td>
+                                                    @endforeach
+                                                </tr>
+                                            @endif
+                                        @endforeach
+
+                                        {{-- Mark error rows (yellow – mark not found, warning) --}}
+                                        @foreach($markErrors as $me)
+                                            @php $rowData = $me['data'] ?? []; @endphp
+                                            @if(!empty($rowData))
+                                                <tr class="table-warning">
+                                                    <td>{{ $me['excel_row'] }}</td>
+                                                    <td>{{ $me['mark_no'] }}</td>
+                                                    @foreach($headings as $head)
+                                                        <td>{{ $rowData[$head] ?? '' }}</td>
+                                                    @endforeach
+                                                </tr>
+                                            @endif
+                                        @endforeach
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                @endif
+
+                {{-- 2) Detailed per-row error boxes BELOW the table --}}
+                <div class="card error-card mb-3">
+                    <div class="card-header bg-light small">
+                        Detailed error messages
+                    </div>
+                    <div class="card-body">
+
+                        {{-- Formula Errors (detailed) --}}
+                        @if(session('formula_errors'))
+                            @foreach(session('formula_errors') as $fe)
+                                <div class="error-row-box">
+                                    <div class="error-title">
+                                        Row {{ $fe['excel_row'] }}
+                                        @if($fe['mark_no']) | Mark: {{ $fe['mark_no'] }} @endif
+                                        @if($fe['description']) | {{ $fe['description'] }} @endif
+                                    </div>
+
+                                    @foreach($fe['errors'] as $field => $detail)
+                                        <div class="error-item text-danger">
+                                            ❌ <span>{{ $field }}</span> →
+                                            Expected: {{ number_format($detail['expected'],4) }}
+                                            | Got: {{ number_format($detail['actual'],4) }}
+                                        </div>
+                                    @endforeach
+                                </div>
+                            @endforeach
+                        @endif
+
+                        {{-- Mark Errors (detailed) --}}
+                        @if(session('mark_errors'))
+                            @foreach(session('mark_errors') as $me)
+                                <div class="error-row-box bg-warning bg-opacity-10 border-warning">
+                                    <div class="error-title">
+                                        Row {{ $me['excel_row'] }}
+                                    </div>
+                                    <div class="error-item text-warning">
+                                        ❌ Mark <strong>{{ $me['mark_no'] }}</strong> not found in database
+                                    </div>
+                                </div>
+                            @endforeach
+                        @endif
+
+                    </div>
+                </div>
+
+            @endif
+
+            {{-- FORM --}}
+            @if (!session('formula_errors') && !session('mark_errors'))
+                <form action="{{ route('containers.store') }}" method="POST" enctype="multipart/form-data" class="mt-3">
+                    @csrf
+
+                    <div class="row g-3">
+                        <div class="col-md-6">
+                            <label class="cm-form-label">Container Name</label>
+                            <input type="text" name="container_name"
+                                   class="form-control cm-form-control"
+                                   value="{{ old('container_name') }}"
+                                   placeholder="Enter container name">
+                        </div>
+
+                        <div class="col-md-6">
+                            <label class="cm-form-label">Container Number</label>
+                            <input type="text" name="container_number"
+                                   class="form-control cm-form-control"
+                                   value="{{ old('container_number') }}"
+                                   placeholder="Enter container number">
+                        </div>
+
+                        <div class="col-md-6">
+                            <label class="cm-form-label">Container Date</label>
+                            <input type="date"
+                                   name="container_date"          {{-- name fix --}}
+                                   id="containerdate"             {{-- JS साठी जुना id ठेवला --}}
+                                   class="form-control cm-form-control"
+                                   value="{{ old('container_date') }}">
+                        </div>
+
+                        <div class="col-md-6">
+                            <label class="cm-form-label">Loading List Excel</label>
+                            <input type="file" name="excel_file"
+                                   class="form-control cm-form-control"
+                                   accept=".xls,.xlsx">
+                            <div class="cm-help-text">
+                                Upload Kent loading list Excel file (.xls / .xlsx).
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="mt-4 d-flex gap-2">
+                        <button type="submit" class="btn btn-primary cm-btn-primary">
+                            Save Container
+                        </button>
+                        <a href="{{ route('containers.index') }}" class="btn btn-outline-secondary cm-btn-secondary">
+                            Cancel
+                        </a>
+                    </div>
+                </form>
+            @endif
+
+        </div>
+    </div>
+</div>
+
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        const dateInput = document.getElementById('containerdate');
+        if (!dateInput) return;
+
+        const today = new Date();
+        const year  = today.getFullYear();
+        const month = String(today.getMonth() + 1).padStart(2, '0');
+        const day   = String(today.getDate()).padStart(2, '0');
+        const todayStr = `${year}-${month}-${day}`;
+
+        // Todays date
+        dateInput.min = todayStr;
+
+        // old date remove
+        if (dateInput.value && dateInput.value < todayStr) {
+            dateInput.value = todayStr;
+        }
+    });
+</script>
+
+@endsection

resources/views/admin/container_pdf.blade.php

@@ -0,0 +1,251 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Container {{ $container->container_number }} Summary</title>
+    <style>
+        * { box-sizing: border-box; }
+        body {
+            font-family: DejaVu Sans, sans-serif;
+            font-size: 10px;
+            margin: 10px;
+            background: #e5e7ff;
+        }
+
+        /* LOGO HEADER */
+        .logo-header-wrap {
+            width: 100%;
+            margin-bottom: 6px;
+        }
+        .logo-header-inner {
+            display: table;
+        }
+        .logo-header-logo-cell {
+            display: table-cell;
+            vertical-align: middle;
+        }
+        .logo-header-text-cell {
+            display: table-cell;
+            vertical-align: middle;
+            padding-left: 8px;
+        }
+        .logo-header-logo {
+            height: 32px; /* banner type, कमी उंची */
+            object-fit: contain;
+        }
+        .logo-header-title-top {
+            font-size: 14px;
+            font-weight: 700;
+            color: #7b1111; /* dark maroon */
+            line-height: 1.1;
+        }
+        .logo-header-title-bottom {
+            font-size: 12px;
+            font-weight: 500;
+            color: #7b1111;
+            line-height: 1.1;
+        }
+
+        /* COMMON CARD GRID – 4 equal columns, 2 rows */
+        .card-grid {
+            display: table;
+            width: 100%;
+            border-spacing: 8px 6px;
+            margin-bottom: 8px;
+        }
+        .card-row {
+            display: table-row;
+        }
+        .card {
+            display: table-cell;
+            width: 25%;
+            padding: 7px 10px;
+            border-radius: 14px;
+            box-shadow: 0 4px 12px rgba(15,35,52,0.18);
+            color: #0f172a;
+            vertical-align: middle;
+        }
+
+        /* INFO CARDS (FIRST ROW) */
+        .info-id   { background: #e0f2ff; border-left: 4px solid #2563eb; }
+        .info-no   { background: #dcfce7; border-left: 4px solid #22c55e; }
+        .info-date { background: #fee2e2; border-left: 4px solid #ef4444; }
+        .info-name { background: #fef9c3; border-left: 4px solid #f59e0b; }
+
+        /* TOTAL CARDS (SECOND ROW) */
+        .total-ctn  { background: #dbeafe; border-left: 4px solid #1d4ed8; }
+        .total-qty  { background: #bbf7d0; border-left: 4px solid #16a34a; }
+        .total-cbm  { background: #fef3c7; border-left: 4px solid #d97706; }
+        .total-kg   { background: #fecaca; border-left: 4px solid #dc2626; }
+
+        .label-text {
+            font-size: 9px;
+            text-transform: uppercase;
+            letter-spacing: 0.4px;
+            color: #4b5563;
+        }
+        .value-text-small {
+            font-size: 12px;
+            font-weight: 800;
+            margin-top: 2px;
+            word-wrap: break-word;
+        }
+        .value-text-big {
+            font-size: 16px;
+            font-weight: 800;
+            margin-top: 2px;
+        }
+
+        /* TABLE – solid yellow header */
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            margin-top: 6px;
+            table-layout: fixed;
+            background: #ffffff;
+            border-radius: 12px;
+            overflow: hidden;
+        }
+        th, td {
+            border: 1px solid #e5e7eb;
+            padding: 4px 3px;
+            text-align: center;
+            word-wrap: break-word;
+        }
+        th {
+            background: #fbd85d;
+            font-size: 9px;
+            font-weight: 700;
+            color: #0c0909;
+        }
+        td {
+            font-size: 9px;
+            color: #111827;
+        }
+        tr:nth-child(even) td {
+            background: #f9fafb;
+        }
+
+        thead { display: table-header-group; }
+        tr    { page-break-inside: avoid; }
+    </style>
+</head>
+<body>
+@php
+    $totalCtn = 0;
+    $totalQty = 0;
+    $totalCbm = 0.0;
+    $totalKg  = 0.0;
+
+    foreach ($container->rows as $row) {
+        if (!is_array($row->data)) continue;
+        foreach ($row->data as $h => $v) {
+            $norm = strtoupper(str_replace([' ', '/', '-', '.'],'', $h));
+            $val  = is_numeric(str_replace([','], '', $v)) ? floatval(str_replace([','], '', $v)) : 0;
+
+            if (str_contains($norm, 'TOTALCTN') || $norm === 'CTN' || str_contains($norm,'TOTALCNTR') || str_contains($norm,'TOTALCARTON')) {
+                $totalCtn += $val;
+            }
+            if (str_contains($norm,'TOTALQTY') || str_contains($norm,'ITLQTY') || str_contains($norm,'TTLQTY')) {
+                $totalQty += $val;
+            }
+            if (str_contains($norm,'TOTALCBM') || str_contains($norm,'TTLCBM') || str_contains($norm,'ITLCBM')) {
+                $totalCbm += $val;
+            }
+            if (str_contains($norm,'TOTALKG') || str_contains($norm,'TTKG')) {
+                $totalKg += $val;
+            }
+        }
+    }
+
+    $allHeadings = [];
+    foreach ($container->rows as $row) {
+        if (is_array($row->data)) {
+            $allHeadings = array_unique(array_merge($allHeadings, array_keys($row->data)));
+        }
+    }
+@endphp
+
+{{-- LOGO + TEXT – full left, text खाली (reference image) --}}
+<div class="logo-header-wrap">
+    <div class="logo-header-inner">
+        <div class="logo-header-logo-cell">
+            <img src="{{ public_path('images/kentlogo1.png') }}"
+                 class="logo-header-logo"
+                 alt="Kent Logo">
+        </div>
+        <div class="logo-header-text-cell">
+            <div class="logo-header-title-top">KENT</div>
+            <div class="logo-header-title-bottom">International Pvt. Ltd.</div>
+        </div>
+    </div>
+</div>
+
+{{-- TWO ROW GRID – FIRST: INFO / SECOND: TOTALS --}}
+<div class="card-grid">
+    <div class="card-row">
+        <div class="card info-id">
+            <div class="label-text">Container ID</div>
+            <div class="value-text-small">{{ $container->id }}</div>
+        </div>
+        <div class="card info-no">
+            <div class="label-text">Container Number</div>
+            <div class="value-text-small">{{ $container->container_number }}</div>
+        </div>
+        <div class="card info-date">
+            <div class="label-text">Container Date</div>
+            <div class="value-text-small">
+                {{ $container->container_date ? $container->container_date->format('d-m-Y') : '-' }}
+            </div>
+        </div>
+        <div class="card info-name">
+            <div class="label-text">Container Name</div>
+            <div class="value-text-small">
+                {{ $container->container_name ?? '-' }}
+            </div>
+        </div>
+    </div>
+
+    <div class="card-row">
+        <div class="card total-ctn">
+            <div class="label-text">Total CTN</div>
+            <div class="value-text-big">{{ number_format($totalCtn, 0) }}</div>
+        </div>
+        <div class="card total-qty">
+            <div class="label-text">Total QTY</div>
+            <div class="value-text-big">{{ number_format($totalQty, 0) }}</div>
+        </div>
+        <div class="card total-cbm">
+            <div class="label-text">Total CBM</div>
+            <div class="value-text-big">{{ number_format($totalCbm, 3) }}</div>
+        </div>
+        <div class="card total-kg">
+            <div class="label-text">Total KG</div>
+            <div class="value-text-big">{{ number_format($totalKg, 2) }}</div>
+        </div>
+    </div>
+</div>
+
+{{-- FULL TABLE --}}
+<table>
+    <thead>
+    <tr>
+        <th style="width:18px;">#</th>
+        @foreach($allHeadings as $heading)
+            <th>{{ $heading }}</th>
+        @endforeach
+    </tr>
+    </thead>
+    <tbody>
+    @foreach($container->rows as $index => $row)
+        <tr>
+            <td>{{ $index + 1 }}</td>
+            @foreach($allHeadings as $heading)
+                <td>{{ $row->data[$heading] ?? '' }}</td>
+            @endforeach
+        </tr>
+    @endforeach
+    </tbody>
+</table>
+</body>
+</html>

resources/views/admin/container_show.blade.php

@@ -0,0 +1,977 @@
+@extends('admin.layouts.app')
+
+@section('page-title', 'Container Details')
+
+@section('content')
+<style>
+    @import url('https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;600;700&display=swap');
+
+    html, body {
+        margin: 0;
+        padding: 0;
+        width: 100%;
+        overflow-x: hidden;
+    }
+
+    .cm-header-card {
+        background: linear-gradient(100deg, #4c6fff 0%, #8e54e9 100%);
+        border-radius: 14px;
+        border: none;
+        box-shadow: 0 6px 24px rgba(76,111,255,0.22);
+        margin-bottom: 18px;
+        color: #fff;
+    }
+    .cm-header-card .card-body {
+        padding: 14px 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 10px;
+    }
+    .cm-header-title {
+        margin: 0;
+        font-size: 19px;
+        font-weight: 700;
+        letter-spacing: -0.3px;
+    }
+    .cm-header-sub {
+        font-size: 12px;
+        opacity: 0.88;
+        margin-top: 2px;
+    }
+
+    /* DOWNLOAD BUTTONS - NEW STYLES */
+    .cm-download-pdf {
+        background: linear-gradient(100deg, #4c6fff 0%, #8e54e9 100%) !important;
+        color: #fff !important;
+        border: none !important;
+        font-weight: 600 !important;
+        font-size: 12.5px !important;
+        padding: 8px 16px !important;
+        border-radius: 8px !important;
+        box-shadow: 0 4px 14px rgba(76,111,255,0.4) !important;
+        transition: all 0.2s ease !important;
+        text-decoration: none !important;
+        display: inline-flex !important;
+        align-items: center !important;
+        gap: 6px !important;
+    }
+    .cm-download-pdf:hover {
+        transform: translateY(-1px) !important;
+        box-shadow: 0 6px 20px rgba(76,111,255,0.5) !important;
+        color: #fff !important;
+        opacity: 0.95 !important;
+    }
+
+    .cm-download-excel {
+        background: linear-gradient(100deg, #10b981 0%, #059669 100%) !important;
+        color: #fff !important;
+        border: none !important;
+        font-weight: 600 !important;
+        font-size: 12.5px !important;
+        padding: 8px 16px !important;
+        border-radius: 8px !important;
+        box-shadow: 0 4px 14px rgba(16,185,129,0.4) !important;
+        transition: all 0.2s ease !important;
+        text-decoration: none !important;
+        display: inline-flex !important;
+        align-items: center !important;
+        gap: 6px !important;
+    }
+    .cm-download-excel:hover {
+        transform: translateY(-1px) !important;
+        box-shadow: 0 6px 20px rgba(16,185,129,0.5) !important;
+        color: #fff !important;
+        opacity: 0.95 !important;
+    }
+
+    .cm-back-btn {
+        background: linear-gradient(100deg, #6b7280 0%, #4b5563 100%) !important;
+        color: #fff !important;
+        border: none !important;
+        font-weight: 600 !important;
+        font-size: 12.5px !important;
+        padding: 8px 16px !important;
+        border-radius: 8px !important;
+        box-shadow: 0 4px 14px rgba(107,114,128,0.4) !important;
+        transition: all 0.2s ease !important;
+        text-decoration: none !important;
+        display: inline-flex !important;
+        align-items: center !important;
+        gap: 6px !important;
+    }
+    .cm-back-btn:hover {
+        transform: translateY(-1px) !important;
+        box-shadow: 0 6px 20px rgba(107,114,128,0.5) !important;
+        color: #fff !important;
+        opacity: 0.95 !important;
+    }
+
+    .cm-main-card {
+        border-radius: 14px;
+        border: none;
+        box-shadow: 0 4px 20px rgba(15,35,52,0.10);
+        overflow: hidden;
+        background: #fff;
+        position: relative;
+    }
+    .cm-main-card .card-header {
+        background: #fff;
+        border-bottom: 1px solid #edf0f5;
+        padding: 12px 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .cm-main-card .card-header h5 {
+        margin: 0;
+        font-size: 15px;
+        font-weight: 700;
+        color: #1a2340;
+    }
+
+    .cm-info-cards-row {
+        display: grid;
+        grid-template-columns: repeat(3, minmax(0, 1fr));
+        gap: 14px;
+        padding: 14px 18px 8px 18px;
+    }
+    .cm-info-card {
+        border-radius: 16px;
+        padding: 12px 14px;
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        box-shadow: 0 4px 16px rgba(15,35,52,0.12);
+        border: 1px solid rgba(148,163,184,0.25);
+        background: #fff;
+        min-height: 70px;
+    }
+    .cm-info-card-icon {
+        width: 32px;
+        height: 32px;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #0f172a;
+        font-size: 16px;
+        box-shadow: 0 3px 10px rgba(15,23,42,0.10);
+        flex-shrink: 0;
+    }
+    .cm-info-card-body {
+        display: flex;
+        flex-direction: column;
+        gap: 3px;
+    }
+    .cm-info-card-label {
+        font-size: 11px;
+        text-transform: uppercase;
+        letter-spacing: 0.4px;
+        color: #64748b;
+        font-weight: 600;
+    }
+    .cm-info-card-value {
+        font-size: 14px;
+        font-weight: 700;
+        color: #0f172a;
+        white-space: nowrap;
+    }
+    .cm-card-container {
+        background: linear-gradient(135deg, #e0f2ff, #eef4ff);
+    }
+    .cm-card-container .cm-info-card-icon {
+        background: linear-gradient(135deg, #2563eb, #4f46e5);
+        color: #e5edff;
+    }
+    .cm-card-date {
+        background: linear-gradient(135deg, #ecfdf3, #e0fbea);
+    }
+    .cm-card-date .cm-info-card-icon {
+        background: linear-gradient(135deg, #16a34a, #22c55e);
+        color: #ecfdf3;
+    }
+    .cm-card-excel {
+        background: linear-gradient(135deg, #fff7ed, #fffbeb);
+    }
+    .cm-card-excel .cm-info-card-icon {
+        background: linear-gradient(135deg, #f97316, #fb923c);
+        color: #fff7ed;
+    }
+
+    .cm-total-cards-row {
+        display: grid;
+        grid-template-columns: repeat(4, minmax(0, 1fr));
+        gap: 14px;
+        padding: 4px 18px 14px 18px;
+    }
+    .cm-total-card {
+        border-radius: 18px;
+        padding: 12px 18px;
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        box-shadow: 0 8px 30px rgba(15,23,42,0.08);
+        border: 1px solid rgba(148,163,184,0.25);
+    }
+    .cm-total-icon {
+        width: 34px;
+        height: 34px;
+        border-radius: 999px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 17px;
+        flex-shrink: 0;
+        color: #0f172a;
+        background: #fff;
+        box-shadow: 0 4px 14px rgba(15,23,42,0.15);
+    }
+    .cm-total-text {
+        display: flex;
+        flex-direction: column;
+        gap: 3px;
+    }
+    .cm-total-label {
+        font-size: 11px;
+        font-weight: 600;
+        color: #4b5563;
+    }
+    .cm-total-value {
+        font-size: 18px;
+        font-weight: 800;
+        color: #111827;
+    }
+    .cm-total-card-ctn {
+        background: linear-gradient(135deg, #e0f2ff, #eef2ff);
+        border-left: 4px solid #3b82f6;
+    }
+    .cm-total-card-qty {
+        background: linear-gradient(135deg, #dcfce7, #ecfdf5);
+        border-left: 4px solid #22c55e;
+    }
+    .cm-total-card-cbm {
+        background: linear-gradient(135deg, #fef9c3, #fffbeb);
+        border-left: 4px solid #f59e0b;
+    }
+    .cm-total-card-kg {
+        background: linear-gradient(135deg, #fee2e2, #fef2f2);
+        border-left: 4px solid #ef4444;
+    }
+
+    .cm-filter-bar {
+        padding: 4px 20px 0 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 10px;
+        flex-wrap: wrap;
+    }
+    .cm-row-count {
+        font-size: 12px;
+        color: #8a93a6;
+        font-weight: 500;
+    }
+    .cm-filter-input {
+        max-width: 240px;
+        font-size: 12px;
+        border-radius: 20px;
+        border: 1px solid #dde2ee;
+        padding: 6px 14px;
+        outline: none;
+        transition: border 0.2s;
+    }
+    .cm-filter-input:focus {
+        border-color: #4c6fff;
+        box-shadow: 0 0 0 3px rgba(76,111,255,0.1);
+    }
+
+    .cm-table-scroll-outer {
+        margin: 10px 14px 0 14px;
+        border-radius: 14px;
+        border: 1.5px solid #c9a359;
+        box-shadow: 0 4px 14px rgba(76,111,255,0.18);
+        overflow-x: auto;
+        overflow-y: hidden;
+        position: relative;
+    }
+    .cm-table-wrapper {
+        position: relative;
+        min-width: 1200px;
+    }
+
+    .cm-table {
+        font-size: 12px;
+        width: 100%;
+        border-collapse: separate;
+        border-spacing: 0;
+        font-family: 'DM Sans', sans-serif;
+    }
+    .cm-table thead tr th {
+        position: sticky;
+        top: 0;
+        z-index: 3;
+        background: linear-gradient(100deg, #fde4b3 0%, #fbd48a 100%);
+        color: #0c0909;
+        font-weight: 700;
+        font-size: 12px;
+        padding: 11px 14px;
+        border-bottom: 2px solid rgba(255,255,255,0.15);
+        border-right: 1px solid rgba(255,255,255,0.18);
+        white-space: nowrap;
+        text-align: center;
+        letter-spacing: 0.2px;
+        text-shadow: 0 1px 2px rgba(0,0,0,0.35);
+    }
+    .cm-table thead tr th:first-child {
+        border-top-left-radius: 10px;
+    }
+    .cm-table thead tr th:last-child {
+        border-top-right-radius: 10px;
+        border-right: none;
+    }
+    .cm-table thead tr th:first-child,
+    .cm-table tbody tr td:first-child {
+        width: 46px;
+        min-width: 46px;
+        max-width: 46px;
+        text-align: center;
+    }
+    .cm-table tbody tr td {
+        padding: 8px 14px;
+        border-bottom: 1px solid #f0f3fb;
+        border-right: 1px solid #f0f3fb;
+        color: #2d3a55;
+        font-size: 12.5px;
+        text-align: center;
+        vertical-align: middle;
+        background: #fff;
+        transition: background 0.15s;
+        white-space: nowrap;
+    }
+    .cm-table tbody tr td:last-child {
+        border-right: none;
+    }
+    .cm-table tbody tr:nth-child(even) td {
+        background: #f8f9ff;
+    }
+    .cm-table tbody tr:hover td {
+        background: #edf3ff !important;
+    }
+    .cm-row-num {
+        color: #8a93a6;
+        font-size: 11px;
+        font-weight: 600;
+    }
+
+    .cm-cell-input {
+        width: 100%;
+        min-width: 90px;
+        background: transparent;
+        border: 1.5px solid transparent;
+        border-radius: 5px;
+        font-size: 12.5px;
+        font-family: 'DM Sans', sans-serif;
+        color: #2d3a55;
+        padding: 3px 6px;
+        text-align: center;
+        transition: border 0.15s, background 0.15s, box-shadow 0.15s;
+        outline: none;
+    }
+    .cm-cell-input:hover {
+        border-color: #c9d4f5;
+        background: #f5f8ff;
+    }
+    .cm-cell-input:focus {
+        border-color: #4c6fff;
+        background: #fff;
+        box-shadow: 0 0 0 3px rgba(76,111,255,0.12);
+    }
+    .cm-cell-readonly {
+        background: #f3f4ff;
+        cursor: not-allowed;
+        border-color: #e2e3ff;
+    }
+
+    .cm-save-btn-floating {
+        position: fixed;
+        right: 26px;
+        bottom: 22px;
+        z-index: 50;
+        font-size: 13px;
+        font-weight: 600;
+        border-radius: 22px;
+        padding: 8px 20px;
+        background: linear-gradient(90deg, #4c6fff, #8e54e9);
+        border: none;
+        color: #fff;
+        box-shadow: 0 4px 16px rgba(76,111,255,0.35);
+        transition: opacity 0.2s, transform 0.15s;
+        cursor: pointer;
+    }
+    .cm-save-btn-floating:hover {
+        opacity: 0.94;
+        transform: translateY(-1px);
+    }
+    .cm-save-btn-floating.cm-disabled {
+        opacity: 0.6;
+        cursor: default;
+        pointer-events: none;
+    }
+
+    .cm-toast {
+        position: fixed;
+        right: 26px;
+        bottom: 70px;
+        background: #0f172a;
+        color: #f9fafb;
+        font-size: 12.5px;
+        padding: 8px 14px;
+        border-radius: 10px;
+        box-shadow: 0 8px 24px rgba(15,23,42,0.25);
+        opacity: 0;
+        pointer-events: none;
+        transition: opacity 0.25s, transform 0.2s;
+        transform: translateY(8px);
+        z-index: 60;
+    }
+    .cm-toast.cm-show {
+        opacity: 1;
+        pointer-events: auto;
+        transform: translateY(0);
+    }
+
+    .cm-empty {
+        padding: 30px 20px;
+        color: #8a93a6;
+        font-size: 13px;
+    }
+
+    .cm-table-scroll-outer::-webkit-scrollbar {
+        height: 6px;
+    }
+    .cm-table-scroll-outer::-webkit-scrollbar-track {
+        background: #f0f3fb;
+        border-radius: 4px;
+    }
+    .cm-table-scroll-outer::-webkit-scrollbar-thumb {
+        background: #c5cce8;
+        border-radius: 4px;
+    }
+    .cm-table-scroll-outer::-webkit-scrollbar-thumb:hover {
+        background: #8a99d0;
+    }
+
+    @media (max-width: 991px) {
+        .cm-total-cards-row {
+            grid-template-columns: repeat(2, minmax(0, 1fr));
+        }
+    }
+    @media (max-width: 767px) {
+        .cm-header-card .card-body {
+            flex-direction: column;
+            align-items: flex-start;
+        }
+        .cm-info-cards-row {
+            grid-template-columns: 1fr;
+        }
+        .cm-table-scroll-outer {
+            overflow-x: auto;
+        }
+        .cm-table-wrapper {
+            min-width: 900px;
+        }
+    }
+    @media (max-width: 575px) {
+        .cm-total-cards-row {
+            grid-template-columns: 1fr;
+        }
+    }
+
+    .cm-table-scroll-outer {
+    margin: 10px 14px 30px 14px; /* फक्त हे बदल करा */
+}
+
+</style>
+
+<div class="container-fluid cm-wrapper">
+    <div class="card cm-header-card">
+        <div class="card-body">
+            <div>
+                <h4 class="cm-header-title">Container {{ $container->container_number }}</h4>
+                <div class="cm-header-sub">
+                    Edit loading list directly – like Excel. TT columns auto‑calculate from CTN, QTY, CBM, KG, PRICE.
+                </div>
+            </div>
+            <div class="d-flex gap-2">
+                <a href="{{ route('containers.index') }}" class="cm-back-btn">
+                    <i class="bi bi-arrow-left"></i>
+                    Back to list
+                </a>
+
+                <a href="{{ route('containers.download.pdf', $container->id) }}" class="cm-download-pdf">
+                    <i class="bi bi-file-earmark-pdf"></i>
+                    Download PDF
+                </a>
+
+                <a href="{{ route('containers.download.excel', $container->id) }}" class="cm-download-excel">
+                    <i class="bi bi-file-earmark-excel"></i>
+                    Download Excel
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <!-- बाकीचा सगळा code same आहे - काही बदल नाही -->
+    <div class="card cm-main-card">
+        <div class="card-header">
+            <h5>Container Information</h5>
+        </div>
+
+        <div class="cm-info-cards-row">
+            <div class="cm-info-card cm-card-container">
+                <div class="cm-info-card-icon">
+                    <i class="bi bi-box-seam"></i>
+                </div>
+                <div class="cm-info-card-body">
+                    <div class="cm-info-card-label">Container</div>
+                    <div class="cm-info-card-value">
+                        {{ $container->container_name ?? $container->container_number }}
+                    </div>
+                </div>
+            </div>
+
+            <div class="cm-info-card cm-card-date">
+                <div class="cm-info-card-icon">
+                    <i class="bi bi-calendar-event"></i>
+                </div>
+                <div class="cm-info-card-body">
+                    <div class="cm-info-card-label">Date</div>
+                    <div class="cm-info-card-value">
+                        {{ $container->container_date ? $container->container_date->format('d-m-Y') : '' }}
+                    </div>
+                </div>
+            </div>
+
+            <div class="cm-info-card cm-card-excel">
+                <div class="cm-info-card-icon">
+                    <i class="bi bi-file-earmark-excel"></i>
+                </div>
+                <div class="cm-info-card-body">
+                    <div class="cm-info-card-label">Excel File</div>
+                    <div class="cm-info-card-value">
+                        @if($container->excel_file)
+                            <a href="{{ url($container->excel_file) }}" target="_blank" style="color:#0f172a;text-decoration:none;">
+                                Download / View
+                            </a>
+                        @else
+                            <span style="color:#b0b8cc;">Not uploaded</span>
+                        @endif
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        @php
+            $totalCtn = 0;
+            $totalQty = 0;
+            $totalCbm = 0.0;
+            $totalKg  = 0.0;
+
+            if(!$container->rows->isEmpty()){
+                foreach ($container->rows as $row) {
+                    if (!is_array($row->data)) continue;
+                    foreach ($row->data as $h => $v) {
+                        $norm = strtoupper(str_replace([' ', '/', '-', '.'],'', $h));
+                        $val  = is_numeric(str_replace([','], '', $v)) ? floatval(str_replace([','], '', $v)) : 0;
+
+                        if (str_contains($norm, 'TOTALCTN') || $norm === 'CTN' || str_contains($norm,'TOTALCNTR') || str_contains($norm,'TOTALCARTON')) {
+                            $totalCtn += $val;
+                        }
+
+                        if (
+                            str_contains($norm,'TOTALQTY') ||
+                            str_contains($norm,'ITLQTY')   ||
+                            str_contains($norm,'TTLQTY')
+                        ) {
+                            $totalQty += $val;
+                        }
+
+                        if (
+                            str_contains($norm,'TOTALCBM') ||
+                            str_contains($norm,'TTLCBM')   ||
+                            str_contains($norm,'ITLCBM')
+                        ) {
+                            $totalCbm += $val;
+                        }
+
+                        if (
+                            str_contains($norm,'TOTALKG') ||
+                            str_contains($norm,'TTKG')
+                        ) {
+                            $totalKg += $val;
+                        }
+                    }
+                }
+            }
+        @endphp
+
+        @if(!$container->rows->isEmpty())
+            <div class="cm-total-cards-row">
+                <div class="cm-total-card cm-total-card-ctn">
+                    <div class="cm-total-icon">
+                        <i class="bi bi-box"></i>
+                    </div>
+                    <div class="cm-total-text">
+                        <div class="cm-total-label">Total CTN</div>
+                        <div class="cm-total-value">
+                            {{ number_format($totalCtn, 0) }}
+                        </div>
+                    </div>
+                </div>
+
+                <div class="cm-total-card cm-total-card-qty">
+                    <div class="cm-total-icon">
+                        <i class="bi bi-check-circle"></i>
+                    </div>
+                    <div class="cm-total-text">
+                        <div class="cm-total-label">Total QTY</div>
+                        <div class="cm-total-value">
+                            {{ number_format($totalQty, 0) }}
+                        </div>
+                    </div>
+                </div>
+
+                <div class="cm-total-card cm-total-card-cbm">
+                    <div class="cm-total-icon">
+                        <i class="bi bi-border-width"></i>
+                    </div>
+                    <div class="cm-total-text">
+                        <div class="cm-total-label">Total CBM</div>
+                        <div class="cm-total-value">
+                            {{ number_format($totalCbm, 3) }}
+                        </div>
+                    </div>
+                </div>
+
+                <div class="cm-total-card cm-total-card-kg">
+                    <div class="cm-total-icon">
+                        <i class="bi bi-exclamation-triangle"></i>
+                    </div>
+                    <div class="cm-total-text">
+                        <div class="cm-total-label">Total KG</div>
+                        <div class="cm-total-value">
+                            {{ number_format($totalKg, 2) }}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        @endif
+
+        @if($container->rows->isEmpty())
+            <div class="cm-empty">No entries found for this container.</div>
+        @else
+            @php
+                $allHeadings = [];
+                foreach ($container->rows as $row) {
+                    if (is_array($row->data)) {
+                        $allHeadings = array_unique(array_merge($allHeadings, array_keys($row->data)));
+                    }
+                }
+            @endphp
+
+            <div class="cm-filter-bar">
+                <span class="cm-row-count">
+                    Total rows: {{ $container->rows->count() }}   Edit cells then click "Save Changes".
+                </span>
+                <input type="text" id="cmRowSearch" class="cm-filter-input"
+                       placeholder="Quick search..." onkeyup="cmFilterRows()">
+            </div>
+
+            <form id="cm-edit-rows-form" action="{{ route('containers.rows.update', $container->id) }}" method="POST">
+                @csrf
+                <div class="cm-table-scroll-outer">
+                    <div class="cm-table-wrapper">
+                        <table class="cm-table" id="cmExcelTable">
+                            <thead>
+                            <tr>
+                                <th>#</th>
+                                @foreach($allHeadings as $heading)
+                                    <th>{{ $heading }}</th>
+                                @endforeach
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($container->rows as $index => $row)
+                                <tr>
+                                    <td class="cm-row-num">{{ $index + 1 }}</td>
+                                    @foreach($allHeadings as $heading)
+                                        @php
+                                            $value = $row->data[$heading] ?? '';
+
+                                            $norm = strtoupper(str_replace([' ', '/', '-', '.'],'', $heading));
+
+                                            $isCtn      = str_contains($norm, 'CTN');
+
+                                            $isTotalQty = (
+                                                str_contains($norm, 'TOTALQTY') ||
+                                                str_contains($norm, 'ITLQTY')   ||
+                                                str_contains($norm, 'TTLQTY')
+                                            );
+                                            $isQty      = !$isTotalQty && (
+                                                str_contains($norm, 'QTY') ||
+                                                str_contains($norm, 'PCS') ||
+                                                str_contains($norm, 'PIECES')
+                                            );
+
+                                            $isTotalCbm = (
+                                                str_contains($norm, 'TOTALCBM') ||
+                                                str_contains($norm, 'TTLCBM')   ||
+                                                str_contains($norm, 'ITLCBM')
+                                            );
+                                            $isCbm      = !$isTotalCbm && str_contains($norm, 'CBM');
+
+                                            $isTotalKg  = (
+                                                str_contains($norm, 'TOTALKG') ||
+                                                str_contains($norm, 'TTKG')
+                                            );
+                                            $isKg       = !$isTotalKg && (str_contains($norm, 'KG') || str_contains($norm, 'WEIGHT'));
+
+                                            $isPrice    = (str_contains($norm, 'PRICE') || str_contains($norm, 'RATE'));
+
+                                            $isAmount   = (
+                                                str_contains($norm, 'AMOUNT')      ||
+                                                str_contains($norm, 'TTLAMOUNT')  ||
+                                                str_contains($norm, 'TOTALAMOUNT')
+                                            );
+
+                                            $isTotalColumn = $isTotalQty || $isTotalCbm || $isTotalKg || $isAmount;
+                                            $isLockedByInvoice = in_array($row->row_index, $lockedRowIndexes ?? []);
+                                            $isReadOnly = $isTotalColumn || $container->status !== 'pending' || $isLockedByInvoice;
+                                        @endphp
+
+                                        <td>
+                                            <input
+                                                type="text"
+                                                class="cm-cell-input {{ $isReadOnly ? 'cm-cell-readonly' : '' }}"
+                                                name="rows[{{ $row->id }}][{{ $heading }}]"
+                                                value="{{ $value }}"
+                                                data-row-id="{{ $row->id }}"
+                                                data-col-key="{{ $heading }}"
+                                                data-ctn="{{ $isCtn ? '1' : '0' }}"
+                                                data-qty="{{ $isQty ? '1' : '0' }}"
+                                                data-ttlqty="{{ $isTotalQty ? '1' : '0' }}"
+                                                data-cbm="{{ $isCbm ? '1' : '0' }}"
+                                                data-ttlcbm="{{ $isTotalCbm ? '1' : '0' }}"
+                                                data-kg="{{ $isKg ? '1' : '0' }}"
+                                                data-ttlkg="{{ $isTotalKg ? '1' : '0' }}"
+                                                data-price="{{ $isPrice ? '1' : '0' }}"
+                                                data-amount="{{ $isAmount ? '1' : '0' }}"
+                                                {{ $isReadOnly ? 'readonly' : '' }}
+                                            >
+                                        </td>
+                                    @endforeach
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </form>
+        @endif
+    </div>
+</div>
+
+@if(!$container->rows->isEmpty())
+<button
+    id="cmSaveBtnFloating"
+    class="cm-save-btn-floating {{ $container->status !== 'pending' ? 'cm-disabled' : '' }}"
+    {{ $container->status !== 'pending' ? 'disabled' : '' }}
+>
+    Save Changes
+</button>
+@endif
+
+<!-- Toast notification missing होती, add केली -->
+<div id="cmToast" class="cm-toast"></div>
+
+<script>
+function cmFilterRows() {
+    const input = document.getElementById('cmRowSearch');
+    if (!input) return;
+    const filter = input.value.toLowerCase();
+    const table = document.getElementById('cmExcelTable');
+    if (!table) return;
+    const rows = table.getElementsByTagName('tr');
+    for (let i = 1; i < rows.length; i++) {
+        const cells = rows[i].getElementsByTagName('td');
+        let match = false;
+        for (let j = 0; j < cells.length; j++) {
+            const txt = cells[j].textContent || cells[j].innerText;
+            if (txt.toLowerCase().indexOf(filter) > -1) {
+                match = true;
+                break;
+            }
+        }
+        rows[i].style.display = match ? '' : 'none';
+    }
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+    const form  = document.getElementById('cm-edit-rows-form');
+    const btn   = document.getElementById('cmSaveBtnFloating');
+    const toast = document.getElementById('cmToast');
+    const table = document.getElementById('cmExcelTable');
+
+    function showToast(message, isError = false) {
+        if (!toast) return;
+        toast.textContent = message;
+        toast.style.background = isError ? '#b91c1c' : '#0f172a';
+        toast.classList.add('cm-show');
+        setTimeout(() => toast.classList.remove('cm-show'), 2500);
+    }
+
+    function parseNumber(str) {
+        if (!str) return 0;
+        const cleaned = String(str).replace(/,/g, '').trim();
+        const val = parseFloat(cleaned);
+        return isNaN(val) ? 0 : val;
+    }
+
+    function formatNumber(val, decimals) {
+        if (isNaN(val)) val = 0;
+        return val.toFixed(decimals);
+    }
+
+    function recalcRow(row) {
+        const inputs = row.querySelectorAll('.cm-cell-input');
+
+        let ctn = 0, qty = 0, ttlQty = 0;
+        let cbm = 0, ttlCbm = 0;
+        let kg  = 0, ttlKg  = 0;
+        let price = 0, amount = 0;
+
+        let ctnInput = null,
+            qtyInput = null,
+            ttlQtyInput = null,
+            cbmInput = null,
+            ttlCbmInput = null,
+            kgInput = null,
+            ttlKgInput = null,
+            priceInput = null,
+            amountInput = null;
+
+        inputs.forEach(inp => {
+            const val = parseNumber(inp.value);
+
+            if (inp.dataset.ctn === '1') {
+                ctn = val;
+                ctnInput = inp;
+            } else if (inp.dataset.qty === '1') {
+                qty = val;
+                qtyInput = inp;
+            } else if (inp.dataset.ttlqty === '1') {
+                ttlQty = val;
+                ttlQtyInput = inp;
+            } else if (inp.dataset.cbm === '1') {
+                cbm = val;
+                cbmInput = inp;
+            } else if (inp.dataset.ttlcbm === '1') {
+                ttlCbm = val;
+                ttlCbmInput = inp;
+            } else if (inp.dataset.kg === '1') {
+                kg = val;
+                kgInput = inp;
+            } else if (inp.dataset.ttlkg === '1') {
+                ttlKg = val;
+                ttlKgInput = inp;
+            } else if (inp.dataset.price === '1') {
+                price = val;
+                priceInput = inp;
+            } else if (inp.dataset.amount === '1') {
+                amount = val;
+                amountInput = inp;
+            }
+        });
+
+        if (ttlQtyInput && ctnInput && qtyInput) {
+            const newTtlQty = ctn * qty;
+            ttlQtyInput.value = formatNumber(newTtlQty, 0);
+            ttlQty = newTtlQty;
+        }
+
+        if (ttlCbmInput && cbmInput && ctnInput) {
+            const newTtlCbm = cbm * ctn;
+            ttlCbmInput.value = formatNumber(newTtlCbm, 3);
+            ttlCbm = newTtlCbm;
+        }
+
+        if (ttlKgInput && kgInput && ctnInput) {
+            const newTtlKg = kg * ctn;
+            ttlKgInput.value = formatNumber(newTtlKg, 2);
+            ttlKg = newTtlKg;
+        }
+
+        if (amountInput && priceInput && ttlQtyInput) {
+            const newAmount = price * ttlQty;
+            amountInput.value = formatNumber(newAmount, 2);
+            amount = newAmount;
+        }
+    }
+
+    if (table) {
+        table.addEventListener('input', function (e) {
+            const target = e.target;
+            if (!target.classList.contains('cm-cell-input')) return;
+
+            if (target.classList.contains('cm-cell-readonly') || target.hasAttribute('readonly')) {
+                target.blur();
+                return;
+            }
+
+            const row = target.closest('tr');
+            if (row) {
+                recalcRow(row);
+            }
+        });
+    }
+
+    if (form && btn) {
+        btn.addEventListener('click', function () {
+            if (btn.classList.contains('cm-disabled') || btn.hasAttribute('disabled')) {
+                return;
+            }
+
+            btn.classList.add('cm-disabled');
+            const formData = new FormData(form);
+
+            fetch(form.action, {
+                method: 'POST',
+                headers: {
+                    'X-Requested-With': 'XMLHttpRequest',
+                    'X-CSRF-TOKEN': document.querySelector('input[name="_token"]').value
+                },
+                body: formData
+            })
+            .then(async res => {
+                if (!res.ok) {
+                    const text = await res.text();
+                    throw new Error(text || 'Failed to save');
+                }
+                return res.json().catch(() => ({}));
+            })
+            .then(() => {
+                showToast('Changes saved successfully.');
+            })
+            .catch(() => {
+                showToast('Error while saving changes.', true);
+            })
+            .finally(() => {
+                btn.classList.remove('cm-disabled');
+            });
+        });
+    }
+});
+</script>
+
+@endsection