Merge branch 'dev' into freight/fix/type-errors

2026-09-08 21:48:18 +00:00 · 2026-06-25 09:27:14 +03:00
parent 360f6885d5 2e138a73ea
commit d41013890b
409 changed files with 26637 additions and 10747 deletions
--- a/apps/edr-freight-api/src/modules/bookings/booking-contract.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-contract.service.ts
@@ -19,9 +19,17 @@ import { FileRecord } from '../files/entities/file.entity';
 import { BookingsRepository } from './bookings.repository';
 import { Booking } from './entities/booking.entity';
 import { assertBookingStatus } from './booking-status.util';
+import { clearanceSettingCode } from './clearance.util';
 import { ContractViewDto } from './dto/contract-view.dto';
 import { SignContractDto } from './dto/sign-contract.dto';
 import { ContractSignerRole } from './entities/booking-contract-signature.entity';
+
+/**
+ * Default ordering window (months) for a general contract activated on
+ * counter-sign. Mirrors GeneralContractService.DEFAULT_CONTRACT_PERIOD_MONTHS;
+ * defined locally to avoid a circular module dependency on booking-orders.
+ */
+const DEFAULT_CONTRACT_PERIOD_MONTHS = 3;
 import { BookingBatchService } from '../train-scheduling/booking-batch.service';
 import { SignaturesService } from '../signatures/signatures.service';

