Resolve merge conflicts

app/Http/Controllers/Admin/AdminInvoiceController.php

@@ -32,7 +32,7 @@ class AdminInvoiceController extends Controller
         $invoice = Invoice::with(['items', 'customer', 'container'])->findOrFail($id);
         $shipment = null;
 
-        return view('admin.popup_invoice', compact('invoice', 'shipment'));
+    return view('admin.popup_invoice', compact('invoice', 'shipment'));
     }
 
     // -------------------------------------------------------------
@@ -43,7 +43,14 @@ class AdminInvoiceController extends Controller
         $invoice = Invoice::with(['items', 'customer', 'container'])->findOrFail($id);
         $shipment = null;
 
-        return view('admin.invoice_edit', compact('invoice', 'shipment'));
+    // 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'));
     }
 
     // -------------------------------------------------------------
@@ -250,6 +257,17 @@ class AdminInvoiceController extends Controller
         $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)
     // -------------------------------------------------------------
@@ -285,6 +303,8 @@ class AdminInvoiceController extends Controller
 
         if ($newPaid >= $invoice->final_amount_with_gst) {
             $invoice->update(['status' => 'paid']);
+
+            $this->generateInvoicePDF($invoice);
         }
 
         return response()->json([
@@ -315,6 +335,8 @@ class AdminInvoiceController extends Controller
 
         if ($remaining > 0 && $invoice->status === 'paid') {
             $invoice->update(['status' => 'pending']);
+
+            $this->generateInvoicePDF($invoice);
         }
 
         return response()->json([