From 9afc3d4059ef3a1f92ccec7eab4478acb6caea69 Mon Sep 17 00:00:00 2001
From: Hagernesh <hagernesh@example.com>
Date: Fri, 31 Jul 2026 07:33:37 +0000
Subject: [PATCH] Empty container enhancement

---
 .../pages/warehouses/ContainerReturnsPage.tsx | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx
index 2cc5ca8c4..77cf89d30 100644
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx
@@ -558,6 +558,7 @@ interface StandaloneReturnModalProps {
 
 function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: StandaloneReturnModalProps) {
   const [containerNumber, setContainerNumber] = useState<string>("");
+  const [returnedBy, setReturnedBy] = useState<"EDR" | "CUSTOMER" | null>(null);
   const [returnDate, setReturnDate] = useState<string>(new Date().toISOString().split("T")[0]);
   const [warehouse, setWarehouse] = useState<string | null>(null);
   const [yard, setYard] = useState<string>("");
@@ -594,7 +595,7 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
     : [];
 
   const handleSubmit = () => {
-    if (!containerNumber || !warehouse) return;
+    if (!containerNumber || !warehouse || !returnedBy) return;
 
     const selectedWarehouse = Array.isArray(warehouses) ? warehouses.find((wh: any) => wh.id === warehouse) : null;
 
@@ -603,7 +604,7 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
         {
           bookingId: null,
           customerId: null,
-          returnType: "CUSTOMER",
+          returnType: returnedBy,
           containers: [
             {
               containerNumber,
@@ -618,6 +619,7 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
     });
 
     setContainerNumber("");
+    setReturnedBy(null);
     setReturnDate(new Date().toISOString().split("T")[0]);
     setWarehouse(null);
     setYard("");
@@ -642,6 +644,18 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
           required
         />
 
+        <Select
+          label="Returned By"
+          placeholder="Select truck type"
+          value={returnedBy}
+          onChange={(val) => setReturnedBy(val as "EDR" | "CUSTOMER" | null)}
+          data={[
+            { value: "EDR", label: "EDR Truck" },
+            { value: "CUSTOMER", label: "Customer Truck" },
+          ]}
+          required
+        />
+
         <Select
           label="Return Warehouse"
           placeholder="Select warehouse for container return"
@@ -698,7 +712,7 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
           </Button>
           <Button
             onClick={handleSubmit}
-            disabled={!containerNumber || !warehouse}
+            disabled={!containerNumber || !returnedBy || !warehouse}
             loading={loading}
           >
             Record Return