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 01cfa423f..bc53742b0 100644
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/ContainerReturnsPage.tsx
@@ -69,6 +69,13 @@ export default function ContainerReturnsPage() {
},
});
+ const { data: returnedContainers = [] } = useQuery({
+ queryKey: ["empty-container-returns"],
+ queryFn: async () => {
+ return await importOperationsService.listEmptyReturns().catch(() => []);
+ },
+ });
+
const bookingIds = unloadedQueue.map((item) => item.bookingId).filter(Boolean) as string[];
const containerReturnsQuery = useQuery({
queryKey: ["container-returns", bookingIds],
@@ -249,6 +256,42 @@ export default function ContainerReturnsPage() {
+ {returnedContainers.length > 0 && (
+ <>
+ Returned Containers
+
+
+
+
+ Container Number
+ Booking Ref
+ Returned Date
+ Facility
+ Yard
+ Condition
+ Status
+
+
+
+ {returnedContainers.map((ret: any) => (
+
+ {ret.containerNumber}
+ {ret.bookingId ? "Associated" : "—"}
+ {ret.returnDate ? new Date(ret.returnDate).toLocaleDateString() : "—"}
+ {ret.facility || "—"}
+ {ret.yard || "—"}
+ {ret.condition || "—"}
+
+ {ret.status}
+
+
+ ))}
+
+
+
+ >
+ )}
+
{filteredGroups.length === 0 ? (
No {filterType !== "all" ? filterType : ""} container returns found.
) : (
@@ -517,6 +560,8 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
const [containerNumber, setContainerNumber] = useState("");
const [returnDate, setReturnDate] = useState(new Date().toISOString().split("T")[0]);
const [warehouse, setWarehouse] = useState(null);
+ const [yard, setYard] = useState("");
+ const [zone, setZone] = useState("");
const [condition, setCondition] = useState("");
const [handoverNote, setHandoverNote] = useState("");
@@ -562,6 +607,8 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
setContainerNumber("");
setReturnDate(new Date().toISOString().split("T")[0]);
setWarehouse(null);
+ setYard("");
+ setZone("");
setCondition("");
setHandoverNote("");
onClose();
@@ -592,6 +639,20 @@ function StandaloneReturnModal({ opened, onClose, onSubmit, loading }: Standalon
searchable
/>
+ setYard(e.currentTarget.value)}
+ />
+
+ setZone(e.currentTarget.value)}
+ />
+