Add Container field

app/Http/Controllers/Admin/AdminChatController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\SupportTicket;
+use App\Models\ChatMessage;
+use App\Events\NewChatMessage;
+use Illuminate\Http\Request;
+
+class AdminChatController extends Controller
+{
+    /**
+     * Page 1: List all customer chat tickets
+     */
+    public function index()
+    {
+        $tickets = SupportTicket::with(['user', 'messages' => function($query) {
+            $query->latest()->limit(1);
+        }])
+        ->orderBy('updated_at', 'desc')
+        ->get();
+
+        return view('admin.chat_support', compact('tickets'));
+    }
+
+    /**
+     * Page 2: Open chat window for a specific user
+     */
+    public function openChat($ticketId)
+    {
+        $ticket = SupportTicket::with('user')->findOrFail($ticketId);
+        $messages = ChatMessage::where('ticket_id', $ticketId)
+            ->orderBy('created_at', 'asc')
+            ->with('sender')
+            ->get();
+
+        return view('admin.chat_window', compact('ticket', 'messages'));
+    }
+
+    /**
+     * Admin sends a message to the user (FIXED - LIVE CHAT)
+     */
+    public function sendMessage(Request $request, $ticketId)
+    {
+        $request->validate([
+            'message' => 'nullable|string',
+            'file'    => 'nullable|file|max:20480', // 20 MB
+        ]);
+
+        $ticket = SupportTicket::findOrFail($ticketId);
+        $admin  = auth('admin')->user();
+
+        $data = [
+            'ticket_id'   => $ticketId,
+            'sender_id'   => $admin->id,
+            'sender_type' => \App\Models\Admin::class,
+            'message'     => $request->message,
+        ];
+
+        // File Upload
+        if ($request->hasFile('file')) {
+            $path = $request->file('file')->store('chat', 'public');
+            $data['file_path'] = $path;
+            $data['file_type'] = $request->file('file')->getMimeType();
+        }
+
+        // Save message
+        $message = ChatMessage::create($data);
+        $message->load('sender');
+
+        \Log::info("DEBUG: ChatController sendMessage called", [
+            'ticket_id' => $ticketId,
+            'payload' => $request->all()
+        ]);
+
+        // 🔥 LIVE CHAT - Queue bypass (100% working)
+        broadcast(new NewChatMessage($message))->toOthers();
+
+        return response()->json([
+            'success' => true,
+            'message' => $message
+        ]);
+    }
+}

app/Http/Controllers/Admin/AdminInvoiceController.php

@@ -3,12 +3,12 @@
 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 Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
+use Mpdf\Mpdf;
 
 class AdminInvoiceController extends Controller
 {
@@ -17,7 +17,10 @@ class AdminInvoiceController extends Controller
     // -------------------------------------------------------------
     public function index()
     {
-        $invoices = Invoice::with(['order.shipments'])->latest()->get();
+        $invoices = Invoice::with(['items', 'customer', 'container'])
+            ->latest()
+            ->get();
+
         return view('admin.invoice', compact('invoices'));
     }
 
@@ -26,13 +29,8 @@ class AdminInvoiceController extends Controller
     // -------------------------------------------------------------
     public function popup($id)
     {
-        $invoice = Invoice::with(['items', 'order'])->findOrFail($id);
-
-        // Find actual Shipment record
-        $shipment = \App\Models\Shipment::whereHas('items', function ($q) use ($invoice) {
-                $q->where('order_id', $invoice->order_id);
-            })
-            ->first();
+        $invoice = Invoice::with(['items', 'customer', 'container'])->findOrFail($id);
+        $shipment = null;
 
         return view('admin.popup_invoice', compact('invoice', 'shipment'));
     }
@@ -42,111 +40,218 @@ class AdminInvoiceController extends Controller
     // -------------------------------------------------------------
     public function edit($id)
     {
-        $invoice = Invoice::with(['order.shipments'])->findOrFail($id);
-        $shipment = $invoice->order?->shipments?->first();
+        $invoice = Invoice::with(['items', 'customer', 'container'])->findOrFail($id);
+        $shipment = null;
 
         return view('admin.invoice_edit', compact('invoice', 'shipment'));
     }
 
     // -------------------------------------------------------------
-    // UPDATE INVOICE
+    // UPDATE INVOICE (HEADER LEVEL)
+    // -------------------------------------------------------------
+    // -------------------------------------------------------------
+    // UPDATE INVOICE (HEADER LEVEL)
     // -------------------------------------------------------------
     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);