@@ -222,19 +230,45 @@ export class BookingContractService {

    const updates: Record<string, unknown> = {};

+    // Whether a document-clearance gate applies (IMPORT/EXPORT bookings). When it
+    // does, the counter-signed booking goes to AWAITING_DOCUMENTS for the customer
+    // to upload clearance documents instead of straight into the batch pipeline.
+    const includesCustoms = booking.serviceType?.includesCustoms ?? false;
+    const clearanceCode = clearanceSettingCode(
+      booking.tradeDirection,
+      booking.freightType,
+      includesCustoms,
+    );
+
+    const isGeneralContract = booking.bookingType === 'GENERAL_CONTRACT';
+
    if (role === 'CUSTOMER') {
      updates.status = 'SIGNED_CUSTOMER';
      updates.customerSignedAt = now;
-    } else {
-      updates.status = 'FULLY_EXECUTED';
+    } else if (isGeneralContract) {
+      // A general contract is NOT paid up front — each drawdown order is priced
+      // and paid on its own. So on counter-sign it becomes ACTIVE directly and
+      // opens its ordering window; orders spawn their own priced child bookings.
+      const expiresAt = new Date(now);
+      expiresAt.setMonth(expiresAt.getMonth() + DEFAULT_CONTRACT_PERIOD_MONTHS);
      updates.fullyExecutedAt = now;
      updates.marketingApprovedAt = now;
      updates.marketingApprovedById = options.signerUserId ?? null;
      updates.lockedAt = now;
+      updates.status = 'CONTRACT_ACTIVE';
+      updates.expiresAt = expiresAt;
+    } else {
+      updates.fullyExecutedAt = now;
+      updates.marketingApprovedAt = now;
+      updates.marketingApprovedById = options.signerUserId ?? null;
+      updates.lockedAt = now;
+      updates.status = clearanceCode ? 'AWAITING_DOCUMENTS' : 'FULLY_EXECUTED';
    }

    const updated = await this.bookingsRepository.update(bookingId, updates as never);
-    if (role === 'STAFF' && updated?.trainScheduleId) {
+    // Only the non-clearance (legacy/domestic) path enters the batch pipeline now;
+    // clearance bookings enter operations after the GL document gate.
+    if (role === 'STAFF' && !clearanceCode && updated?.trainScheduleId) {
      this.bookingBatchService.enqueueScheduleProcessing(updated.trainScheduleId);
    }
    try {
--- a/apps/edr-freight-api/src/modules/bookings/booking-next-step.util.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-next-step.util.ts
@@ -57,6 +57,45 @@ export function computeNextStep(
        action: 'AWAIT_PAYMENT',
        description: 'Awaiting customer payment',
      };
+    case 'AWAITING_DOCUMENTS':
+      return {
+        action: 'UPLOAD_DOCUMENTS',
+        description: 'Upload the clearance documents for your shipment',
+      };
+    case 'DOCUMENTS_UNDER_REVIEW':
+      return {
+        action: 'AWAIT_DOCUMENT_REVIEW',
+        description: 'Global Logistics is reviewing your documents',
+      };
+    case 'CLEARANCE_READY':
+      return {
+        action: 'PROCEED_TO_OPERATION',
+        description:
+          'Clearance is ready — pick a schedule day and request operation',
+      };
+    case 'OPERATION_REQUEST_PENDING':
+      return {
+        action: 'AWAIT_OPERATION_REVIEW',
+        description:
+          'Operations is reviewing your request (capacity, documents, route)',
+      };
+    case 'OPERATION_CHANGES_REQUESTED':
+      return {
+        action: 'RESUBMIT_OPERATION',
+        description:
+          'Operations requested changes — update and resubmit your operation request',
+      };
+    case 'OPERATION_PRICE_PENDING_CONFIRM':
+      return {
+        action: 'CONFIRM_OPERATION_PRICE',
+        description:
+          'Operations adjusted the price — confirm the new total to proceed',
+      };
+    case 'OPERATION_REQUESTED':
+      return {
+        action: 'AWAIT_OPERATION',
+        description: 'Operation requested; an operator will take it forward',
+      };
    case 'PAID':
      return {
        action: 'START_TRANSIT',
--- a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.spec.ts
@@ -44,7 +44,6 @@ describe('BookingPricingService — domestic corridor', () => {
      {} as never,
      {} as never,
      ratesService as never,
-      {} as never,
      exchangeService as never,
    );
  });
--- a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
@@ -2,7 +2,6 @@ import { Injectable, NotFoundException } from '@nestjs/common';

 import { ContainerTypesService } from '../rule-engine/services/container-types.service';
 import { RatesService } from '../rule-engine/services/rates.service';
-import { ServiceTypesService } from '../rule-engine/services/service-types.service';
 import { Rate } from '../rule-engine/entities/rate.entity';
 import { ExchangeService } from '@edr/api-common';
 import {
@@ -11,6 +10,10 @@ import {
  RuleEngineService,
 } from '../rule-engine/rule-engine.service';
 import { BookingsRepository } from './bookings.repository';
+import {
+  containersPerWagon,
+  wagonRemainder,
+} from './consolidation.service';
 import { GeneratePriceResponseDto, PriceLineItemDto } from './dto/generate-price-response.dto';
 import { Booking } from './entities/booking.entity';
 import { assertBookingStatus } from './booking-status.util';
@@ -33,6 +36,29 @@ type StoredPricingBreakdown = {
  generatedAt?: string;
 } | null;

+/** Friendly labels for the per-unit rate card shown at the confirm step. */
+const SURCHARGE_LABELS: Record<string, string> = {
+  HAZARD_SURCHARGE: 'Hazardous cargo',
+  HAZARDOUS_CARGO: 'Hazardous cargo',
+  REEFER_SURCHARGE: 'Refrigerated (reefer)',
+  REEFER_CARGO: 'Refrigerated (reefer)',
+  OVERWEIGHT_PER_TON: 'Overweight excess',
+  DOUBLE_HANDLING: 'Double handling',
+  LASHING: 'Lashing',
+  PIL_EXTRA_FEE: 'Shipping line fee',
+};
+
+function surchargeLabel(code: string): string {
+  return (
+    SURCHARGE_LABELS[code] ??
+    code
+      .toLowerCase()
+      .split('_')
+      .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
+      .join(' ')
+  );
+}
+
@Injectable()
 export class BookingPricingService {
  constructor(
@@ -40,7 +66,6 @@ export class BookingPricingService {
    private readonly ruleEngineService: RuleEngineService,
    private readonly containerTypesService: ContainerTypesService,
    private readonly ratesService: RatesService,
-    private readonly serviceTypesService: ServiceTypesService,
    private readonly exchangeService: ExchangeService,
  ) {}

@@ -103,16 +128,35 @@ export class BookingPricingService {
    for (const mod of ruleResult.appliedModifiers) {
      const usdAmount = mod.calculatedAmount;
      const convertedAmount = isEtbBooking ? Math.round(usdAmount * usdToEtb) : usdAmount;
+
+      const rate = rateById.get(mod.rateId);
+      const unit = rate?.rateUnit ?? 'FLAT';
+      const unitUsd = rate ? Number(rate.rateValue) : usdAmount;
+      const unitAmount = isEtbBooking ? Math.round(unitUsd * usdToEtb) : unitUsd;
+      // Per-unit count: FLAT and PER_INVOICE are billed once (qty 1); an
+      // explicit trigger (e.g. overweight tons) wins when present; otherwise
+      // derive from total ÷ unit price.
+      const quantity =
+        unit === 'FLAT' || unit === 'PER_INVOICE'
+          ? 1
+          : mod.triggerValue != null && mod.triggerValue > 0
+            ? mod.triggerValue
+            : unitUsd > 0
+              ? Math.max(1, Math.round(usdAmount / unitUsd))
+              : 1;
+
      const item: PriceLineItemDto = {
-        code: mod.surchargeTypeCode,
-        description: `Surcharge: ${mod.surchargeTypeCode}`,
+        code: mod.surchargeCode,
+        description: surchargeLabel(mod.surchargeCode),
        amount: convertedAmount,
+        unitAmount,
+        unit,
+        quantity,
        currency: paymentCurrency,
      };
      lineItems.push(item);
      total += convertedAmount;

-      const rate = rateById.get(mod.rateId);
      if (rate) usedRatesMap.set(rate.id, rate);
    }

@@ -152,7 +196,7 @@ export class BookingPricingService {
        if (!snapshotId) return null;
        return {
          bookingId,
-          surchargeTypeId: m.surchargeTypeId,
+          rateId: m.rateId,
          triggerValue: m.triggerValue,
          calculatedAmount: m.calculatedAmount,
          rateSnapshotId: snapshotId,
@@ -166,7 +210,7 @@ export class BookingPricingService {
  }

  async buildEvalInputForBooking(booking: Booking): Promise<BookingEvaluationInput> {
-    const containers = await Promise.all(
+    const lines = await Promise.all(
      (booking.bookingContainers ?? [])
        .filter((bc): bc is typeof bc & { containerTypeId: string } => bc.containerTypeId != null)
        .map(async (bc) => {
@@ -174,14 +218,19 @@ export class BookingPricingService {
          const vgm = Number(bc.vgmPerUnitTons);
          const qty = bc.quantity;
          return {
-            containerTypeId: bc.containerTypeId,
+            container: {
+              containerTypeId: bc.containerTypeId,
+              quantity: qty,
+              vgmPerUnitTons: vgm,
+              totalVgmTons: qty * vgm,
+              isReefer: ct.isReefer,
+            },
+            perWagon: containersPerWagon(Number(ct.wagonsPerUnit)),
            quantity: qty,
-            vgmPerUnitTons: vgm,
-            totalVgmTons: qty * vgm,
-            isReefer: ct.isReefer,
          };
        }),
    );
+    const containers = lines.map((l) => l.container);
    // Wagon count is persisted per container line at booking creation; sum it.
    const totalWagons =
      booking.freightType === 'CONTAINER'
@@ -193,15 +242,38 @@ export class BookingPricingService {
          )
        : 0;

+    // Consolidation is system-managed: the CONSOLIDATION surcharge fires whenever
+    // a container type leaves a wagon partially filled. Aggregate by type first —
+    // two lines of the same type share wagons, so 2× 20FT (= one full wagon) must
+    // NOT count as a partial wagon. Mirrors ConsolidationService.slotsFromContainerLines.
+    const remainderByType = new Map<string, { quantity: number; perWagon: number }>();
+    for (const l of lines) {
+      const prev = remainderByType.get(l.container.containerTypeId);
+      remainderByType.set(l.container.containerTypeId, {
+        quantity: (prev?.quantity ?? 0) + Number(l.quantity || 0),
+        perWagon: l.perWagon,
+      });
+    }
+    const allowConsolidation =
+      booking.freightType === 'CONTAINER' &&
+      [...remainderByType.values()].some(
+        (t) => wagonRemainder(t.quantity, t.perWagon) > 0,
+      );
+
    return {
      freightType: booking.freightType as 'CONTAINER' | 'BULK',
      cargoTypeId: booking.cargoTypeId ?? null,
      serviceTypeId: booking.serviceTypeId,
      paymentCurrency: booking.paymentCurrency,
      tradeDirection: booking.tradeDirection,
-      isHazardous: booking.isHazardous,
+      // Coerce defensively in case the stored flag is a string ("true"/"false").
+      isHazardous: booking.isHazardous === true || (booking.isHazardous as unknown) === 'true',
+      // Booking-level reefer flag (set by contract drawdown orders that carry a
+      // reefer quantity) applies the REEFER surcharge even for non-reefer
+      // container types. ORed with per-container reefer in the engine.
+      isReefer: booking.isReefer === true || (booking.isReefer as unknown) === 'true',
      isGovernment: booking.isGovernment,
-      allowConsolidation: booking.allowConsolidation,
+      allowConsolidation,
      shippingLineId: booking.shippingLineId,
      totalWagons,
      containers,
@@ -240,6 +312,9 @@ export class BookingPricingService {
            code: 'TOTAL',
            description: 'Contract total',
            amount: total,
+            unitAmount: total,
+            unit: 'FLAT',
+            quantity: 1,
            currency: booking.paymentCurrency,
          },
        ],
@@ -255,27 +330,18 @@ export class BookingPricingService {
    };
  }

-  /** Recompute priority on submit (USD + service tier). */
+  /**
+   * Recompute priority on submit.
+   *
+   * The full priority model is additive and capped at 100:
+   *   service-type bonus (≤ 15) + wagon block (≤ 50) + currency block (≤ 35).
+   * All three components are produced by RuleEngineService.evaluate, so submit
+   * simply re-runs the engine — there is no extra submit-time inflation.
+   */
  async computeSubmitPriorityScore(booking: Booking): Promise<number> {
    const evalInput = await this.buildEvalInputForBooking(booking);
    const ruleResult = await this.ruleEngineService.evaluate(evalInput);
-    let score = ruleResult.priorityScore;
-
-    const serviceType = await this.serviceTypesService.findById(booking.serviceTypeId);
-    if (booking.paymentCurrency === 'USD' && serviceType) {
-      const code = (serviceType.code ?? '').toUpperCase();
-      const hasForwarding =
-        serviceType.includesFirstMile ||
-        serviceType.includesLastMile ||
-        code.includes('FORWARD') ||
-        code.includes('Y');
-      const railOnly = code.includes('RAIL') && !hasForwarding;
-
-      if (hasForwarding) score += 1000;
-      else if (railOnly || code.includes('X')) score += 500;
-    }
-
-    return score;
+    return ruleResult.priorityScore;
  }

  private async computeBaseRailLinesWithRates(
@@ -312,10 +378,15 @@ export class BookingPricingService {
      usedRatesMap.set(rate.id, rate);
      const usdAmount = this.amountForRate(rate, container.quantity, wagonCount);
      const amount = isEtbBooking ? Math.round(usdAmount * usdToEtb) : usdAmount;
+      const unitUsd = Number(rate.rateValue);
+      const label = await this.containerTypeLabel(container.containerTypeId);
      lines.push({
        code: rateType,
-        description: `Base rail (${rateType})`,
+        description: `${label} rail freight`,
        amount,
+        unitAmount: isEtbBooking ? Math.round(unitUsd * usdToEtb) : unitUsd,
+        unit: rate.rateUnit,
+        quantity: this.effectiveUnitQuantity(rate.rateUnit, container.quantity, wagonCount),
        currency: paymentCurrency,
      });
    }
@@ -331,10 +402,14 @@ export class BookingPricingService {
          isBulk && fallback.rateUnit === 'PER_TON' ? Math.max(bulkTons, 0) : 1;
        const usdAmount = this.amountForRate(fallback, quantity, wagonCount);
        const amount = isEtbBooking ? Math.round(usdAmount * usdToEtb) : usdAmount;
+        const unitUsd = Number(fallback.rateValue);
        lines.push({
          code: rateType,
-          description: `Base rail (${rateType})`,
+          description: isBulk ? 'Bulk rail freight' : 'Container rail freight',
          amount,
+          unitAmount: isEtbBooking ? Math.round(unitUsd * usdToEtb) : unitUsd,
+          unit: fallback.rateUnit,
+          quantity: this.effectiveUnitQuantity(fallback.rateUnit, quantity, wagonCount),
          currency: paymentCurrency,
        });
      }
@@ -343,6 +418,34 @@ export class BookingPricingService {
    return { lineItems: lines, usedRates: [...usedRatesMap.values()] };
  }

+  /** Friendly container-type label for the per-unit card; degrades to "Container". */
+  private async containerTypeLabel(containerTypeId: string): Promise<string> {
+    try {
+      const ct = await this.containerTypesService?.findById?.(containerTypeId);
+      return ct?.label ?? 'Container';
+    } catch {
+      return 'Container';
+    }
+  }
+
+  /** How many units a rate's total is divided into, by rate unit (for the per-unit card). */
+  private effectiveUnitQuantity(
+    rateUnit: string,
+    quantity: number,
+    wagonCount: number,
+  ): number {
+    switch (rateUnit) {
+      case 'PER_WAGON':
+        return wagonCount;
+      case 'FLAT':
+        return 1;
+      case 'PER_CONTAINER':
+      case 'PER_TON':
+      default:
+        return quantity;
+    }
+  }
+
  private pickRate(
    rates: Rate[],
    rateType: string,
--- a/apps/edr-freight-api/src/modules/bookings/booking-transition.accept.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-transition.accept.spec.ts
@@ -0,0 +1,85 @@
+import { BadRequestException } from '@nestjs/common';
+import { BookingTransitionService } from './booking-transition.service';
+
+/**
+ * Focused tests for the contract validity window set at the accept step.
+ * The backoffice must supply a number of days; the window runs from the accept
+ * moment through accept + N days.
+ */
+describe('BookingTransitionService — acceptIntake validity window', () => {
+  const booking = {
+    id: 'b-1',
+    status: 'SUBMITTED',
+    freightType: 'CONTAINER',
+    cargoTypeId: null,
+  };
+
+  function makeService() {
+    const bookingsRepository = {
+      update: jest.fn().mockResolvedValue({ id: 'b-1' }),
+    };
+    const bookingsService = {
+      findById: jest.fn().mockResolvedValue(booking),
+    };
+    const ruleEngineService = {
+      instantiateApprovalSteps: jest.fn().mockResolvedValue([]),
+    };
+
+    const service = new BookingTransitionService(
+      bookingsRepository as never,
+      ruleEngineService as never,
+      {} as never, // pricingService
+      {} as never, // contractService
+      {} as never, // filesService
+      {} as never, // fileUploadSettingsService
+      {} as never, // bookingBatchService
+      bookingsService as never,
+    );
+    return { service, bookingsRepository, ruleEngineService };
+  }
+
+  it('rejects accept when validity days is missing or non-positive', async () => {
+    const { service } = makeService();
+    await expect(
+      service.acceptIntake('b-1', 'staff-1', 0),
+    ).rejects.toBeInstanceOf(BadRequestException);
+    await expect(
+      service.acceptIntake('b-1', 'staff-1', -5),
+    ).rejects.toBeInstanceOf(BadRequestException);
+    await expect(
+      service.acceptIntake('b-1', 'staff-1', 1.5),
+    ).rejects.toBeInstanceOf(BadRequestException);
+  });
+
+  it('sets a validity window of validFrom..validFrom + N days', async () => {
+    const { service, bookingsRepository } = makeService();
+    await service.acceptIntake('b-1', 'staff-1', 10);
+
+    expect(bookingsRepository.update).toHaveBeenCalledTimes(1);
+    const [id, updates] = bookingsRepository.update.mock.calls[0];
+    expect(id).toBe('b-1');
+    expect(updates).toMatchObject({
+      status: 'PENDING_APPROVAL',
+      approvedByStaffId: 'staff-1',
+      contractValidityDays: 10,
+    });
+
+    const from = updates.contractValidFrom as Date;
+    const until = updates.contractValidUntil as Date;
+    const diffDays = Math.round(
+      (until.getTime() - from.getTime()) / (1000 * 60 * 60 * 24),
+    );
+    expect(diffDays).toBe(10);
+    // The accept timestamp and the validity start are the same moment.
+    expect((updates.approvedByStaffAt as Date).getTime()).toBe(from.getTime());
+  });
+
+  it('instantiates the approval chain when accepting', async () => {
+    const { service, ruleEngineService } = makeService();
+    await service.acceptIntake('b-1', 'staff-1', 30);
+    expect(ruleEngineService.instantiateApprovalSteps).toHaveBeenCalledWith(
+      'b-1',
+      expect.objectContaining({ freightType: 'CONTAINER' }),
+    );
+  });
+});
--- a/apps/edr-freight-api/src/modules/bookings/booking-transition.clearance.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-transition.clearance.spec.ts
@@ -0,0 +1,77 @@
+import { BadRequestException } from '@nestjs/common';
+import { BookingTransitionService } from './booking-transition.service';
+
+/**
+ * Focused tests for the clearance 100%-approved gate in finalizeClearance.
+ * Uses minimal stubs for the service's collaborators.
+ */
+describe('BookingTransitionService — finalizeClearance gate', () => {
+  const booking = {
+    id: 'b-1',
+    status: 'DOCUMENTS_UNDER_REVIEW',
+    tradeDirection: 'IMPORT',
+    freightType: 'CONTAINER',
+    serviceType: { includesCustoms: false }, // no output set → only the input gate
+  };
+
+  // Input set has two required docs.
+  const inputSetting = {
+    code: 'clearance_import_container_without_customs',
+    fields: [
+      { fileKey: 'commercial_invoice', isRequired: true },
+      { fileKey: 'packing_list', isRequired: true },
+    ],
+  };
+
+  function makeService(reviews: Array<{ settingCode: string; fileKey: string; status: string }>) {
+    const bookingsRepository = {
+      findDocumentReviews: jest.fn().mockResolvedValue(reviews),
+      update: jest.fn().mockResolvedValue({ id: 'b-1' }),
+    };
+    const bookingsService = {
+      findById: jest.fn().mockResolvedValue(booking),
+    };
+    const fileUploadSettingsService = {
+      getByCode: jest.fn().mockResolvedValue(inputSetting),
+    };
+    const filesService = { findByResource: jest.fn().mockResolvedValue([]) };
+
+    const service = new BookingTransitionService(
+      bookingsRepository as never,
+      {} as never, // ruleEngineService
+      {} as never, // pricingService
+      {} as never, // contractService
+      filesService as never,
+      fileUploadSettingsService as never,
+      {} as never, // bookingBatchService
+      bookingsService as never,
+    );
+    return { service, bookingsRepository };
+  }
+
+  it('rejects when a required document is not APPROVED', async () => {
+    const { service } = makeService([
+      {
+        settingCode: inputSetting.code,
+        fileKey: 'commercial_invoice',
+        status: 'APPROVED',
+      },
+      // packing_list is still PENDING (missing approval)
+    ]);
+    await expect(service.finalizeClearance('b-1')).rejects.toBeInstanceOf(
+      BadRequestException,
+    );
+  });
+
+  it('moves to CLEARANCE_READY when all required documents are APPROVED', async () => {
+    const { service, bookingsRepository } = makeService([
+      { settingCode: inputSetting.code, fileKey: 'commercial_invoice', status: 'APPROVED' },
+      { settingCode: inputSetting.code, fileKey: 'packing_list', status: 'APPROVED' },
+    ]);
+    await service.finalizeClearance('b-1');
+    expect(bookingsRepository.update).toHaveBeenCalledWith(
+      'b-1',
+      expect.objectContaining({ status: 'CLEARANCE_READY' }),
+    );
+  });
+});
--- a/apps/edr-freight-api/src/modules/bookings/booking-transition.operation.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-transition.operation.spec.ts
@@ -0,0 +1,95 @@
+import { BadRequestException } from '@nestjs/common';
+import { BookingTransitionService } from './booking-transition.service';
+
+/**
+ * Operation-request review for general-contract drawdown orders:
+ *  - ACCEPT a train order → FULLY_EXECUTED and enqueued into the batch pool.
+ *  - ACCEPT a road order  → ROAD_DISPATCH_PENDING, NOT enqueued.
+ *  - REQUEST_CHANGES requires a note → OPERATION_CHANGES_REQUESTED.
+ *  - ADJUST_PRICE sets the adjusted total → OPERATION_PRICE_PENDING_CONFIRM.
+ */
+describe('BookingTransitionService — operation review', () => {
+  function makeService(serviceTypeCode: string) {
+    const booking = {
+      id: 'b-1',
+      status: 'OPERATION_REQUEST_PENDING',
+      originYardId: 'o-1',
+      destinationYardId: 'd-1',
+      scheduledDate: new Date('2026-07-01T00:00:00.000Z'),
+      serviceType: { code: serviceTypeCode },
+    };
+    const bookingsRepository = {
+      update: jest.fn().mockResolvedValue({ id: 'b-1' }),
+      createReviewNote: jest.fn().mockResolvedValue(undefined),
+    };
+    const bookingsService = {
+      findById: jest.fn().mockResolvedValue(booking),
+    };
+    const bookingBatchService = {
+      enqueueRouteDayProcessing: jest.fn(),
+    };
+
+    const service = new BookingTransitionService(
+      bookingsRepository as never,
+      {} as never, // ruleEngineService
+      {} as never, // pricingService
+      {} as never, // contractService
+      {} as never, // filesService
+      {} as never, // fileUploadSettingsService
+      bookingBatchService as never,
+      bookingsService as never,
+    );
+    return { service, bookingsRepository, bookingBatchService };
+  }
+
+  it('ACCEPT of a train order → FULLY_EXECUTED and enqueues the batch pool', async () => {
+    const { service, bookingsRepository, bookingBatchService } =
+      makeService('RAIL_CONTAINER');
+    await service.reviewOperationRequest('b-1', 'ACCEPT', 'staff-1');
+    expect(bookingsRepository.update).toHaveBeenCalledWith(
+      'b-1',
+      expect.objectContaining({ status: 'FULLY_EXECUTED' }),
+    );
+    expect(bookingBatchService.enqueueRouteDayProcessing).toHaveBeenCalledTimes(1);
+  });
+
+  it('ACCEPT of a road order → ROAD_DISPATCH_PENDING and does NOT enqueue', async () => {
+    const { service, bookingsRepository, bookingBatchService } =
+      makeService('ROAD_CONTAINER');
+    await service.reviewOperationRequest('b-1', 'ACCEPT', 'staff-1');
+    expect(bookingsRepository.update).toHaveBeenCalledWith(
+      'b-1',
+      expect.objectContaining({ status: 'ROAD_DISPATCH_PENDING' }),
+    );
+    expect(bookingBatchService.enqueueRouteDayProcessing).not.toHaveBeenCalled();
+  });
+
+  it('REQUEST_CHANGES requires a note → OPERATION_CHANGES_REQUESTED', async () => {
+    const { service, bookingsRepository } = makeService('RAIL_CONTAINER');
+    await expect(
+      service.reviewOperationRequest('b-1', 'REQUEST_CHANGES', 'staff-1', {}),
+    ).rejects.toBeInstanceOf(BadRequestException);
+
+    await service.reviewOperationRequest('b-1', 'REQUEST_CHANGES', 'staff-1', {
+      note: 'Fix the schedule',
+    });
+    expect(bookingsRepository.update).toHaveBeenCalledWith(
+      'b-1',
+      expect.objectContaining({ status: 'OPERATION_CHANGES_REQUESTED' }),
+    );
+  });
+
+  it('ADJUST_PRICE sets the adjusted total → OPERATION_PRICE_PENDING_CONFIRM', async () => {
+    const { service, bookingsRepository } = makeService('RAIL_CONTAINER');
+    await service.reviewOperationRequest('b-1', 'ADJUST_PRICE', 'staff-1', {
+      amount: 1500,
+    });
+    expect(bookingsRepository.update).toHaveBeenCalledWith(
+      'b-1',
+      expect.objectContaining({
+        adjustedTotalAmount: 1500,
+        status: 'OPERATION_PRICE_PENDING_CONFIRM',
+      }),
+    );
+  });
+});
--- a/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
@@ -7,11 +7,17 @@ import {
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';

 import { assertCanApproveBookingStep } from '../../common/freight-permission.util';
+import { BookingBatchService } from '../train-scheduling/booking-batch.service';
+import { eatDay } from '../train-scheduling/batch-window.util';
+import { isRoadService } from '../booking-orders/road.util';
 import { RuleEngineService } from '../rule-engine/rule-engine.service';
+import { FilesService } from '../files/files.service';
+import { FileUploadSettingsService } from '../file-upload-settings/file-upload-settings.service';
 import { BookingContractService } from './booking-contract.service';
 import { BookingPricingService } from './booking-pricing.service';
 import { BookingsRepository } from './bookings.repository';
 import { assertBookingStatus } from './booking-status.util';
+import { clearanceCodesForBooking } from './clearance.util';
 import { computeNextStep, type BookingNextStep } from './booking-next-step.util';
 import { SubmitBookingResponseDto } from './dto/submit-booking-response.dto';
 import { PriceLineItemDto } from './dto/generate-price-response.dto';
@@ -25,6 +31,10 @@ export class BookingTransitionService {
    private readonly ruleEngineService: RuleEngineService,
    private readonly pricingService: BookingPricingService,
    private readonly contractService: BookingContractService,
+    private readonly filesService: FilesService,
+    private readonly fileUploadSettingsService: FileUploadSettingsService,
+    @Inject(forwardRef(() => BookingBatchService))
+    private readonly bookingBatchService: BookingBatchService,
    @Inject(forwardRef(() => BookingsService))
    private readonly bookingsService: BookingsService,
  ) {}
@@ -193,13 +203,31 @@ export class BookingTransitionService {
    });
  }

-  async acceptIntake(bookingId: string, actorId: string): Promise<Booking> {
+  async acceptIntake(
+    bookingId: string,
+    actorId: string,
+    validityDays: number,
+  ): Promise<Booking> {
    const booking = await this.bookingsService.findById(bookingId);
    // Only SUBMITTED bookings are acceptable. A booking that still needs
    // consolidation sits in PENDING_CONSOLIDATION (resolved at submit time) and
    // is therefore never offered for accept until a partner moves it to SUBMITTED.
    assertBookingStatus(booking, ['SUBMITTED']);

+    // The backoffice must define how long the accepted contract stays valid.
+    // Without a window the contract has no end date and cannot be relied on, so
+    // accept is blocked until a positive number of days is supplied.
+    if (!Number.isInteger(validityDays) || validityDays < 1) {
+      throw new BadRequestException(
+        'A contract validity (in days) is required to accept this booking.',
+      );
+    }
+
+    // Validity runs from the accept moment through accept + N days.
+    const validFrom = new Date();
+    const validUntil = new Date(validFrom);
+    validUntil.setDate(validUntil.getDate() + validityDays);
+
    await this.ruleEngineService.instantiateApprovalSteps(bookingId, {
      freightType: booking.freightType as 'CONTAINER' | 'BULK',
      cargoTypeId: booking.cargoTypeId,
@@ -208,7 +236,10 @@ export class BookingTransitionService {
    const updated = await this.bookingsRepository.update(bookingId, {
      status: 'PENDING_APPROVAL',
      approvedByStaffId: actorId,
-      approvedByStaffAt: new Date(),
+      approvedByStaffAt: validFrom,
+      contractValidityDays: validityDays,
+      contractValidFrom: validFrom,
+      contractValidUntil: validUntil,
    } as never);
    return this.bookingsService.findById(updated!.id);
  }
@@ -420,6 +451,472 @@ export class BookingTransitionService {
    return this.bookingsService.findById(updated!.id);
  }

+  /**
+   * Customer rejects the priced booking at the confirm step. The booking becomes
+   * REJECTED (terminal) — the customer starts a new booking rather than editing
+   * this one. Only a not-yet-committed booking can be rejected this way.
+   */
+  async reject(bookingId: string, reason?: string): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, [
+      'DRAFT',
+      'SUBMITTED',
+      'PRICE_CHANGED_PENDING_CONFIRM',
+      'PENDING_CONSOLIDATION',
+    ]);
+
+    await this.bookingsRepository.createReviewNote(
+      bookingId,
+      reason?.trim() || 'Customer rejected the price estimate.',
+      'REJECTION',
+    );
+
+    const updated = await this.bookingsRepository.update(bookingId, {
+      status: 'REJECTED',
+    } as never);
+    return this.bookingsService.findById(updated!.id);
+  }
+
+  /**
+   * Staff adjusts a booking's total price. Stores an override (with who/when/why)
+   * that supersedes the computed total for the customer, who sees an
+   * "Adjusted by EDR" badge. Passing null clears the adjustment.
+   */
+  async adjustPrice(
+    bookingId: string,
+    amount: number | null,
+    staffId: string,
+    reason?: string,
+  ): Promise<Booking> {
+    await this.bookingsService.findById(bookingId);
+    if (amount != null && amount < 0) {
+      throw new BadRequestException('Adjusted amount cannot be negative');
+    }
+    await this.bookingsRepository.update(bookingId, {
+      adjustedTotalAmount: amount,
+      adjustedByStaffId: amount == null ? null : staffId,
+      adjustedAt: amount == null ? null : new Date(),
+      adjustmentReason: amount == null ? null : (reason ?? null),
+    } as never);
+    return this.bookingsService.findById(bookingId);
+  }
+
+  // ── Document clearance gate (post counter-sign) ───────────────────────────
+
+  /**
+   * The clearance document grid for a booking: each required field from the
+   * resolved customer-input set (and the GL-output set for customs) with its
+   * uploaded file and GL review status. Drives both portals' clearance UI.
+   */
+  async getClearanceView(bookingId: string): Promise<{
+    status: string;
+    includesCustoms: boolean;
+    inputCode: string | null;
+    outputCode: string | null;
+    documents: Array<{
+      fileKey: string;
+      label: string;
+      required: boolean;
+      uploadedBy: 'customer' | 'gl';
+      settingCode: string;
+      file: { id: string; name: string; url: string } | null;
+      reviewStatus: 'PENDING' | 'APPROVED' | 'QUERIED' | null;
+      note: string | null;
+    }>;
+    allApproved: boolean;
+  }> {
+    const booking = await this.bookingsService.findById(bookingId);
+    const { inputCode, outputCode, includesCustoms } =
+      clearanceCodesForBooking(booking);
+
+    const files = await this.filesService.findByResource(bookingId, 'bookings');
+    const fileByCode = new Map(files.map((f) => [f.code, f]));
+    const reviews = await this.bookingsRepository.findDocumentReviews(bookingId);
+    const reviewByKey = new Map(
+      reviews.map((r) => [`${r.settingCode}:${r.fileKey}`, r]),
+    );
+
+    const documents: Awaited<
+      ReturnType<BookingTransitionService['getClearanceView']>
+    >['documents'] = [];
+
+    const pushSetting = async (
+      code: string | null,
+      uploadedBy: 'customer' | 'gl',
+    ) => {
+      if (!code) return;
+      let setting;
+      try {
+        setting = await this.fileUploadSettingsService.getByCode(code);
+      } catch {
+        return; // setting not seeded — skip gracefully
+      }
+      for (const field of setting.fields ?? []) {
+        const file = fileByCode.get(field.fileKey) ?? null;
+        const review = reviewByKey.get(`${code}:${field.fileKey}`) ?? null;
+        documents.push({
+          fileKey: field.fileKey,
+          label: field.fileLabel,
+          required: field.isRequired,
+          uploadedBy,
+          settingCode: code,
+          file: file
+            ? { id: file.id, name: file.name, url: file.url }
+            : null,
+          reviewStatus: review?.status ?? null,
+          note: review?.note ?? null,
+        });
+      }
+    };
+
+    await pushSetting(inputCode, 'customer');
+    await pushSetting(outputCode, 'gl');
+
+    // Ad-hoc / unknown documents (code custom_*) appear alongside the seeded set.
+    for (const f of files) {
+      if (!f.code?.startsWith('custom_')) continue;
+      const review = reviewByKey.get(`custom:${f.code}`) ?? null;
+      documents.push({
+        fileKey: f.code,
+        label: f.name,
+        required: false,
+        uploadedBy: 'customer',
+        settingCode: 'custom',
+        file: { id: f.id, name: f.name, url: f.url },
+        reviewStatus: review?.status ?? null,
+        note: review?.note ?? null,
+      });
+    }
+
+    const allApproved = await this.isClearanceFullyApproved(booking);
+
+    return {
+      status: booking.status,
+      includesCustoms,
+      inputCode,
+      outputCode,
+      documents,
+      allApproved,
+    };
+  }
+
+  /**
+   * True when every REQUIRED field of the booking's customer-input clearance set
+   * has an APPROVED review row. The 100% gate before clearance can be finalized.
+   */
+  private async isClearanceFullyApproved(booking: Booking): Promise<boolean> {
+    const { inputCode } = clearanceCodesForBooking(booking);
+    if (!inputCode) return true; // no gate applies (e.g. domestic)
+    let setting;
+    try {
+      setting = await this.fileUploadSettingsService.getByCode(inputCode);
+    } catch {
+      return false;
+    }
+    const required = (setting.fields ?? []).filter((f) => f.isRequired);
+    if (required.length === 0) return true;
+    const reviews = await this.bookingsRepository.findDocumentReviews(booking.id);
+    return required.every((field) =>
+      reviews.some(
+        (r) =>
+          r.settingCode === inputCode &&
+          r.fileKey === field.fileKey &&
+          r.status === 'APPROVED',
+      ),
+    );
+  }
+
+  /**
+   * Customer uploads clearance documents. Each multipart file's fieldname is the
+   * field's fileKey (or custom_<n> for ad-hoc). Saves FileRecords, refreshes the
+   * per-document review rows to PENDING, and moves the booking into review.
+   */
+  async submitClearanceDocuments(
+    bookingId: string,
+    files: Express.Multer.File[],
+  ): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, ['AWAITING_DOCUMENTS', 'DOCUMENTS_UNDER_REVIEW']);
+    const { inputCode } = clearanceCodesForBooking(booking);
+    if (!inputCode) {
+      throw new BadRequestException('This booking has no document-clearance step');
+    }
+    if (files.length === 0) {
+      throw new BadRequestException('No documents uploaded');
+    }
+
+    for (const file of files) {
+      const record = await this.filesService.upsertByCode({
+        resourceId: bookingId,
+        resource: 'bookings',
+        code: file.fieldname,
+        file,
+      });
+      // Ad-hoc docs (custom_*) are not part of the required gate; still tracked.
+      const settingCode = file.fieldname.startsWith('custom_')
+        ? 'custom'
+        : inputCode;
+      await this.bookingsRepository.upsertDocumentReviewPending({
+        bookingId,
+        settingCode,
+        fileKey: file.fieldname,
+        fileRecordId: record.id,
+      });
+    }
+
+    await this.bookingsRepository.update(bookingId, {
+      status: 'DOCUMENTS_UNDER_REVIEW',
+    } as never);
+    return this.bookingsService.findById(bookingId);
+  }
+
+  /** GL reviews a single document: APPROVED or QUERIED (with a note). */
+  async reviewDocument(
+    bookingId: string,
+    fileKey: string,
+    status: 'APPROVED' | 'QUERIED',
+    staffId: string,
+    note?: string,
+  ): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, ['DOCUMENTS_UNDER_REVIEW']);
+    const { inputCode, outputCode } = clearanceCodesForBooking(booking);
+
+    const existing = await this.bookingsRepository.findDocumentReviews(bookingId);
+    const match = existing.find((r) => r.fileKey === fileKey);
+    const settingCode =
+      match?.settingCode ??
+      (fileKey.startsWith('custom_') ? 'custom' : (inputCode ?? outputCode ?? 'custom'));
+
+    if (status === 'QUERIED' && !note?.trim()) {
+      throw new BadRequestException('A note is required when querying a document');
+    }
+
+    await this.bookingsRepository.setDocumentReviewStatus(
+      bookingId,
+      settingCode,
+      fileKey,
+      status,
+      staffId,
+      note,
+    );
+    if (status === 'QUERIED') {
+      await this.bookingsRepository.createReviewNote(
+        bookingId,
+        `Document "${fileKey}" queried: ${note}`,
+        'CHANGES_REQUESTED',
+        staffId,
+      );
+    }
+    return this.bookingsService.findById(bookingId);
+  }
+
+  /** GL uploads the customs output documents (IM4/IM5/EX3/etc.). */
+  async uploadClearanceOutputDocuments(
+    bookingId: string,
+    files: Express.Multer.File[],
+  ): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, ['DOCUMENTS_UNDER_REVIEW']);
+    const { outputCode } = clearanceCodesForBooking(booking);
+    if (!outputCode) {
+      throw new BadRequestException('This booking has no customs output documents');
+    }
+    if (files.length === 0) {
+      throw new BadRequestException('No documents uploaded');
+    }
+    for (const file of files) {
+      await this.filesService.upsertByCode({
+        resourceId: bookingId,
+        resource: 'bookings',
+        code: file.fieldname,
+        file,
+      });
+    }
+    return this.bookingsService.findById(bookingId);
+  }
+
+  /**
+   * GL confirms clearance: requires every customer document APPROVED (100% gate)
+   * and, for customs, the required output documents present → CLEARANCE_READY.
+   */
+  async finalizeClearance(bookingId: string): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, ['DOCUMENTS_UNDER_REVIEW']);
+
+    const approved = await this.isClearanceFullyApproved(booking);
+    if (!approved) {
+      throw new BadRequestException(
+        'All required documents must be approved before clearance can be finalized',
+      );
+    }
+
+    const { outputCode } = clearanceCodesForBooking(booking);
+    if (outputCode) {
+      const setting = await this.fileUploadSettingsService.getByCode(outputCode);
+      const files = await this.filesService.findByResource(bookingId, 'bookings');
+      const uploaded = new Set(files.map((f) => f.code));
+      const missing = (setting.fields ?? []).filter(
+        (f) => f.isRequired && !uploaded.has(f.fileKey),
+      );
+      if (missing.length > 0) {
+        throw new BadRequestException(
+          `Upload all required customs output documents first: ${missing
+            .map((m) => m.fileLabel)
+            .join(', ')}`,
+        );
+      }
+    }
+
+    await this.bookingsRepository.update(bookingId, {
+      status: 'CLEARANCE_READY',
+    } as never);
+    return this.bookingsService.findById(bookingId);
+  }
+
+  /**
+   * Customer proceeds to operation once clearance is ready. They pick the
+   * schedule day (the train departure day) for the shipment; the request then
+   * sits at OPERATION_REQUEST_PENDING for the operations team to review
+   * (capacity, documents, route) before it enters the batch holding pool.
+   *
+   * Allowed from CLEARANCE_READY (first request) and OPERATION_CHANGES_REQUESTED
+   * (resubmit after the operations team returned it for changes).
+   */
+  async requestOperation(
+    bookingId: string,
+    scheduledDate: string,
+  ): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, ['CLEARANCE_READY', 'OPERATION_CHANGES_REQUESTED']);
+
+    const date = new Date(scheduledDate);
+    if (Number.isNaN(date.getTime())) {
+      throw new BadRequestException('A valid schedule date is required');
+    }
+
+    await this.bookingsRepository.update(bookingId, {
+      status: 'OPERATION_REQUEST_PENDING',
+      scheduledDate: date,
+    } as never);
+    return this.bookingsService.findById(bookingId);
+  }
+
+  /**
+   * Operations team reviews a pending operation request (capacity, documents,
+   * route). Three outcomes:
+   *  - ACCEPT          → booking enters the batch holding pool (FULLY_EXECUTED).
+   *  - REQUEST_CHANGES → returned to the customer with a note to fix and resubmit.
+   *  - ADJUST_PRICE    → a new total is set; the customer must re-confirm it
+   *                      before the booking can enter the pool.
+   */
+  async reviewOperationRequest(
+    bookingId: string,
+    decision: 'ACCEPT' | 'REQUEST_CHANGES' | 'ADJUST_PRICE',
+    actorId: string,
+    options: { note?: string; amount?: number } = {},
+  ): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, ['OPERATION_REQUEST_PENDING']);
+
+    if (decision === 'REQUEST_CHANGES') {
+      if (!options.note?.trim()) {
+        throw new BadRequestException(
+          'A note is required when requesting changes',
+        );
+      }
+      await this.bookingsRepository.createReviewNote(
+        bookingId,
+        options.note,
+        'CHANGES_REQUESTED',
+        actorId,
+      );
+      await this.bookingsRepository.update(bookingId, {
+        status: 'OPERATION_CHANGES_REQUESTED',
+      } as never);
+      return this.bookingsService.findById(bookingId);
+    }
+
+    if (decision === 'ADJUST_PRICE') {
+      if (options.amount == null || options.amount < 0) {
+        throw new BadRequestException(
+          'A non-negative adjusted amount is required to adjust the price',
+        );
+      }
+      await this.bookingsRepository.update(bookingId, {
+        adjustedTotalAmount: options.amount,
+        adjustedByStaffId: actorId,
+        adjustedAt: new Date(),
+        adjustmentReason: options.note ?? null,
+        status: 'OPERATION_PRICE_PENDING_CONFIRM',
+      } as never);
+      return this.bookingsService.findById(bookingId);
+    }
+
+    // ACCEPT — enter the batch holding pool.
+    return this.acceptOperationRequest(booking);
+  }
+
+  /**
+   * Customer re-confirms (or rejects) an operations price adjustment. Accepting
+   * pushes the booking into the pool; rejecting returns it to the customer as an
+   * operation change request so they can resubmit or cancel.
+   */
+  async confirmOperationPrice(
+    bookingId: string,
+    accept: boolean,
+  ): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    assertBookingStatus(booking, ['OPERATION_PRICE_PENDING_CONFIRM']);
+
+    if (!accept) {
+      await this.bookingsRepository.update(bookingId, {
+        status: 'OPERATION_CHANGES_REQUESTED',
+      } as never);
+      return this.bookingsService.findById(bookingId);
+    }
+
+    return this.acceptOperationRequest(booking);
+  }
+
+  /**
+   * Move a reviewed operation request forward after Marketing accepts.
+   *
+   *  - Train services enter the batch holding pool: the pool query
+   *    (findBatchPoolByRouteDay) keys on FULLY_EXECUTED + scheduled_date, so we
+   *    set those and kick the day-level fill immediately instead of waiting for
+   *    cron.
+   *  - Road (truck) services skip the train batch entirely and wait for truck
+   *    dispatch at ROAD_DISPATCH_PENDING; they are billed by KM, not wagons.
+   */
+  private async acceptOperationRequest(booking: Booking): Promise<Booking> {
+    const now = new Date();
+
+    if (isRoadService(booking.serviceType)) {
+      await this.bookingsRepository.update(booking.id, {
+        status: 'ROAD_DISPATCH_PENDING',
+        fullyExecutedAt: now,
+        lockedAt: booking.lockedAt ?? now,
+      } as never);
+      return this.bookingsService.findById(booking.id);
+    }
+
+    await this.bookingsRepository.update(booking.id, {
+      status: 'FULLY_EXECUTED',
+      fullyExecutedAt: now,
+      lockedAt: booking.lockedAt ?? now,
+    } as never);
+
+    if (booking.scheduledDate) {
+      this.bookingBatchService.enqueueRouteDayProcessing(
+        booking.originYardId,
+        booking.destinationYardId,
+        eatDay(new Date(booking.scheduledDate)),
+      );
+    }
+    return this.bookingsService.findById(booking.id);
+  }
+
  async enrichBookingResponse(booking: Booking): Promise<Booking & {
    latestChangeRequestNote?: string | null;
    contractSummary?: string | null;
--- a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
@@ -42,10 +42,17 @@ import { FilterBookingDto } from './dto/filter-booking.dto';
 import { GeneratePriceResponseDto } from './dto/generate-price-response.dto';
 import { SubmitBookingResponseDto } from './dto/submit-booking-response.dto';
 import {
+  AcceptIntakeDto,
+  AdjustPriceDto,
  ApproveStepDto,
  CancelBookingDto,
+  RejectBookingDto,
  RejectStepDto,
  RequestChangesDto,
+  ReviewDocumentDto,
+  RequestOperationDto,
+  OperationReviewDto,
+  ConfirmOperationPriceDto,
  StaffRejectDto,
 } from './dto/request-changes.dto';
 import { ContractViewDto } from './dto/contract-view.dto';
@@ -148,15 +155,10 @@ export class BookingsController {
        },
      };
    }
