From b1e0a403a6f01f795404f3f7b0b3895fd258d671 Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Wed, 24 Jun 2026 09:02:09 +0000
Subject: [PATCH] fix

---
 .../src/pages/operations/FirstMilePage.tsx    | 19 +++++++++++++------
 .../src/services/first-mile.service.ts        |  8 ++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
index 33f7300f4..c7b7f5f8a 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -91,8 +91,9 @@ const cargoDesc = (r: FirstMileRecord) => {
 };
 const priceAmount = (r: FirstMileRecord) =>
   r.booking?.totalAmount ?? r.advancedPayment;
+// First-mile destination is the origin yard (pickup → origin yard)
 const destinationYardName = (r: FirstMileRecord) =>
-  r.booking?.destinationYard?.name ?? "—";
+  r.booking?.originYard?.label ?? "—";
 const contactPersonName = (r: FirstMileRecord) =>
   r.booking?.company?.contactPersonName ?? "—";
 const contactPhone = (r: FirstMileRecord) =>
@@ -102,7 +103,7 @@ const requestedDate = (r: FirstMileRecord) => {
   return d ? new Date(d).toISOString().slice(0, 10) : "—";
 };
 const serviceTypeName = (r: FirstMileRecord) =>
-  r.booking?.serviceType?.name ?? "—";
+  r.booking?.serviceType?.label ?? "—";
 
 const InfoRow = ({ label, value }: { label: string; value: string }) => (
   <Stack gap={2}>
@@ -135,7 +136,7 @@ const BookingInfo = ({ record }: { record: FirstMileRecord }) => (
         <InfoRow label="Customer" value={customerName(record)} />
         <InfoRow label="Service type" value={serviceTypeName(record)} />
         <InfoRow label="Pickup location" value={pickupLocation(record)} />
-        <InfoRow label="Destination yard" value={destinationYardName(record)} />
+        <InfoRow label="Destination (origin yard)" value={destinationYardName(record)} />
         <InfoRow label="Cargo" value={cargoDesc(record)} />
         <InfoRow label="Price" value={formatPrice(priceAmount(record))} />
         <InfoRow label="Contact" value={contactPersonName(record)} />
@@ -587,6 +588,12 @@ const FirstMilePage = () => {
         meta: { headerClassName, cellClassName },
         cell: ({ row }) => pickupLocation(row.original),
       },
+      {
+        id: "destination",
+        header: "Destination",
+        meta: { headerClassName, cellClassName },
+        cell: ({ row }) => destinationYardName(row.original),
+      },
       {
         id: "cargo",
         header: "Cargo",
@@ -903,7 +910,7 @@ const FirstMilePage = () => {
                       </Stack>
                       <Stack gap={3} align="flex-end" style={{ flexShrink: 0 }}>
                         <Text size="xs" c="dimmed">
-                          {b.originYard?.name ?? "—"} → {b.destinationYard?.name ?? "—"}
+                          {b.originYard?.label ?? "—"} → {b.destinationYard?.label ?? "—"}
                         </Text>
                         <Text size="sm" fw={600} c="blue">
                           {formatPrice(b.totalAmount)}
@@ -935,8 +942,8 @@ const FirstMilePage = () => {
                     <InfoRow label="Customer" value={selectedBooking.company?.name ?? selectedBooking.company?.companyName ?? "—"} />
                     <InfoRow label="Service type" value={selectedBooking.serviceType?.name ?? "—"} />
                     <InfoRow label="Pickup address" value={selectedBooking.firstMilePickupAddress ?? "—"} />
-                    <InfoRow label="Origin yard" value={selectedBooking.originYard?.name ?? "—"} />
-                    <InfoRow label="Destination yard" value={selectedBooking.destinationYard?.name ?? "—"} />
+                    <InfoRow label="Destination (origin yard)" value={selectedBooking.originYard?.label ?? "—"} />
+                    <InfoRow label="Train destination yard" value={selectedBooking.destinationYard?.label ?? "—"} />
                     <InfoRow label="Cargo type" value={selectedBooking.cargoType?.name ?? "—"} />
                     <InfoRow label="Weight (VGM)" value={`${selectedBooking.cargoTotalWeightVgm} t`} />
                     <InfoRow label="Total amount" value={formatPrice(selectedBooking.totalAmount)} />
diff --git a/apps/edr-freight-web/backoffice/src/services/first-mile.service.ts b/apps/edr-freight-web/backoffice/src/services/first-mile.service.ts
index f761719ae..b16287124 100644
--- a/apps/edr-freight-web/backoffice/src/services/first-mile.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/first-mile.service.ts
@@ -18,10 +18,10 @@ export interface FirstMileBooking {
   totalAmount: number;
   scheduledDate?: string | null;
   company?: { id: string; name?: string; phone?: string | null; contactPersonName?: string | null; contactPersonPhone?: string | null } | null;
-  serviceType?: { id: string; name?: string } | null;
-  originYard?: { id: string; name?: string } | null;
-  destinationYard?: { id: string; name?: string } | null;
-  cargoType?: { id: string; name?: string } | null;
+  serviceType?: { id: string; label?: string } | null;
+  originYard?: { id: string; label?: string } | null;
+  destinationYard?: { id: string; label?: string } | null;
+  cargoType?: { id: string; label?: string } | null;
 }
 
 export interface FirstMileVehicle {