-
+    
+        // 1) VALIDATION
         $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',
+            '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',
         ]);
-
-        Log::info("✅ Validated Invoice Update Data", $data);
-
-        $finalAmount = floatval($data['final_amount']);
-        $taxPercent  = floatval($data['tax_percent']);
-        $taxAmount   = 0;
-
+    
+        Log::info('✅ Validated Invoice Update Data', $data);
+    
+        // 2) CALCULATE GST / TOTALS
+        $finalAmount = (float) $data['final_amount'];
+        $taxPercent  = (float) $data['tax_percent'];
+    
         if ($data['tax_type'] === 'gst') {
-            Log::info("🟢 GST Selected", compact('taxPercent'));
+            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'));
+            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'],
+    
+        $gstAmount = ($finalAmount * $taxPercent) / 100;
+        $data['gst_amount']            = $gstAmount;
+        $data['final_amount_with_gst'] = $finalAmount + $gstAmount;
+        $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'],
         ]);
-
+    
+        // 3) UPDATE DB
         $invoice->update($data);
-
-        Log::info("✅ Invoice Updated Successfully", [
-            'invoice_id' => $invoice->id
+    
+        Log::info('✅ Invoice Updated Successfully', [
+            'invoice_id' => $invoice->id,
         ]);
-
-        // regenerate PDF
+    
+        // 4) LOG ACTUAL DB VALUES
+        $invoice->refresh();
+        Log::info('🔍 Invoice AFTER UPDATE (DB values)', [
+            'invoice_id'            => $invoice->id,
+            'final_amount'          => $invoice->final_amount,
+            'gst_percent'           => $invoice->gst_percent,
+            'gst_amount'            => $invoice->gst_amount,
+            'final_amount_with_gst' => $invoice->final_amount_with_gst,
+            'tax_type'              => $invoice->tax_type,
+            'cgst_percent'          => $invoice->cgst_percent,
+            'sgst_percent'          => $invoice->sgst_percent,
+            'igst_percent'          => $invoice->igst_percent,
+        ]);
+    
+        // 5) REGENERATE PDF
         $this->generateInvoicePDF($invoice);
-
+    
         return redirect()
             ->route('admin.invoices.index')
             ->with('success', 'Invoice updated & PDF generated successfully.');
     }
+    
+
+    // -------------------------------------------------------------
+    // 🔹 UPDATE INVOICE ITEMS (price + ttl_amount)
+    // -------------------------------------------------------------
+    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'],
+        ]);
+
+        $itemsInput = $data['items'];
+
+        foreach ($itemsInput 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();
+        }
+
+        $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();
+
+        Log::info('✅ Invoice items updated & totals recalculated', [
+            'invoice_id'            => $invoice->id,
+            'final_amount'          => $invoice->final_amount,
+            'gst_amount'            => $invoice->gst_amount,
+            'final_amount_with_gst' => $invoice->final_amount_with_gst,
+            'tax_type'              => $invoice->tax_type,
+            'cgst_percent'          => $invoice->cgst_percent,
+            'sgst_percent'          => $invoice->sgst_percent,
+            'igst_percent'          => $invoice->igst_percent,
+        ]);
+
+        return back()->with('success', 'Invoice items updated successfully.');
+    }
 
     // -------------------------------------------------------------
     // PDF GENERATION USING mPDF
     // -------------------------------------------------------------
     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]);
     }
 
     // -------------------------------------------------------------
