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 34e23e97e..7a004816b 100644 --- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx +++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx @@ -93,8 +93,6 @@ const cargoDesc = (r: FirstMileRecord) => { if (r.booking?.cargoTotalWeightVgm) parts.push(`${r.booking.cargoTotalWeightVgm} t`); return parts.join(" · ") || "—"; }; -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?.originYard?.label ?? "—"; @@ -142,7 +140,8 @@ const BookingInfo = ({ record }: { record: FirstMileRecord }) => ( - + + @@ -158,7 +157,8 @@ const tripSlipRows = (record: FirstMileRecord): [string, string][] => [ ["Pickup location", pickupLocation(record)], ["Destination yard", destinationYardName(record)], ["Cargo", cargoDesc(record)], - ["Price", formatPrice(priceAmount(record))], + ["Advanced Payment", formatPrice(record.advancedPayment)], + ["Post Payment", formatPrice(record.remainingPayment)], ["Vehicle", vehicleLabel(record) ?? "Unassigned"], ["Contact", `${contactPersonName(record)} · ${contactPhone(record)}`], ["Requested date", requestedDate(record)], @@ -628,10 +628,16 @@ const FirstMilePage = () => { cell: ({ row }) => cargoDesc(row.original), }, { - id: "price", - header: "Price", + id: "advancedPayment", + header: "Advanced Payment", meta: { headerClassName, cellClassName }, - cell: ({ row }) => formatPrice(priceAmount(row.original)), + cell: ({ row }) => formatPrice(row.original.advancedPayment), + }, + { + id: "postPayment", + header: "Post Payment", + meta: { headerClassName, cellClassName }, + cell: ({ row }) => formatPrice(row.original.remainingPayment), }, { id: "vehicle",