changes

apps/edr-freight-web/backoffice/src/features/bookings/booking-actions.config.ts

@@ -347,6 +347,10 @@ export function getBookingActions(
     case "CHANGES_REQUESTED":
       actions = [CANCEL_ACTION];
       break;
+    case "PENDING_CONSOLIDATION":
+      // View-only while waiting for a consolidation partner; cancel still allowed.
+      actions = [CANCEL_ACTION];
+      break;
     default:
       actions = [];
   }

apps/edr-freight-web/backoffice/src/features/bookings/booking-status.config.ts

@@ -212,21 +212,25 @@ export const BOOKING_STATUS_META: Record<string, StatusMeta> = {
   },
   PENDING_CONSOLIDATION: {
     title: "Pending Consolidation",
-    description: "Waiting for consolidation partner.",
+    description: "Blocked — waiting for a consolidation partner before approval.",
     color: "text-amber-600",
-    stage: 4,
+    stage: 0,
   },
   CONSOLIDATED: {
     title: "Consolidated",
     description: "Paired with another booking.",
     color: "text-indigo-600",
-    stage: 4,
+    stage: 0,
   },
 };
 
 export const BOOKING_LIST_TABS = [
   { key: "all", label: "All bookings", statuses: null as string[] | null },
-  { key: "intake", label: "Submitted", statuses: ["SUBMITTED"] },
+  {
+    key: "intake",
+    label: "Submitted",
+    statuses: ["SUBMITTED", "PENDING_CONSOLIDATION"],
+  },
   {
     key: "in_approval",
     label: "In approval",
@@ -256,7 +260,7 @@ export const BOOKING_LIST_TABS = [
   {
     key: "operations",
     label: "Operations",
-    statuses: ["PAID", "IN_TRANSIT", "PENDING_CONSOLIDATION", "CONSOLIDATED"],
+    statuses: ["PAID", "IN_TRANSIT"],
   },
   { key: "completed", label: "Completed", statuses: ["COMPLETED"] },
   { key: "closed", label: "Closed", statuses: ["REJECTED", "CANCELLED"] },
@@ -265,7 +269,15 @@ export const BOOKING_LIST_TABS = [
 export type BookingStatusTabKey = (typeof BOOKING_LIST_TABS)[number]["key"];
 
 export const WORKFLOW_STAGES = [
-  { label: "Submission", statuses: ["DRAFT", "SUBMITTED", "CHANGES_REQUESTED"] },
+  {
+    label: "Submission",
+    statuses: [
+      "DRAFT",
+      "SUBMITTED",
+      "CHANGES_REQUESTED",
+      "PENDING_CONSOLIDATION",
+    ],
+  },
   {
     label: "Approval",
     statuses: ["PENDING_APPROVAL", "APPROVED_PENDING_SIGNATURE"],
@@ -286,7 +298,7 @@ export const WORKFLOW_STAGES = [
   },
   {
     label: "Operations",
-    statuses: ["PAID", "IN_TRANSIT", "PENDING_CONSOLIDATION", "CONSOLIDATED"],
+    statuses: ["PAID", "IN_TRANSIT"],
   },
   { label: "Done", statuses: ["COMPLETED"] },
 ] as const;

apps/edr-freight-web/backoffice/src/features/bookings/mapBookingListRow.ts

@@ -42,6 +42,8 @@ export function toBookingListRow(booking: BookingDetail): BookingListRow {
     trainScheduleId: booking.trainScheduleId ?? null,
     isGovernment: booking.isGovernment ?? false,
     governmentInstitution: booking.governmentInstitution ?? null,
+    consolidationPartnerId: booking.consolidationPartnerId ?? null,
+    consolidationPartnerReference: booking.consolidationPartner?.reference ?? null,
     createdAt: booking.createdAt,
   };
 }