-    // INSTALLMENTS (ADD/DELETE)
+    // INSTALLMENTS (ADD)
     // -------------------------------------------------------------
     public function storeInstallment(Request $request, $invoice_id)
     {
@@ -157,16 +262,14 @@ class AdminInvoiceController extends Controller
             'amount'           => 'required|numeric|min:1',
         ]);
 
-        $invoice = Invoice::findOrFail($invoice_id);
-
+        $invoice   = Invoice::findOrFail($invoice_id);
         $paidTotal = $invoice->installments()->sum('amount');
-        // Use GST-inclusive total for all calculations/checks
         $remaining = $invoice->final_amount_with_gst - $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);
         }
 
@@ -180,48 +283,49 @@ class AdminInvoiceController extends Controller
 
         $newPaid = $paidTotal + $request->amount;
 
-        // Mark as 'paid' if GST-inclusive total is cleared
         if ($newPaid >= $invoice->final_amount_with_gst) {
             $invoice->update(['status' => 'paid']);
         }
 
         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,
+            '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,
         ]);
     }
+
+    // -------------------------------------------------------------
+    // INSTALLMENTS (DELETE)
+    // -------------------------------------------------------------
     public function deleteInstallment($id)
     {
         $installment = InvoiceInstallment::findOrFail($id);
-        $invoice = $installment->invoice;
-    
+        $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") {
+
+        if ($remaining > 0 && $invoice->status === 'paid') {
             $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.',
+            'totalPaid'          => $paidTotal,
+            'gstAmount'          => $invoice->gst_amount,
+            'finalAmountWithGst' => $invoice->final_amount_with_gst,
+            'baseAmount'         => $invoice->final_amount,
+            'remaining'          => $remaining,
+            'isZero'             => $paidTotal == 0,
         ]);
     }
-    
 }

app/Http/Controllers/Admin/AdminOrderController.php

@@ -92,7 +92,7 @@ class AdminOrderController extends Controller
         ]);
 
         //If you want to auto-create an invoice at order creation, uncomment:
-        $this->createInvoice($order);
+        // $this->createInvoice($order);
 
         return redirect()->route('admin.orders.show', $order->id)
                          ->with('success', 'Order created successfully.');
@@ -148,7 +148,7 @@ class AdminOrderController extends Controller
 
         // recalc totals and save to order
         $this->recalcTotals($order);
-        $this->updateInvoiceFromOrder($order); // <-- NEW
+        // $this->updateInvoiceFromOrder($order); // <-- NEW
 
         return redirect()->back()->with('success', 'Item added and totals updated.');
     }
@@ -594,70 +594,70 @@ class AdminOrderController extends Controller
         // =======================
 
         // 1. Auto-generate invoice number
-        $lastInvoice = \App\Models\Invoice::latest()->first();
-        $nextInvoice = $lastInvoice ? $lastInvoice->id + 1 : 1;
-        $invoiceNumber = 'INV-' . date('Y') . '-' . str_pad($nextInvoice, 6, '0', STR_PAD_LEFT);
+        // $lastInvoice = \App\Models\Invoice::latest()->first();
+        // $nextInvoice = $lastInvoice ? $lastInvoice->id + 1 : 1;
+        // $invoiceNumber = 'INV-' . date('Y') . '-' . str_pad($nextInvoice, 6, '0', STR_PAD_LEFT);
 
         // 2. Fetch customer (using mark list → customer_id)
-        $markList = MarkList::where('mark_no', $order->mark_no)->first();
-        $customer = null;
+        // $markList = MarkList::where('mark_no', $order->mark_no)->first();
+        // $customer = null;
 
-        if ($markList && $markList->customer_id) {
-            $customer = \App\Models\User::where('customer_id', $markList->customer_id)->first();
-        }
+        // if ($markList && $markList->customer_id) {
+        //     $customer = \App\Models\User::where('customer_id', $markList->customer_id)->first();
+        // }
 
         // 3. Create Invoice Record