-    // Scope to the active operational profile (importer/exporter) when one
-    // resolves; otherwise fall back to company-level scoping.
-    const companyProfileId =
-      await this.bookingsService.resolveActiveCompanyProfileId(userId);
-    return this.bookingsService.findAll(
-      filter,
-      companyId,
-      companyProfileId ?? undefined,
-    );
+    // Company-wide by default; the optional filter.companyProfileId (per-page
+    // service filter) narrows within the company. The company guard always
+    // applies, so a customer can only ever see their own company's bookings.
+    return this.bookingsService.findAll(filter, companyId);
  }

  @Get('by-company/:companyId/customer-view')
@@ -318,6 +320,146 @@ export class BookingsController {
    return this.transitionService.confirmSubmit(id);
  }

+  @Post(':id/reject')
+  @ApiOperation({
+    summary: 'Customer reject price estimate',
+    description:
+      'Customer rejects the priced booking at the confirm step. The booking becomes REJECTED (terminal); the customer must create a new booking.',
+  })
+  async reject(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: RejectBookingDto,
+  ) {
+    const booking = await this.transitionService.reject(id, dto.reason);
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
+  // ── Document clearance (post counter-sign) ────────────────────────────────
+
+  @Get(':id/clearance')
+  @ApiOperation({
+    summary: 'Document-clearance grid (required docs + upload + GL review status)',
+  })
+  getClearance(@Param('id', ParseUUIDPipe) id: string) {
+    return this.transitionService.getClearanceView(id);
+  }
+
+  @Post(':id/clearance/documents')
+  @UseInterceptors(AnyFilesInterceptor())
+  @ApiConsumes('multipart/form-data')
+  @ApiOperation({
+    summary: 'Customer uploads clearance documents (fieldname = document key)',
+  })
+  async submitClearanceDocuments(
+    @Param('id', ParseUUIDPipe) id: string,
+    @UploadedFiles() files: Express.Multer.File[],
+  ) {
+    const booking = await this.transitionService.submitClearanceDocuments(
+      id,
+      files ?? [],
+    );
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
+  @Post(':id/clearance/proceed')
+  @ApiOperation({
+    summary:
+      'Customer requests operation with a schedule day ' +
+      '(CLEARANCE_READY | OPERATION_CHANGES_REQUESTED → OPERATION_REQUEST_PENDING)',
+  })
+  async proceedToOperation(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: RequestOperationDto,
+  ) {
+    const booking = await this.transitionService.requestOperation(
+      id,
+      dto.scheduledDate,
+    );
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
+  @Post(':id/operation/review')
+  @BookingStaff(FREIGHT_PERMS.bookings.operations)
+  @ApiOperation({
+    summary:
+      'Operations reviews an operation request: ACCEPT (→ batch pool), ' +
+      'REQUEST_CHANGES (→ back to customer), or ADJUST_PRICE (→ customer re-confirm)',
+  })
+  async reviewOperationRequest(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: OperationReviewDto,
+    @CurrentUser() user: AuthUserPayload,
+  ) {
+    const booking = await this.transitionService.reviewOperationRequest(
+      id,
+      dto.decision,
+      resolveAuthUserId(user),
+      { note: dto.note, amount: dto.amount },
+    );
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
+  @Post(':id/operation/confirm-price')
+  @ApiOperation({
+    summary:
+      'Customer confirms or rejects an operations price adjustment ' +
+      '(OPERATION_PRICE_PENDING_CONFIRM → batch pool | OPERATION_CHANGES_REQUESTED)',
+  })
+  async confirmOperationPrice(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: ConfirmOperationPriceDto,
+  ) {
+    const booking = await this.transitionService.confirmOperationPrice(
+      id,
+      dto.accept,
+    );
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
+  @Post(':id/clearance/review')
+  @BookingStaff(FREIGHT_PERMS.bookings.reviewDocuments)
+  @ApiOperation({ summary: 'GL reviews a clearance document (Approve | Query)' })
+  async reviewClearanceDocument(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: ReviewDocumentDto,
+    @CurrentUser() user: AuthUserPayload,
+  ) {
+    const booking = await this.transitionService.reviewDocument(
+      id,
+      dto.fileKey,
+      dto.status,
+      resolveAuthUserId(user),
+      dto.note,
+    );
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
+  @Post(':id/clearance/output-documents')
+  @BookingStaff(FREIGHT_PERMS.bookings.uploadClearanceOutput)
+  @UseInterceptors(AnyFilesInterceptor())
+  @ApiConsumes('multipart/form-data')
+  @ApiOperation({ summary: 'GL uploads customs output documents (IM4/EX3/…)' })
+  async uploadClearanceOutput(
+    @Param('id', ParseUUIDPipe) id: string,
+    @UploadedFiles() files: Express.Multer.File[],
+  ) {
+    const booking = await this.transitionService.uploadClearanceOutputDocuments(
+      id,
+      files ?? [],
+    );
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
+  @Post(':id/clearance/finalize')
+  @BookingStaff(FREIGHT_PERMS.bookings.finalizeClearance)
+  @ApiOperation({
+    summary: 'GL finalizes clearance (requires 100% approved) → CLEARANCE_READY',
+  })
+  async finalizeClearance(@Param('id', ParseUUIDPipe) id: string) {
+    const booking = await this.transitionService.finalizeClearance(id);
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
  @Post(':id/staff/request-changes')
  @BookingStaff(FREIGHT_PERMS.bookings.requestChanges)
  @ApiOperation({ summary: 'Staff return booking for customer updates' })
@@ -336,14 +478,19 @@ export class BookingsController {

  @Post(':id/staff/accept')
  @BookingStaff(FREIGHT_PERMS.bookings.staffAccept)
-  @ApiOperation({ summary: 'Staff accept intake → start approval chain' })
+  @ApiOperation({
+    summary:
+      'Staff accept intake → set contract validity window + start approval chain',
+  })
  async acceptIntake(
    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: AcceptIntakeDto,
    @CurrentUser() user: AuthUserPayload,
  ) {
    const booking = await this.transitionService.acceptIntake(
      id,
      resolveAuthUserId(user),
+      dto.validityDays,
    );
    return this.transitionService.enrichBookingResponse(booking);
  }
@@ -364,6 +511,25 @@ export class BookingsController {
    return this.transitionService.enrichBookingResponse(booking);
  }

+  @Post(':id/adjust-price')
+  @BookingStaff(FREIGHT_PERMS.bookings.staffAccept)
+  @ApiOperation({
+    summary: 'Staff adjust booking total price (override; null clears it)',
+  })
+  async adjustPrice(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: AdjustPriceDto,
+    @CurrentUser() user: AuthUserPayload,
+  ) {
+    const booking = await this.transitionService.adjustPrice(
+      id,
+      dto.amount ?? null,
+      resolveAuthUserId(user),
+      dto.reason,
+    );
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
  @Post(':id/government-expedite')
  @BookingStaff(FREIGHT_PERMS.bookings.staffAccept)
  @ApiOperation({ summary: 'Expedite government booking to PAID / ELIGIBLE for scheduling' })
--- a/apps/edr-freight-api/src/modules/bookings/bookings.module.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.module.ts
@@ -8,6 +8,7 @@ import { CompaniesModule } from '../companies/companies.module';
 import { FilesModule } from '../files/files.module';
 import { MinioModule } from '../minio/minio.module';
 import { RuleEngineModule } from '../rule-engine/rule-engine.module';
+import { FileUploadSettingsModule } from '../file-upload-settings/file-upload-settings.module';
 import { SignaturesModule } from '../signatures/signatures.module';
 import { BookingContractService } from './booking-contract.service';
 import { BookingPaymentService } from './booking-payment.service';
@@ -21,6 +22,7 @@ import { ConsolidationService } from './consolidation.service';
 import { BookingsService } from './bookings.service';
 import { BookingApprovalStep } from './entities/booking-approval-step.entity';
 import { BookingCargoModifier } from './entities/booking-cargo-modifier.entity';
+import { BookingDocumentReview } from './entities/booking-document-review.entity';
 import { BookingContainer } from './entities/booking-container.entity';
 import { BookingRateSnapshot } from './entities/booking-rate-snapshot.entity';
 import { BookingContractSignature } from './entities/booking-contract-signature.entity';
@@ -41,6 +43,7 @@ import { TrainSchedulingModule } from '../train-scheduling/train-scheduling.modu
      BookingContainer,
      BookingCargoModifier,
      BookingApprovalStep,
+      BookingDocumentReview,
      BookingRateSnapshot,
      BookingReviewNote,
      BookingContractSignature,
@@ -52,6 +55,7 @@ import { TrainSchedulingModule } from '../train-scheduling/train-scheduling.modu
    CompaniesModule,
    // CustomersModule,
    RuleEngineModule,
+    FileUploadSettingsModule,
    SignaturesModule,
    ExchangeModule.forRootAsync({
      inject: [ConfigService],
@@ -75,6 +79,6 @@ import { TrainSchedulingModule } from '../train-scheduling/train-scheduling.modu
    ContractRendererService,
    ContractPdfService,
  ],
-  exports: [BookingsService, BookingsRepository],
+  exports: [BookingsService, BookingsRepository, BookingPricingService],
 })
 export class BookingsModule {}
--- a/apps/edr-freight-api/src/modules/bookings/bookings.repository.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.repository.ts
@@ -7,6 +7,10 @@ import { DataSource, EntityManager, FindOptionsWhere, In, Repository, SelectQuer
 import { ContainerType } from '../rule-engine/entities/container-type.entity';
 import { BookingApprovalStep } from './entities/booking-approval-step.entity';
 import { BookingCargoModifier } from './entities/booking-cargo-modifier.entity';
+import {
+  BookingDocumentReview,
+  DocumentReviewStatus,
+} from './entities/booking-document-review.entity';
 import { BookingContainer } from './entities/booking-container.entity';
 import { BookingRateSnapshot } from './entities/booking-rate-snapshot.entity';
 import { BookingReviewNote, ReviewNoteType } from './entities/booking-review-note.entity';
@@ -37,7 +41,6 @@ export interface BookingListFilterOptions {
  excludePaymentStatus?: string;
  createdFrom?: string;
  createdTo?: string;
-  allowConsolidation?: boolean;
  consolidationPaired?: string;
 }

@@ -179,7 +182,6 @@ export class BookingsRepository extends BaseRepository<Booking> {
      .innerJoinAndSelect('b.bookingContainers', 'bc')
      .innerJoin('bc.containerType', 'ct')
      .where('b.id != :bookingId', { bookingId: booking.id })
-      .andWhere('b.allowConsolidation = true')
      .andWhere('b.consolidationPartnerId IS NULL')
      // Only pair bookings the customer has committed (SUBMITTED) or that are
      // already waiting (PENDING_CONSOLIDATION). DRAFT bookings are excluded so
@@ -315,11 +317,87 @@ export class BookingsRepository extends BaseRepository<Booking> {
    return pending === 0;
  }

+  // ── Clearance document reviews ────────────────────────────────────────────
+
+  findDocumentReviews(bookingId: string): Promise<BookingDocumentReview[]> {
+    return this.dataSource.getRepository(BookingDocumentReview).find({
+      where: { bookingId },
+      order: { createdAt: 'ASC' },
+    });
+  }
+
+  findDocumentReview(
+    bookingId: string,
+    settingCode: string,
+    fileKey: string,
+  ): Promise<BookingDocumentReview | null> {
+    return this.dataSource.getRepository(BookingDocumentReview).findOne({
+      where: { bookingId, settingCode, fileKey },
+    });
+  }
+
+  /**
+   * Upsert a document-review row to PENDING for a freshly uploaded file. Resets
+   * any prior QUERIED/APPROVED state so the GL re-reviews the new upload.
+   */
+  async upsertDocumentReviewPending(input: {
+    bookingId: string;
+    settingCode: string;
+    fileKey: string;
+    fileRecordId: string;
+  }): Promise<void> {
+    const repo = this.dataSource.getRepository(BookingDocumentReview);
+    const existing = await repo.findOne({
+      where: {
+        bookingId: input.bookingId,
+        settingCode: input.settingCode,
+        fileKey: input.fileKey,
+      },
+    });
+    if (existing) {
+      await repo.update(existing.id, {
+        fileRecordId: input.fileRecordId,
+        status: 'PENDING',
+        note: null,
+        reviewedByStaffId: null,
+        reviewedAt: null,
+      });
+      return;
+    }
+    await repo.save(repo.create({ ...input, status: 'PENDING' }));
+  }
+
+  /** GL marks a document APPROVED or QUERIED (with an optional note). */
+  async setDocumentReviewStatus(
+    bookingId: string,
+    settingCode: string,
+    fileKey: string,
+    status: DocumentReviewStatus,
+    staffId: string,
+    note?: string,
+  ): Promise<void> {
+    const repo = this.dataSource.getRepository(BookingDocumentReview);
+    const existing = await repo.findOne({
+      where: { bookingId, settingCode, fileKey },
+    });
+    const patch = {
+      status,
+      note: note ?? null,
+      reviewedByStaffId: staffId,
+      reviewedAt: new Date(),
+    };
+    if (existing) {
+      await repo.update(existing.id, patch);
+      return;
+    }
+    await repo.save(repo.create({ bookingId, settingCode, fileKey, ...patch }));
+  }
+
  /** Persist cargo modifiers linked to rate snapshots. */
  async createCargoModifiers(
    rows: Array<{
      bookingId: string;
-      surchargeTypeId: string;
+      rateId: string;
      triggerValue: number | null;
      calculatedAmount: number;
      rateSnapshotId: string;
@@ -650,11 +728,6 @@ export class BookingsRepository extends BaseRepository<Booking> {
        excludePaymentStatus: options.excludePaymentStatus,
      });
    }
-    if (options.allowConsolidation !== undefined) {
-      qb.andWhere('booking.allow_consolidation = :allowConsolidation', {
-        allowConsolidation: options.allowConsolidation,
-      });
-    }
    if (options.consolidationPaired === 'true') {
      qb.andWhere('booking.consolidation_partner_id IS NOT NULL');
    } else if (options.consolidationPaired === 'false') {
--- a/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
@@ -11,6 +11,7 @@ import { Freight, SchedulingStatus } from '@edr/types';
 // import { CustomersService } from '../customers/customers.service';
 import { CompaniesService } from '../companies/companies.service';
 import { ProfileType } from '../companies/entities/company-profile.entity';
+import { CompanyStatus } from '../companies/entities/company.entity';
 import { TrainSchedulingService } from '../train-scheduling/train-scheduling.service';
 import { eatDay } from '../train-scheduling/batch-window.util';
 import { FilesService } from '../files/files.service';
@@ -25,6 +26,7 @@ import { DataSource, In } from 'typeorm';

 import { deriveTradeDirection } from '../../common/derive-trade-direction.util';
 import { Yard } from '../rule-engine/entities/yard.entity';
+import { ContractRouteLine } from '../booking-orders/entities/contract-route-line.entity';
 import { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
 import { BookingsRepository } from './bookings.repository';
 import { ConsolidationService } from './consolidation.service';
@@ -125,7 +127,6 @@ export class BookingsService {
    tradeDirection: string;
    isHazardous?: boolean;
    isGovernment?: boolean;
-    allowConsolidation?: boolean;
    shippingLineId?: string | null;
    containers: CreateBookingContainerDto[];
  }): Promise<BookingEvaluationInput> {
@@ -150,6 +151,14 @@ export class BookingsService {
      containers.reduce((sum, c) => sum + c.wagonsRequired, 0),
    );

+    // Consolidation is system-managed: the CONSOLIDATION_ENABLED rule trigger
+    // fires whenever a container line leaves a wagon partially filled. There is
+    // no customer opt-in — partial-wagon cargo always consolidates.
+    const allowConsolidation =
+      dto.freightType === 'CONTAINER'
+        ? await this.needsConsolidation(dto.containers)
+        : false;
+
    return {
      freightType: dto.freightType,
      cargoTypeId: dto.cargoTypeId ?? null,
@@ -158,8 +167,7 @@ export class BookingsService {
      tradeDirection: dto.tradeDirection,
      isHazardous: dto.isHazardous ?? false,
      isGovernment: dto.isGovernment ?? false,
-      allowConsolidation:
-        dto.freightType === 'CONTAINER' ? dto.allowConsolidation : false,
+      allowConsolidation,
      shippingLineId: dto.shippingLineId,
      totalWagons,
      containers,
@@ -167,26 +175,20 @@ export class BookingsService {
  }

  /**
-   * Enable consolidation when any container line leaves a wagon partially filled
-   * (e.g. 1×20ft on a 2-slot wagon, 1×10ft on a 4-slot wagon).
-   *
-   * Partial-wagon cargo ALWAYS consolidates — the customer cannot opt out of a
-   * half-empty wagon, so `explicit === false` is ignored when consolidation is
-   * actually needed. The opt-in flag only matters for cargo that already fills
-   * whole wagons (where consolidation is moot anyway).
+   * True when any container line leaves a wagon partially filled (e.g. 1×20ft on
+   * a 2-slot wagon). Partial-wagon cargo must consolidate before it can finalize;
+   * cargo that already fills whole wagons never does. This is computed from the
+   * container quantities alone — there is no customer-facing opt-in flag.
   */
-  private async resolveConsolidation(
+  private async needsConsolidation(
    containers: CreateBookingContainerDto[],
-    explicit?: boolean,
  ): Promise<boolean> {
-    const needs = await this.consolidationService.needsConsolidation(
+    return this.consolidationService.needsConsolidation(
      containers.map((c) => ({
        containerTypeId: c.containerTypeId,
        quantity: c.quantity,
      })),
    );
-    if (needs) return true;
-    return explicit ?? false;
  }

  /** Search for a complementary partner; pair or queue as PENDING_CONSOLIDATION. */
@@ -196,10 +198,12 @@ export class BookingsService {
  }> {
    const messages: string[] = [];

-    if (!booking.allowConsolidation || booking.consolidationPartnerId) {
+    if (booking.consolidationPartnerId) {
      return { booking, messages };
    }

+    // Only partial-wagon container lines produce slots; full-wagon (and bulk)
+    // bookings return none and need no consolidation.
    const slots = await this.consolidationService.slotsFromBooking(booking);
    if (slots.length === 0) {
      return { booking, messages };
@@ -287,6 +291,12 @@ export class BookingsService {
        );
      }
      const { company } = await this.companiesService.getCompanyInfoByUserId(userId);
+      // A customer can only book once their company has been approved.
+      if (company.status !== CompanyStatus.Active) {
+        throw new ForbiddenException(
+          "Your company is awaiting approval — you can't create bookings yet.",
+        );
+      }
      companyId = company.id;
    }

@@ -374,9 +384,9 @@ export class BookingsService {
      }
    }

-    const allowConsolidation =
+    const needsConsolidation =
      dto.freightType === 'CONTAINER'
-        ? await this.resolveConsolidation(containers, dto.allowConsolidation)
+        ? await this.needsConsolidation(containers)
        : false;

    const evalInput = await this.buildEvalInput({
@@ -387,7 +397,6 @@ export class BookingsService {
      tradeDirection,
      isHazardous: dto.isHazardous,
      isGovernment,
-      allowConsolidation,
      shippingLineId: dto.shippingLineId,
      containers,
    });
@@ -408,7 +417,13 @@ export class BookingsService {
      previousContractId: dto.previousContractId,
      serviceTypeId: dto.serviceTypeId,
      firstMilePickupAddress: dto.firstMilePickupAddress,
+      firstMilePickupLat: dto.firstMilePickupLat ?? null,
+      firstMilePickupLng: dto.firstMilePickupLng ?? null,
      lastMileDeliveryAddress: dto.lastMileDeliveryAddress,
+      lastMileDeliveryLat: dto.lastMileDeliveryLat ?? null,
+      lastMileDeliveryLng: dto.lastMileDeliveryLng ?? null,
+      customsClearingEnabled: dto.customsClearingEnabled ?? false,
+      customsClearingAgent: dto.customsClearingAgent ?? null,
      equipmentReturn: dto.equipmentReturn,
      originYardId: dto.originYardId,
      destinationYardId: dto.destinationYardId,
@@ -427,7 +442,6 @@ export class BookingsService {
      startDate: dto.startDate ? new Date(dto.startDate) : undefined,
      endDate: dto.endDate ? new Date(dto.endDate) : undefined,
      status: 'DRAFT',
-      allowConsolidation,
      priorityScore: ruleResult.priorityScore,
      totalAmount: 0,
      paymentStatus: 'PENDING',
@@ -447,6 +461,25 @@ export class BookingsService {
      warnings.push(`Estimated wagons required: ${wagonCount}`);
    }

+    // Multi-route general contracts: persist the contracted routes + quantities.
+    // Each drawdown order later draws from one of these route lines.
+    if (isGeneralContract && dto.routes?.length) {
+      const routeRepo = this.dataSource.getRepository(ContractRouteLine);
+      await routeRepo.save(
+        dto.routes.map((r) =>
+          routeRepo.create({
+            contractBookingId: booking.id,
+            originYardId: r.originYardId,
+            destinationYardId: r.destinationYardId,
+            containerTypeId:
+              dto.freightType === 'CONTAINER' ? (r.containerTypeId ?? null) : null,
+            quantity: r.quantity,
+            km: r.km ?? null,
+          }),
+        ),
+      );
+    }
+
    if (files.length > 0) {
      try {
        await this.filesService.uploadMany(booking.id, 'bookings', files);
@@ -455,9 +488,36 @@ export class BookingsService {
      }
    }

+    // Reuse the booking profile's onboarding documents instead of asking the
+    // customer to re-upload. Snapshot them onto the booking now (by reference),
+    // so a later active-profile switch never changes this booking's documents.
+    if (companyProfileId) {
+      try {
+        const onboardingFiles =
+          await this.companiesService.getProfileOnboardingFiles(companyProfileId);
+        if (onboardingFiles.length > 0) {
+          await this.filesService.attachExistingFiles(
+            booking.id,
+            'bookings',
+            onboardingFiles.map((f, i) => ({
+              code: `onboarding_document_${i + 1}`,
+              name: f.name,
+              url: f.url,
+              size: f.size,
+              mimeType: f.mimeType,
+            })),
+          );
+        }
+      } catch {
+        warnings.push(
+          'Could not attach onboarding documents — they can be added from the booking page.',
+        );
+      }
+    }
+
    let full = await this.findById(booking.id);

-    if (allowConsolidation) {
+    if (needsConsolidation) {
      const consolidation = await this.tryAutoConsolidate(full);
      full = consolidation.booking;
      warnings.push(...consolidation.messages);
@@ -516,12 +576,9 @@ export class BookingsService {
      dto.tradeDirection,
    );

-    const allowConsolidation =
+    const needsConsolidation =
      freightType === 'CONTAINER'
-        ? await this.resolveConsolidation(
-            containers,
-            dto.allowConsolidation ?? existing.allowConsolidation,
-          )
+        ? await this.needsConsolidation(containers)
        : false;

    const evalInput = await this.buildEvalInput({
@@ -531,7 +588,6 @@ export class BookingsService {
      paymentCurrency: dto.paymentCurrency ?? existing.paymentCurrency,
      tradeDirection,
      isHazardous: dto.isHazardous ?? existing.isHazardous,
-      allowConsolidation,
      shippingLineId: dto.shippingLineId ?? existing.shippingLineId ?? undefined,
      containers,
    });
@@ -540,12 +596,11 @@ export class BookingsService {
    this.ruleEngineService.assertNoHardBlocks(ruleResult);
    warnings.push(...ruleResult.warnings);

-    const pricingFieldsChanged = this.pricingRelevantFieldsChanged(
+    const pricingFieldsChanged = await this.pricingRelevantFieldsChanged(
      existing,
      dto,
      freightType,
      cargoTypeId,
-      allowConsolidation,
      containers,
    );

@@ -553,7 +608,6 @@ export class BookingsService {
      ...dto,
      freightType,
      cargoTypeId: freightType === 'BULK' ? cargoTypeId : null,
-      allowConsolidation,
      priorityScore: ruleResult.priorityScore,
      tradeDirection,
    };
@@ -603,7 +657,7 @@ export class BookingsService {

    let booking = await this.findById(id);

-    if (allowConsolidation && !booking.consolidationPartnerId) {
+    if (needsConsolidation && !booking.consolidationPartnerId) {
      const consolidation = await this.tryAutoConsolidate(booking);
      booking = consolidation.booking;
      warnings.push(...consolidation.messages);
@@ -667,10 +721,11 @@ export class BookingsService {
      assignedToSchedule: filter.assignedToSchedule,
      // A forced company scope (portal/customer) overrides any caller-provided
      // companyId so a customer can only ever see their own company's bookings.
-      // When an active profile resolves, scope to it; otherwise fall back to the
-      // company so nothing breaks for not-yet-onboarded customers.
-      companyId: forceCompanyProfileId ? undefined : forceCompanyId ?? filter.companyId,
-      companyProfileId: forceCompanyProfileId,
+      // The company guard always applies; the optional companyProfileId filter
+      // (from the per-page service filter) narrows WITHIN the company — the repo
+      // ANDs both, so cross-company access is impossible.
+      companyId: forceCompanyId ?? filter.companyId,
+      companyProfileId: forceCompanyProfileId ?? filter.companyProfileId,
      contractType: filter.contractType,
      serviceTypeId: filter.serviceTypeId,
      cargoTypeId: filter.cargoTypeId,
@@ -681,7 +736,6 @@ export class BookingsService {
      paymentStatus: filter.paymentStatus,
      createdFrom: filter.createdFrom,
      createdTo: filter.createdTo,
-      allowConsolidation: filter.allowConsolidation,
      consolidationPaired: filter.consolidationPaired,
      sortBy: filter.sortBy,
      sortOrder: filter.sortOrder,
@@ -705,18 +759,15 @@ export class BookingsService {
    filter: FilterBookingDto,
  ): Promise<PaginatedBookings> {
    const { company } = await this.companiesService.getCompanyInfoByUserId(userId);
-    // Scope to the active operational profile when one resolves; fall back to
-    // company-level so not-yet-onboarded customers still see their payables.
-    const companyProfileId =
-      await this.companiesService.resolveActiveCompanyProfileId(userId);

    return this.bookingsRepository.findAllPaginated({
      page: filter.page ?? 1,
      pageSize: filter.pageSize ?? 20,
      statuses: BookingsService.PAYABLE_STATUSES,
      excludePaymentStatus: 'PAID',
-      companyId: companyProfileId ? undefined : company.id,
-      companyProfileId: companyProfileId ?? undefined,
+      // Company-wide: payables span all of the customer's services.
+      companyId: company.id,
+      companyProfileId: filter.companyProfileId,
      sortBy: filter.sortBy,
      sortOrder: filter.sortOrder,
    });
@@ -852,7 +903,6 @@ export class BookingsService {
      paymentStatus: filter.paymentStatus,
      createdFrom: filter.createdFrom,
      createdTo: filter.createdTo,
-      allowConsolidation: filter.allowConsolidation,
      consolidationPaired: filter.consolidationPaired,
    };

@@ -961,10 +1011,6 @@ export class BookingsService {
  }> {
    const booking = await this.findById(id);

-    if (!booking.allowConsolidation) {
-      throw new BadRequestException('Booking is not eligible for consolidation');
-    }
-
    const needs = await this.consolidationService.needsConsolidationFromBooking(
      booking,
    );
@@ -1048,14 +1094,13 @@ export class BookingsService {
    };
  }

-  private pricingRelevantFieldsChanged(
+  private async pricingRelevantFieldsChanged(
    existing: Booking,
    dto: UpdateBookingDto,
    freightType: FreightType,
    cargoTypeId: string | null | undefined,
-    allowConsolidation: boolean,
    containers: CreateBookingContainerDto[],
-  ): boolean {
+  ): Promise<boolean> {
    if (dto.freightType !== undefined && dto.freightType !== existing.freightType) {
      return true;
    }
@@ -1068,18 +1113,14 @@ export class BookingsService {
    if (dto.isHazardous !== undefined && dto.isHazardous !== existing.isHazardous) {
      return true;
    }
-    if (
-      dto.allowConsolidation !== undefined &&
-      dto.allowConsolidation !== existing.allowConsolidation
-    ) {
-      return true;
-    }
    if (dto.shippingLineId !== undefined && dto.shippingLineId !== existing.shippingLineId) {
      return true;
    }
    if (dto.cargoTypeId !== undefined && dto.cargoTypeId !== existing.cargoTypeId) {
      return true;
    }
+    // Container lines drive both the base price and the consolidation surcharge
+    // (CONSOLIDATION_ENABLED fires on partial wagons), so any line change re-prices.
    if (dto.containers !== undefined) {
      const existingContainers = (existing.bookingContainers ?? [])
        .filter((bc): bc is typeof bc & { containerTypeId: string } => bc.containerTypeId != null)
@@ -1094,8 +1135,7 @@ export class BookingsService {
    }
    if (
      freightType !== existing.freightType ||
-      (cargoTypeId ?? null) !== (existing.cargoTypeId ?? null) ||
-      allowConsolidation !== existing.allowConsolidation
+      (cargoTypeId ?? null) !== (existing.cargoTypeId ?? null)
    ) {
      return true;
    }
--- a/apps/edr-freight-api/src/modules/bookings/clearance.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/clearance.util.spec.ts
@@ -0,0 +1,49 @@
+import {
+  clearanceSettingCode,
+  clearanceOutputSettingCode,
+} from './clearance.util';
+
+describe('clearance.util — clearanceSettingCode', () => {
+  it('resolves import container with/without customs', () => {
+    expect(clearanceSettingCode('IMPORT', 'CONTAINER', true)).toBe(
+      'clearance_import_container_with_customs',
+    );
+    expect(clearanceSettingCode('IMPORT', 'CONTAINER', false)).toBe(
+      'clearance_import_container_without_customs',
+    );
+  });
+
+  it('resolves export bulk with/without customs', () => {
+    expect(clearanceSettingCode('EXPORT', 'BULK', true)).toBe(
+      'clearance_export_bulk_with_customs',
+    );
+    expect(clearanceSettingCode('EXPORT', 'BULK', false)).toBe(
+      'clearance_export_bulk_without_customs',
+    );
+  });
+
+  it('returns null for DOMESTIC (no clearance gate)', () => {
+    expect(clearanceSettingCode('DOMESTIC', 'CONTAINER', true)).toBeNull();
+    expect(clearanceSettingCode('DOMESTIC', 'BULK', false)).toBeNull();
+  });
+});
+
+describe('clearance.util — clearanceOutputSettingCode', () => {
+  it('returns a container output code only for customs container bookings', () => {
+    expect(clearanceOutputSettingCode('IMPORT', 'CONTAINER', true)).toBe(
+      'clearance_output_import_container',
+    );
+    expect(clearanceOutputSettingCode('EXPORT', 'CONTAINER', true)).toBe(
+      'clearance_output_export_container',
+    );
+  });
+
+  it('returns null without customs', () => {
+    expect(clearanceOutputSettingCode('IMPORT', 'CONTAINER', false)).toBeNull();
+  });
+
+  it('returns null for bulk (no container output set) and domestic', () => {
+    expect(clearanceOutputSettingCode('IMPORT', 'BULK', true)).toBeNull();
+    expect(clearanceOutputSettingCode('DOMESTIC', 'CONTAINER', true)).toBeNull();
+  });
+});
--- a/apps/edr-freight-api/src/modules/bookings/clearance.util.ts
+++ b/apps/edr-freight-api/src/modules/bookings/clearance.util.ts
@@ -0,0 +1,70 @@
+import { Booking } from './entities/booking.entity';
+
+/**
+ * Resolves which seeded clearance FileUploadSetting applies to a booking, from
+ * its trade direction, freight type and whether its service includes customs.
+ * Mirrors the codes seeded in file-upload-settings.seeder.ts.
+ */
+
+type Op = 'import' | 'export';
+type Freight = 'container' | 'bulk';
+
+/** Trade direction → clearance operation. DOMESTIC has no customs clearance. */
+function operationFor(tradeDirection: string): Op | null {
+  if (tradeDirection === 'IMPORT') return 'import';
+  if (tradeDirection === 'EXPORT') return 'export';
+  return null; // DOMESTIC / intercity — no clearance gate
+}
+
+function freightFor(freightType: string): Freight {
+  return freightType === 'BULK' ? 'bulk' : 'container';
+}
+
+/** The customer-input clearance setting code, or null when no gate applies. */
+export function clearanceSettingCode(
+  tradeDirection: string,
+  freightType: string,
+  includesCustoms: boolean,
+): string | null {
+  const op = operationFor(tradeDirection);
+  if (!op) return null;
+  const freight = freightFor(freightType);
+  const customs = includesCustoms ? 'with_customs' : 'without_customs';
+  return `clearance_${op}_${freight}_${customs}`;
+}
+
+/** The GL-output (customs output) setting code; only container customs sets exist. */
+export function clearanceOutputSettingCode(
+  tradeDirection: string,
+  freightType: string,
+  includesCustoms: boolean,
+): string | null {
+  if (!includesCustoms) return null;
+  const op = operationFor(tradeDirection);
+  if (!op) return null;
+  // Only container customs output sets are seeded for this phase.
+  if (freightFor(freightType) !== 'container') return null;
+  return `clearance_output_${op}_container`;
+}
+
+/** Convenience: resolve both codes for a loaded booking (with its serviceType). */
+export function clearanceCodesForBooking(booking: Booking): {
+  inputCode: string | null;
+  outputCode: string | null;
+  includesCustoms: boolean;
+} {
+  const includesCustoms = booking.serviceType?.includesCustoms ?? false;
+  return {
+    inputCode: clearanceSettingCode(
+      booking.tradeDirection,
+      booking.freightType,
+      includesCustoms,
+    ),
+    outputCode: clearanceOutputSettingCode(
+      booking.tradeDirection,
+      booking.freightType,
+      includesCustoms,
+    ),
+    includesCustoms,
+  };
+}
--- a/apps/edr-freight-api/src/modules/bookings/consolidation.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/consolidation.service.ts
@@ -57,16 +57,29 @@ export class ConsolidationService {
  async slotsFromContainerLines(
    lines: Array<{ containerTypeId: string; quantity: number }>,
  ): Promise<ConsolidationSlot[]> {
-    const slots: ConsolidationSlot[] = [];
+    // Aggregate by container type first: two lines of the same type on one
+    // booking share the same wagons. Counting them separately would flag a
+    // self-complete booking (e.g. 2× 20FT = exactly one wagon) as a partial
+    // wagon and wrongly park it in PENDING_CONSOLIDATION.
+    const quantityByType = new Map<string, number>();
    for (const line of lines) {
-      const ct = await this.containerTypesService.findById(line.containerTypeId);
+      if (!line.containerTypeId) continue;
+      quantityByType.set(
+        line.containerTypeId,
+        (quantityByType.get(line.containerTypeId) ?? 0) + Number(line.quantity || 0),
+      );
+    }
+
+    const slots: ConsolidationSlot[] = [];
+    for (const [containerTypeId, quantity] of quantityByType) {
+      const ct = await this.containerTypesService.findById(containerTypeId);
      const perWagon = containersPerWagon(Number(ct.wagonsPerUnit));
-      const remainder = wagonRemainder(line.quantity, perWagon);
+      const remainder = wagonRemainder(quantity, perWagon);
      if (remainder === 0) continue;
      slots.push({
-        containerTypeId: line.containerTypeId,
+        containerTypeId,
        containerTypeCode: ct.code,
-        quantity: line.quantity,
+        quantity,
        containersPerWagon: perWagon,
        remainder,
        slotsNeeded: perWagon - remainder,
--- a/apps/edr-freight-api/src/modules/bookings/dto/create-booking.dto.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/dto/create-booking.dto.spec.ts
@@ -0,0 +1,47 @@
+import 'reflect-metadata';
+import { plainToInstance } from 'class-transformer';
+import { CreateBookingDto } from './create-booking.dto';
+
+/**
+ * Boolean flags arrive as STRINGS over multipart/form-data ("true" / "false").
+ * The global freight ValidationPipe runs with enableImplicitConversion = false,
+ * so only the explicit @Transform on each flag coerces it. This pins that the
+ * literal string "false" maps to boolean `false` — class-transformer's implicit
+ * boolean coercion would otherwise turn any non-empty string (including "false")
+ * into `true`, silently flagging non-hazardous bookings as hazardous.
+ */
+describe('CreateBookingDto — boolean coercion from multipart strings', () => {
+  // Mirror the production pipe: explicit transforms only, no implicit coercion.
+  const toDto = (plain: Record<string, unknown>) =>
+    plainToInstance(CreateBookingDto, plain, {
+      enableImplicitConversion: false,
+    }) as unknown as CreateBookingDto;
+
+  it('maps the string "false" to boolean false for every flag', () => {
+    const dto = toDto({
+      isHazardous: 'false',
+      isGovernment: 'false',
+      customsClearingEnabled: 'false',
+    });
+    expect(dto.isHazardous).toBe(false);
+    expect(dto.isGovernment).toBe(false);
+    expect(dto.customsClearingEnabled).toBe(false);
+  });
+
+  it('maps the string "true" to boolean true for every flag', () => {
+    const dto = toDto({
+      isHazardous: 'true',
+      isGovernment: 'true',
+      customsClearingEnabled: 'true',
+    });
+    expect(dto.isHazardous).toBe(true);
+    expect(dto.isGovernment).toBe(true);
+    expect(dto.customsClearingEnabled).toBe(true);
+  });
+
+  it('still coerces numeric form strings to numbers', () => {
+    const dto = toDto({ cargoTotalWeightVgm: '12.5' });
+    expect(dto.cargoTotalWeightVgm).toBe(12.5);
+    expect(typeof dto.cargoTotalWeightVgm).toBe('number');
+  });
+});
--- a/apps/edr-freight-api/src/modules/bookings/dto/create-booking.dto.ts
+++ b/apps/edr-freight-api/src/modules/bookings/dto/create-booking.dto.ts
@@ -11,6 +11,8 @@ import {
  IsOptional,
  IsString,
  IsUUID,
+  Max,
+  MaxLength,
  Min,
  MinLength,
  Validate,
@@ -53,6 +55,42 @@ export class CreateBookingContainerDto {
  vgmPerUnitTons!: number;
 }

+export class CreateContractRouteDto {
+  @ApiProperty({ format: 'uuid', description: 'FK to yards.id (origin)' })
+  @IsUUID()
+  originYardId!: string;
+
+  @ApiProperty({ format: 'uuid', description: 'FK to yards.id (destination)' })
+  @IsUUID()
+  destinationYardId!: string;
+
+  @ApiPropertyOptional({
+    format: 'uuid',
+    description: 'Container type for CONTAINER contracts; omit for BULK',
+  })
+  @IsOptional()
+  @IsUUID()
+  containerTypeId?: string;
+
+  @ApiProperty({ description: 'Contracted quantity for this route', minimum: 1 })
+  @IsNumber()
+  @Min(0)
+  @Transform(({ value }) => Number(value))
+  quantity!: number;
+
+  @ApiPropertyOptional({
+    description: 'Road distance (km) for this route; used to bill road orders.',
+    minimum: 0,
+  })
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  @Transform(({ value }) =>
+    value === undefined || value === null || value === '' ? undefined : Number(value),
+  )
+  km?: number;
+}
+
 export class CreateBookingDto {
  /** Class-level freight shape check (not a request field). */
  @Validate(BookingFreightShapeConstraint)
@@ -144,11 +182,55 @@ export class CreateBookingDto {
  @IsString()
  firstMilePickupAddress?: string;

+  @ApiPropertyOptional({ description: 'First-mile pickup latitude (-90..90)' })
+  @IsOptional()
+  @IsNumber()
+  @Min(-90)
+  @Max(90)
+  @Transform(({ value }) => (value == null || value === '' ? undefined : Number(value)))
+  firstMilePickupLat?: number;
+
+  @ApiPropertyOptional({ description: 'First-mile pickup longitude (-180..180)' })
+  @IsOptional()
+  @IsNumber()
+  @Min(-180)
+  @Max(180)
+  @Transform(({ value }) => (value == null || value === '' ? undefined : Number(value)))
+  firstMilePickupLng?: number;
+
  @ApiPropertyOptional()
  @IsOptional()
  @IsString()
  lastMileDeliveryAddress?: string;

+  @ApiPropertyOptional({ description: 'Last-mile delivery latitude (-90..90)' })
+  @IsOptional()
+  @IsNumber()
+  @Min(-90)
+  @Max(90)
+  @Transform(({ value }) => (value == null || value === '' ? undefined : Number(value)))
+  lastMileDeliveryLat?: number;
+
+  @ApiPropertyOptional({ description: 'Last-mile delivery longitude (-180..180)' })
+  @IsOptional()
+  @IsNumber()
+  @Min(-180)
+  @Max(180)
+  @Transform(({ value }) => (value == null || value === '' ? undefined : Number(value)))
+  lastMileDeliveryLng?: number;
+
+  @ApiPropertyOptional({ description: 'Whether EDR handles customs clearance' })
+  @IsOptional()
+  @IsBoolean()
+  @Transform(({ value }) => value === 'true' || value === true)
+  customsClearingEnabled?: boolean;
+
+  @ApiPropertyOptional({ maxLength: 200, description: 'Customs clearing agent name (when customs is enabled)' })
+  @IsOptional()
+  @IsString()
+  @MaxLength(200)
+  customsClearingAgent?: string;
+
  @ApiProperty({ enum: EQUIPMENT_RETURNS })
  @IsIn([...EQUIPMENT_RETURNS])
  equipmentReturn!: string;
@@ -161,6 +243,21 @@ export class CreateBookingDto {
  @IsUUID()
  destinationYardId!: string;

+  /**
+   * GENERAL_CONTRACT only: the routes this contract reserves quantity across.
+   * Each entry has its own origin/destination and quantity; the first entry also
+   * matches the booking's originYardId/destinationYardId. Omitted for one-time
+   * bookings, which use the single origin/destination above.
+   */
+  @ApiPropertyOptional({ type: [CreateContractRouteDto] })
+  @ValidateIf((o) => o.bookingType === 'GENERAL_CONTRACT')
+  @IsOptional()
+  @IsArray()
+  @ArrayMinSize(1)
+  @ValidateNested({ each: true })
+  @Type(() => CreateContractRouteDto)
+  routes?: CreateContractRouteDto[];
+
  @ApiProperty({ enum: TRADE_DIRECTIONS })
  @IsIn([...TRADE_DIRECTIONS])
  tradeDirection!: string;
@@ -233,10 +330,4 @@ export class CreateBookingDto {
  @ValidateNested({ each: true })
  @Type(() => CreateBookingContainerDto)
  containers?: CreateBookingContainerDto[];
-
-  @ApiPropertyOptional({ default: false })
-  @IsOptional()
-  @IsBoolean()
-  @Transform(({ value }) => value === 'true' || value === true)
-  allowConsolidation?: boolean;
 }
--- a/apps/edr-freight-api/src/modules/bookings/dto/filter-booking.dto.ts
+++ b/apps/edr-freight-api/src/modules/bookings/dto/filter-booking.dto.ts
@@ -38,6 +38,15 @@ export class FilterBookingDto {
  @IsUUID()
  companyId?: string;

+  @ApiPropertyOptional({
+    format: 'uuid',
+    description:
+      'Narrow to a single operational profile (importer/exporter/freight_forwarder) within the company.',
+  })
+  @IsOptional()
+  @IsUUID()
+  companyProfileId?: string;
+
  @ApiPropertyOptional()
  @IsOptional()
  contractType?: string;
@@ -87,11 +96,6 @@ export class FilterBookingDto {
  @IsIn([...PAYMENT_STATUSES])
  paymentStatus?: string;

-  @ApiPropertyOptional()
-  @IsOptional()
-  @Transform(({ value }) => value === 'true' || value === true)
-  allowConsolidation?: boolean;
-
  @ApiPropertyOptional({ description: 'true | false — filter paired consolidation' })
  @IsOptional()
  consolidationPaired?: string;
--- a/apps/edr-freight-api/src/modules/bookings/dto/generate-price-response.dto.ts
+++ b/apps/edr-freight-api/src/modules/bookings/dto/generate-price-response.dto.ts
@@ -7,9 +7,22 @@ export class PriceLineItemDto {
  @ApiProperty()
  description!: string;

+  /** Computed line total (unitAmount × quantity). Retained for totals elsewhere. */
  @ApiProperty()
  amount!: number;

+  /** Price for a single unit of this charge (e.g. one 20ft container, one ton). */
+  @ApiProperty()
+  unitAmount!: number;
+
+  /** Unit the rate is charged per: PER_CONTAINER | PER_TON | PER_WAGON | PER_KM | FLAT. */
+  @ApiProperty()
+  unit!: string;
+
+  /** How many units this charge applies to (containers, tons, wagons; 1 for FLAT). */
+  @ApiProperty()
+  quantity!: number;
+
  @ApiProperty()
  currency!: string;
 }
--- a/apps/edr-freight-api/src/modules/bookings/dto/request-changes.dto.ts
+++ b/apps/edr-freight-api/src/modules/bookings/dto/request-changes.dto.ts
@@ -1,5 +1,16 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsString, MinLength } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import {
+  IsBoolean,
+  IsDateString,
+  IsIn,
+  IsInt,
+  IsNumber,
+  IsOptional,
+  IsString,
+  Max,
+  Min,
+  MinLength,
+} from 'class-validator';

 export class RequestChangesDto {
  @ApiProperty({ description: 'Staff note explaining what the customer must fix' })
@@ -8,6 +19,21 @@ export class RequestChangesDto {
  note!: string;
 }

+export class AcceptIntakeDto {
+  @ApiProperty({
+    description:
+      'How many days the contract stays valid, counted from the accept date. ' +
+      'The contract is valid from now through now + validityDays.',
+    minimum: 1,
+    maximum: 365,
+    example: 30,
+  })
+  @IsInt()
+  @Min(1)
+  @Max(365)
+  validityDays!: number;
+}
+
 export class StaffRejectDto {
  @ApiProperty()
  @IsString()
@@ -34,3 +60,92 @@ export class CancelBookingDto {
  @MinLength(1)
  reason!: string;
 }
+
+export class RejectBookingDto {
+  @ApiPropertyOptional({
+    description: 'Optional reason the customer rejected the price estimate',
+  })
+  @IsOptional()
+  @IsString()
+  reason?: string;
+}
+
+export class AdjustPriceDto {
+  @ApiPropertyOptional({
+    description:
+      'New total price. Omit or send null to clear a previous adjustment.',
+  })
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  amount?: number | null;
+
+  @ApiPropertyOptional({ description: 'Reason for the adjustment' })
+  @IsOptional()
+  @IsString()
+  reason?: string;
+}
+
+export class ReviewDocumentDto {
+  @ApiProperty({ description: 'The document fileKey being reviewed' })
+  @IsString()
+  @MinLength(1)
+  fileKey!: string;
+
+  @ApiProperty({ enum: ['APPROVED', 'QUERIED'] })
+  @IsIn(['APPROVED', 'QUERIED'])
+  status!: 'APPROVED' | 'QUERIED';
+
+  @ApiPropertyOptional({ description: 'Required when querying a document' })
+  @IsOptional()
+  @IsString()
+  note?: string;
+}
+
+export class RequestOperationDto {
+  @ApiProperty({
+    description:
+      'The schedule day (train departure day) the customer selects for this ' +
+      'shipment. ISO date — the booking enters the batch pool for this route + day.',
+    example: '2026-07-15',
+  })
+  @IsDateString()
+  scheduledDate!: string;
+}
+
+export class OperationReviewDto {
+  @ApiProperty({
+    description:
+      'The operations decision: ACCEPT enters the batch pool; REQUEST_CHANGES ' +
+      'returns it to the customer with a note; ADJUST_PRICE sets a new total the ' +
+      'customer must re-confirm before it proceeds.',
+    enum: ['ACCEPT', 'REQUEST_CHANGES', 'ADJUST_PRICE'],
+  })
+  @IsIn(['ACCEPT', 'REQUEST_CHANGES', 'ADJUST_PRICE'])
+  decision!: 'ACCEPT' | 'REQUEST_CHANGES' | 'ADJUST_PRICE';
+
+  @ApiPropertyOptional({
+    description: 'Required for REQUEST_CHANGES (what the customer must fix).',
+  })
+  @IsOptional()
+  @IsString()
+  note?: string;
+
+  @ApiPropertyOptional({
+    description: 'New total price — required for ADJUST_PRICE.',
+  })
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  amount?: number;
+}
+
+export class ConfirmOperationPriceDto {
+  @ApiProperty({
+    description:
+      'true to accept the operations price adjustment and proceed to the ' +
+      'batch pool; false to reject it (returns to operation changes requested).',
+  })
+  @IsBoolean()
+  accept!: boolean;
+}
--- a/apps/edr-freight-api/src/modules/bookings/entities/booking-cargo-modifier.entity.ts
+++ b/apps/edr-freight-api/src/modules/bookings/entities/booking-cargo-modifier.entity.ts
@@ -1,12 +1,12 @@
 import { BaseEntity } from '@edr/api-common';
 import { Column, Entity, Index, JoinColumn, ManyToOne } from 'typeorm';
-import { SurchargeType } from '../../rule-engine/entities/surcharge-type.entity';
+import { Rate } from '../../rule-engine/entities/rate.entity';
 import { Booking } from './booking.entity';
 import { BookingRateSnapshot } from './booking-rate-snapshot.entity';

@Entity({ schema: 'freight', name: 'booking_cargo_modifier' })
@Index(['bookingId'])
-@Index(['surchargeTypeId'])
+@Index(['rateId'])
 export class BookingCargoModifier extends BaseEntity {
  @Column({ name: 'booking_id', type: 'uuid' })
  bookingId!: string;
@@ -15,12 +15,17 @@ export class BookingCargoModifier extends BaseEntity {
  @JoinColumn({ name: 'booking_id' })
  booking?: Booking;

-  @Column({ name: 'surcharge_type_id', type: 'uuid' })
-  surchargeTypeId!: string;
+  /**
+   * The trigger-based rate (hazard, reefer, overweight …) that produced this
+   * surcharge line. Replaces the former surcharge_type link now that rates are
+   * self-describing.
+   */
+  @Column({ name: 'rate_id', type: 'uuid' })
+  rateId!: string;

-  @ManyToOne(() => SurchargeType)
-  @JoinColumn({ name: 'surcharge_type_id' })
-  surchargeType?: SurchargeType;
+  @ManyToOne(() => Rate)
+  @JoinColumn({ name: 'rate_id' })
+  rate?: Rate;

  @Column({ name: 'trigger_value', type: 'numeric', precision: 14, scale: 4, nullable: true })
  triggerValue?: number | null;
--- a/apps/edr-freight-api/src/modules/bookings/entities/booking-document-review.entity.ts
+++ b/apps/edr-freight-api/src/modules/bookings/entities/booking-document-review.entity.ts
@@ -0,0 +1,51 @@
+import { BaseEntity } from '@edr/api-common';
+import { Column, Entity, Index, JoinColumn, ManyToOne } from 'typeorm';
+import { Booking } from './booking.entity';
+
+export const DOCUMENT_REVIEW_STATUSES = ['PENDING', 'APPROVED', 'QUERIED'] as const;
+export type DocumentReviewStatus = (typeof DOCUMENT_REVIEW_STATUSES)[number];
+
+/**
+ * Per-document GL review for the post-counter-sign clearance gate. One row per
+ * required clearance document (keyed by fileKey within a setting). GL marks each
+ * APPROVED or QUERIED (with a note); the booking can only proceed once every
+ * required customer document is APPROVED. A QUERIED row returns to PENDING when
+ * the customer re-uploads that file.
+ */
+@Entity({ schema: 'freight', name: 'booking_document_review' })
+@Index(['bookingId'])
+@Index(['status'])
+@Index(['bookingId', 'settingCode', 'fileKey'], { unique: true })
+export class BookingDocumentReview extends BaseEntity {
+  @Column({ name: 'booking_id', type: 'uuid' })
+  bookingId!: string;
+
+  @ManyToOne(() => Booking, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'booking_id' })
+  booking?: Booking;
+
+  /** The clearance setting this document belongs to (e.g. clearance_import_container_with_customs). */
+  @Column({ name: 'setting_code', type: 'varchar', length: 128 })
+  settingCode!: string;
+
+  /** The required document's stable key within the setting (e.g. commercial_invoice). */
+  @Column({ name: 'file_key', type: 'varchar', length: 128 })
+  fileKey!: string;
+
+  /** The uploaded FileRecord backing this review row (null until uploaded). */
+  @Column({ name: 'file_record_id', type: 'uuid', nullable: true })
+  fileRecordId?: string | null;
+
+  @Column({ name: 'status', type: 'varchar', length: 20, default: 'PENDING' })
+  status!: DocumentReviewStatus;
+
+  /** GL note explaining a QUERIED status. */
+  @Column({ name: 'note', type: 'text', nullable: true })
+  note?: string | null;
+
+  @Column({ name: 'reviewed_by_staff_id', type: 'uuid', nullable: true })
+  reviewedByStaffId?: string | null;
+
+  @Column({ name: 'reviewed_at', type: 'timestamptz', nullable: true })
+  reviewedAt?: Date | null;
+}
--- a/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
+++ b/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
@@ -43,6 +43,20 @@ export const BOOKING_STATUSES = [
  'CONSOLIDATED',
  'CONTRACT_ACTIVE',
  'CONTRACT_CLOSED',
+  // Post counter-sign document-clearance gate (GL workflow).
+  'AWAITING_DOCUMENTS',
+  'DOCUMENTS_UNDER_REVIEW',
+  'CLEARANCE_READY',
+  // Road (truck) drawdown orders skip the train batch pool and wait here for
+  // truck dispatch after Marketing accepts; billed by KM, not wagons.
+  'ROAD_DISPATCH_PENDING',
+  'OPERATION_REQUESTED',
+  // Operations review gate: customer picks a schedule day and submits the
+  // operation request; the operations team reviews capacity/docs/route before
+  // the booking enters the batch holding pool.
+  'OPERATION_REQUEST_PENDING',
+  'OPERATION_CHANGES_REQUESTED',
+  'OPERATION_PRICE_PENDING_CONFIRM',
 ] as const;

 export type BookingStatus = (typeof BOOKING_STATUSES)[number];
@@ -156,6 +170,37 @@ export class Booking extends BaseEntity {
  @Column({ name: 'total_amount', type: 'numeric', precision: 14, scale: 2, default: 0 })
  totalAmount!: number;

+  /**
+   * Staff-adjusted total price. When set, it overrides the computed totalAmount
+   * for the customer, who is shown an "Adjusted by EDR" badge.
+   */
+  @Column({ name: 'adjusted_total_amount', type: 'numeric', precision: 14, scale: 2, nullable: true })
+  adjustedTotalAmount?: number | null;
+
+  @Column({ name: 'adjusted_by_staff_id', type: 'uuid', nullable: true })
+  adjustedByStaffId?: string | null;
+
+  @Column({ name: 'adjusted_at', type: 'timestamptz', nullable: true })
+  adjustedAt?: Date | null;
+
+  @Column({ name: 'adjustment_reason', type: 'text', nullable: true })
+  adjustmentReason?: string | null;
+
+  /**
+   * Contract validity window, set by the backoffice at the accept step. The
+   * staff enter a number of days; the contract is valid from contractValidFrom
+   * (the accept moment) through contractValidUntil (validFrom + N days). Outside
+   * this window the contract is expired and the booking cannot proceed.
+   */
+  @Column({ name: 'contract_validity_days', type: 'int', nullable: true })
+  contractValidityDays?: number | null;
+
+  @Column({ name: 'contract_valid_from', type: 'timestamptz', nullable: true })
+  contractValidFrom?: Date | null;
+
+  @Column({ name: 'contract_valid_until', type: 'timestamptz', nullable: true })
+  contractValidUntil?: Date | null;
+
  @Column({ name: 'payment_status', type: 'varchar', length: 20, default: 'PENDING' })
  paymentStatus!: string;

@@ -179,9 +224,27 @@ export class Booking extends BaseEntity {
  @Column({ name: 'first_mile_pickup_address', type: 'text', nullable: true })
  firstMilePickupAddress?: string | null;

+  @Column({ name: 'first_mile_pickup_lat', type: 'numeric', precision: 10, scale: 7, nullable: true })
+  firstMilePickupLat?: number | null;
+
+  @Column({ name: 'first_mile_pickup_lng', type: 'numeric', precision: 10, scale: 7, nullable: true })
+  firstMilePickupLng?: number | null;
+
  @Column({ name: 'last_mile_delivery_address', type: 'text', nullable: true })
  lastMileDeliveryAddress?: string | null;

+  @Column({ name: 'last_mile_delivery_lat', type: 'numeric', precision: 10, scale: 7, nullable: true })
+  lastMileDeliveryLat?: number | null;
+
+  @Column({ name: 'last_mile_delivery_lng', type: 'numeric', precision: 10, scale: 7, nullable: true })
+  lastMileDeliveryLng?: number | null;
+
+  @Column({ name: 'customs_clearing_enabled', type: 'boolean', default: false })
+  customsClearingEnabled!: boolean;
+
+  @Column({ name: 'customs_clearing_agent', type: 'varchar', length: 200, nullable: true })
+  customsClearingAgent?: string | null;
+
  @Column({ name: 'equipment_return', type: 'varchar', length: 20 })
  equipmentReturn!: string;

@@ -228,6 +291,15 @@ export class Booking extends BaseEntity {
  @Column({ name: 'is_hazardous', type: 'boolean', default: false })
  isHazardous!: boolean;

+  /**
+   * Refrigerated cargo flag. For one-time bookings reefer is derived from the
+   * container type; for general-contract drawdown orders the customer enters a
+   * reefer quantity per order, which sets this flag on the spawned child so the
+   * REEFER_SURCHARGE rate applies even when the container type is not a reefer.
+   */
+  @Column({ name: 'is_reefer', type: 'boolean', default: false })
+  isReefer!: boolean;
+
  @Column({ name: 'payment_currency', type: 'varchar', length: 5 })
  paymentCurrency!: string;

@@ -294,9 +366,6 @@ export class Booking extends BaseEntity {
  @Column({ name: 'priority_score', type: 'int', default: 0 })
  priorityScore!: number;

-  @Column({ name: 'allow_consolidation', type: 'boolean', default: false })
-  allowConsolidation!: boolean;
-
  @Column({ name: 'consolidation_partner_id', type: 'uuid', nullable: true })
  consolidationPartnerId?: string | null;