Merge branch 'dev' into freight/feat/fixes-v1

packages/types/src/freight/contracts.ts

@@ -265,6 +265,7 @@ export interface ClearanceT1State {
 
 /** Train link state for the booking tied to a customs clearance flow. */
 export interface ClearanceTrainState {
+  scheduleId: string | null;
   wagonAllocated: boolean;
   departedAt: string | null;
   arrivedAt: string | null;
@@ -305,31 +306,6 @@ export interface ClearanceSecondDuty {
   paid: boolean;
 }
 
-/** A customs booking riding a train schedule, as shown on the GL DJ schedules tab. */
-export interface DjClearanceScheduleBooking {
-  bookingId: string;
-  reference: string;
-  tradeDirection: string;
-  contractId: string | null;
-  gatepassGranted: boolean;
-  gatepassAt: string | null;
-}
-
-/** Train schedule row for the GL Djibouti gate-pass table. */
-export interface DjClearanceSchedule {
-  id: string;
-  trainNumber: string | null;
-  routeName: string | null;
-  origin: string | null;
-  destination: string | null;
-  status: string;
-  scheduledDepartureDate: string | null;
-  actualDepartureAt: string | null;
-  actualArrivalAt: string | null;
-  freightType: string | null;
-  customsBookings: DjClearanceScheduleBooking[];
-}
-
 export interface ContractClearanceView {
   contractId: string;
   /** Overall contract status (e.g. CLEARANCE_UNDER_REVIEW). */

packages/types/src/freight/index.ts

@@ -466,6 +466,10 @@ export interface IBooking extends BaseEntity {
 
   containers?: Array<{ type: string; qty: number; vgm: number }> | null;
 
+  /** Physical container numbers on this booking (from booking container units),
+   *  surfaced for the customer truck-assignment container picker. */
+  containerNumbers?: string[] | null;
+
   versionNumber: number;
   priorityScore: number;