Truck detention was timed once per delivery, so every truck on a multi-truck last mile was billed the same number of days regardless of when it actually arrived or was released. Each truck now carries its own detention clock (destination arrival → release) with its own rule match, chargeable days and amount; the modal records and displays the window per truck, and the summary shows the longest detention plus the combined total. Also corrected a false no detention rule matches warning that appeared whenever more than one truck was assigned.

apps/edr-freight-web/backoffice/src/services/last-mile.service.ts

@@ -75,6 +75,9 @@ export interface LastMileRecord {
     /** Per-truck arrival / exit, stamped by the warehouse weighing steps. */
     arrivedAt?: string | null;
     departedAt?: string | null;
+    /** This truck's own detention window (destination arrival → released). */
+    destinationArrivedAt?: string | null;
+    returnedAt?: string | null;
     grossWeightTons?: number | null;
     netWeightTons?: number | null;
     vehicle?: LastMileVehicle | null;
@@ -143,4 +146,13 @@ export const lastMileService = {
   /** Preview the truck-detention charge for a last-mile leg. */
   truckDetentionPreview: (id: string) =>
     api.get<FeePreview>(`${LM.BASE}/${id}/truck-detention-preview`),
+  /** Per-truck detention windows — each truck has its own clock. */
+  setDetentionTimes: (
+    id: string,
+    trucks: Array<{
+      vehicleId: string;
+      destinationArrivedAt?: string | null;
+      returnedAt?: string | null;
+    }>,
+  ) => api.post<LastMileRecord>(`${LM.BASE}/${id}/detention-times`, { trucks }),
 };