-        $invoice = \App\Models\Invoice::create([
-            'order_id' => $order->id,
-            'customer_id' => $customer->id ?? null,
-            'mark_no' => $order->mark_no,
+        // $invoice = \App\Models\Invoice::create([
+        //     'order_id' => $order->id,
+        //     'customer_id' => $customer->id ?? null,
+        //     'mark_no' => $order->mark_no,
 
-            'invoice_number' => $invoiceNumber,
-            'invoice_date' => now(),
-            'due_date' => now()->addDays(10),
+        //     'invoice_number' => $invoiceNumber,
+        //     'invoice_date' => now(),
+        //     'due_date' => now()->addDays(10),
 
-            'payment_method' => null,
-            'reference_no' => null,
-            'status' => 'pending',
+        //     'payment_method' => null,
+        //     'reference_no' => null,
+        //     'status' => 'pending',
 
-            'final_amount' => $total_amount,
-            'gst_percent' => 0,
-            'gst_amount' => 0,
-            'final_amount_with_gst' => $total_amount,
+        //     'final_amount' => $total_amount,
+        //     'gst_percent' => 0,
+        //     'gst_amount' => 0,
+        //     'final_amount_with_gst' => $total_amount,
 
-            // snapshot customer fields
-            'customer_name' => $customer->customer_name ?? null,
-            'company_name' => $customer->company_name ?? null,
-            'customer_email' => $customer->email ?? null,
-            'customer_mobile' => $customer->mobile_no ?? null,
-            'customer_address' => $customer->address ?? null,
-            'pincode' => $customer->pincode ?? null,
+        //     // snapshot customer fields
+        //     'customer_name' => $customer->customer_name ?? null,
+        //     'company_name' => $customer->company_name ?? null,
+        //     'customer_email' => $customer->email ?? null,
+        //     'customer_mobile' => $customer->mobile_no ?? null,
+        //     'customer_address' => $customer->address ?? null,
+        //     'pincode' => $customer->pincode ?? null,
 
-            'notes' => null,
-        ]);
+        //     'notes' => null,
+        // ]);
 
         // 4. Clone order items into invoice_items
-        foreach ($order->items as $item) {
-            \App\Models\InvoiceItem::create([
-                'invoice_id' => $invoice->id,
-                'description' => $item->description,
-                'ctn' => $item->ctn,
-                'qty' => $item->qty,
-                'ttl_qty' => $item->ttl_qty,
-                'unit' => $item->unit,
-                'price' => $item->price,
-                'ttl_amount' => $item->ttl_amount,
-                'cbm' => $item->cbm,
-                'ttl_cbm' => $item->ttl_cbm,
-                'kg' => $item->kg,
-                'ttl_kg' => $item->ttl_kg,
-                'shop_no' => $item->shop_no,
-            ]);
-        }
+        // foreach ($order->items as $item) {
+        //     \App\Models\InvoiceItem::create([
+        //         'invoice_id' => $invoice->id,
+        //         'description' => $item->description,
+        //         'ctn' => $item->ctn,
+        //         'qty' => $item->qty,
+        //         'ttl_qty' => $item->ttl_qty,
+        //         'unit' => $item->unit,
+        //         'price' => $item->price,
+        //         'ttl_amount' => $item->ttl_amount,
+        //         'cbm' => $item->cbm,
+        //         'ttl_cbm' => $item->ttl_cbm,
+        //         'kg' => $item->kg,
+        //         'ttl_kg' => $item->ttl_kg,
+        //         'shop_no' => $item->shop_no,
+        //     ]);
+        // }
 
         // 5. TODO: PDF generation (I will add this later)
-        $invoice->pdf_path = null; // placeholder for now
-        $invoice->save();
+        // $invoice->pdf_path = null; // placeholder for now
+        // $invoice->save();
 
         // =======================
         // END INVOICE CREATION