diff --git a/.claude/skills/edr-db/SKILL.md b/.claude/skills/edr-db/SKILL.md
new file mode 100644
index 000000000..47333128d
--- /dev/null
+++ b/.claude/skills/edr-db/SKILL.md
@@ -0,0 +1,42 @@
+---
+name: edr-db
+description: Query, EXPLAIN-validate, and inspect the remote EDR freight dev database. Use whenever you need to check data, verify a raw SQL statement before shipping it, list a table's columns, check schema drift, or see which migrations are recorded. psql is NOT installed on this machine — this runner is the sanctioned path. Triggers - "check the db", "query edr_dev", "does column X exist", "validate this SQL", "is migration recorded", "seed check", diagnosing a 400/500 whose cause may be data or schema.
+---
+
+# EDR dev-DB runner
+
+One script, runs from anywhere in the repo (resolves `pg` from `apps/edr-freight-api`):
+
+```bash
+node .claude/skills/edr-db/query.cjs "SELECT ... "         # run SQL, console.table output
+node .claude/skills/edr-db/query.cjs explain "SELECT ..."  # EXPLAIN-validate only (no rows touched)
+node .claude/skills/edr-db/query.cjs columns <table>       # freight.<table> column list
+node .claude/skills/edr-db/query.cjs migrations [like]     # public.migrations rows (newest first)
+node .claude/skills/edr-db/query.cjs drift <table>         # bare column names, for diffing vs the entity
+```
+
+Connection comes from `DB_HOST` / `DB_PORT` / `DB_USER` / `DB_PASSWORD` / `DB_NAME`,
+defaulting to the shared dev database (`edr_dev`).
+
+## Rules that go with it
+
+- **HARD RULE: every raw SQL statement you write into a service must pass
+  `explain` here before you ship it.** A typo'd column is a runtime 500 the
+  type-checker cannot catch.
+- Never assume a recorded migration applied — check `migrations <name>` **and**
+  `columns <table>` together. Recorded-but-absent = schema drift; fix with a
+  NEW repair migration (idempotent DDL, no-op `down()`), never by editing the
+  recorded one.
+- Writes to dev data are fine for seeding/diagnosis but keep them idempotent
+  (`WHERE NOT EXISTS` guards) — watch-mode API instances race `migrationsRun`,
+  and non-idempotent statements have double-run here before.
+- Timestamps for new migrations: must be unique across `src/migrations/` AND
+  higher than `SELECT max(timestamp) FROM public.migrations`.
+
+## Diagnosing a pasted 400/500 (the recurring loop)
+
+1. Find the route: grep the path segment in `apps/edr-freight-api/src/modules/*/**.controller.ts`.
+2. Read the service method — list its guard `throw`s. Most "bugs" are a guard
+   working as designed (handover unsigned, fee unpaid, not PAID, wrong direction).
+3. Check the actual DB state for that record with this runner.
+4. Only then decide: guard doing its job (fix the UI affordance) vs real defect.
diff --git a/.claude/skills/edr-db/query.cjs b/.claude/skills/edr-db/query.cjs
new file mode 100644
index 000000000..b4797bd45
--- /dev/null
+++ b/.claude/skills/edr-db/query.cjs
@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+/**
+ * Dev-DB runner for the EDR freight database. psql is NOT installed on this
+ * machine; this is the sanctioned way to query, EXPLAIN-validate, and inspect
+ * the remote dev DB. Resolves `pg` from apps/edr-freight-api so it runs from
+ * anywhere in the repo.
+ *
+ *   node .claude/skills/edr-db/query.cjs "SELECT ... "        run SQL (console.table)
+ *   node .claude/skills/edr-db/query.cjs explain "SELECT..."  EXPLAIN-validate only
+ *   node .claude/skills/edr-db/query.cjs columns <table>      list freight.<table> columns
+ *   node .claude/skills/edr-db/query.cjs migrations [like]    public.migrations rows
+ *   node .claude/skills/edr-db/query.cjs drift <table>        columns vs entity check helper
+ *
+ * Connection: DB_HOST/DB_PORT/DB_USER/DB_PASSWORD/DB_NAME env vars, falling
+ * back to the shared dev database.
+ */
+const path = require('path');
+const { createRequire } = require('module');
+
+const repoRoot = path.resolve(__dirname, '..', '..', '..');
+const apiRequire = createRequire(
+  path.join(repoRoot, 'apps', 'edr-freight-api', 'package.json'),
+);
+const { Client } = apiRequire('pg');
+
+const cfg = {
+  host: process.env.DB_HOST ?? '10.18.7.207',
+  port: parseInt(process.env.DB_PORT ?? '5432', 10),
+  user: process.env.DB_USER ?? 'postgres',
+  password: process.env.DB_PASSWORD ?? 'dcba@1234',
+  database: process.env.DB_NAME ?? 'edr_dev',
+};
+
+const [, , first, ...rest] = process.argv;
+
+async function main() {
+  if (!first) {
+    console.error('usage: query.cjs "<sql>" | explain "<sql>" | columns <table> | migrations [like] | drift <table>');
+    process.exit(2);
+  }
+  const c = new Client(cfg);
+  await c.connect();
+  try {
+    if (first === 'columns') {
+      const r = await c.query(
+        `SELECT column_name, data_type, is_nullable, column_default
+           FROM information_schema.columns
+          WHERE table_schema='freight' AND table_name=$1
+          ORDER BY ordinal_position`,
+        [rest[0]],
+      );
+      console.table(r.rows);
+    } else if (first === 'migrations') {
+      const like = rest[0] ? `%${rest[0]}%` : '%';
+      const r = await c.query(
+        `SELECT id, timestamp, name FROM public.migrations
+          WHERE name ILIKE $1 ORDER BY id DESC LIMIT 40`,
+        [like],
+      );
+      console.table(r.rows);
+    } else if (first === 'drift') {
+      // Quick drift signal: DB columns for the table. Compare by eye against
+      // the entity's @Column names; a recorded-but-absent column = drift.
+      const r = await c.query(
+        `SELECT column_name FROM information_schema.columns
+          WHERE table_schema='freight' AND table_name=$1 ORDER BY column_name`,
+        [rest[0]],
+      );
+      console.log(r.rows.map((x) => x.column_name).join('\n'));
+    } else if (first === 'explain') {
+      await c.query('EXPLAIN ' + rest.join(' '));
+      console.log('OK — statement is valid against', cfg.database);
+    } else {
+      const sql = [first, ...rest].join(' ');
+      const started = Date.now();
+      const r = await c.query(sql);
+      if (Array.isArray(r.rows) && r.rows.length) console.table(r.rows);
+      console.log(`${r.rowCount ?? 0} row(s), ${Date.now() - started}ms`);
+    }
+  } finally {
+    await c.end();
+  }
+}
+
+main().catch((e) => {
+  console.error('FAIL:', e.message);
+  process.exit(1);
+});
diff --git a/.claude/skills/standup/SKILL.md b/.claude/skills/standup/SKILL.md
new file mode 100644
index 000000000..272f280e7
--- /dev/null
+++ b/.claude/skills/standup/SKILL.md
@@ -0,0 +1,40 @@
+---
+name: standup
+description: Produce the work report Hagernesh asks for - "what have I done today", "tasks of yesterday and today", daily/period summaries for tickets or timesheets. Builds the answer from git history plus uncommitted work, never from memory alone.
+---
+
+# Work report (standup / ticket summary)
+
+Ground every line in git. Do not reconstruct from conversation memory — commits
+are the record.
+
+## Gather
+
+```bash
+# Commits in the window (adjust dates; author matches "Hagernesh")
+git log --since="YYYY-MM-DD 00:00" --until="YYYY-MM-DD 00:00" --author=Hagernesh \
+  --pretty=format:"%h|%ad|%s" --date=short
+
+# What each commit actually contains (subjects lie sometimes)
+git show --stat --pretty=format:"%s" <hash> | head -12
+
+# In-flight work = part of "today" even if uncommitted
+git status --short
+git log origin/dev..HEAD --oneline     # branch commits not yet in dev
+```
+
+## Known pitfalls in this repo
+
+- **Check subjects against contents.** Commit titles here sometimes mismatch the
+  diff (e.g. a commit titled "unload export" that actually contained ISO
+  container validation). Use `git show --stat` before reporting a title as fact.
+- A day with no commits usually still has uncommitted/in-flight work — report it
+  as its own section with per-item status (done / uncommitted / blocked).
+- Merge commits from other authors are noise; filter with `--author`.
+
+## Output format
+
+One table per day: `# | Task (plain language, not the commit subject verbatim) |
+Commit / Status`. Follow with a short "carry-over / blocked" list naming what
+blocks each item. Keep it ticket-ready: no jargon that needs the repo open to
+decode.
diff --git a/.claude/skills/verify/SKILL.md b/.claude/skills/verify/SKILL.md
new file mode 100644
index 000000000..a2c715db4
--- /dev/null
+++ b/.claude/skills/verify/SKILL.md
@@ -0,0 +1,59 @@
+---
+name: verify
+description: Project definition-of-done runner for the EDR platform. Use before calling any code change finished, before committing, and whenever asked "is it done / does it work". Runs the targeted checks that actually catch this repo's failure modes - type-check with turbo filters, @edr/types dist rebuild, raw-SQL EXPLAIN validation, migration safety, and honest test reporting.
+---
+
+# Verify a change (EDR definition of done)
+
+Run these in order. Report which you ran and what each said — never call
+unverified work done.
+
+## 1. Type-check exactly what you touched
+
+```bash
+pnpm turbo type-check --filter=@edr/freight-api --filter=@edr/freight-backoffice --filter=@edr/freight-portal
+```
+
+Drop filters you didn't touch; whole-repo runs waste minutes. **If you edited
+`packages/types`, rebuild it FIRST** — consumers read its `dist/`, not `src/`:
+
+```bash
+pnpm turbo build --filter=@edr/types
+```
+
+## 2. Validate every raw SQL statement
+
+Each new/edited `dataSource.query` / `manager.query` string must pass:
+
+```bash
+node .claude/skills/edr-db/query.cjs explain "<the statement with dummy params>"
+```
+
+## 3. Migration checklist (if you added one)
+
+- Timestamp unique in `src/migrations/` **and** greater than
+  `node .claude/skills/edr-db/query.cjs "SELECT max(timestamp) FROM public.migrations"`.
+- DDL idempotent (`IF NOT EXISTS`, guarded backfills).
+- Watch-mode reload does NOT run migrations — apply the SQL to the dev DB
+  yourself or fully restart the API, then confirm with
+  `query.cjs columns <table>`.
+
+## 4. Tests — honest bar
+
+`pnpm test` for `@edr/freight-api` is currently red on `dev`, so a green suite
+is not the bar. The bar: run the specs nearest what you touched and introduce
+**no new failure**. If you touched a service constructor, update its `.spec.ts`
+mocks (constructor-arity breaks are this repo's most common test regression).
+
+## 5. Observe the behaviour
+
+Compiling is not working. Hit the endpoint, drive the UI flow, or query the
+resulting rows. If you genuinely could not observe it, say so explicitly in the
+summary — do not imply it was seen working.
+
+## 6. Before commit
+
+- Conventional message (`fix(warehouses): …`). Git hooks do NOT run in this
+  repo (husky shims exist but no user hooks) — nothing will catch it for you.
+- Lint the files you touched if in doubt: `pnpm turbo lint --filter=<pkg>`.
+- Do not commit or push unless the user asked.
diff --git a/CLAUDE_NEW.md b/CLAUDE_NEW.md
new file mode 100644
index 000000000..11075e9f0
--- /dev/null
+++ b/CLAUDE_NEW.md
@@ -0,0 +1,294 @@
+# EDR Platform — Developer Guide
+
+> This file is the contract. If something here contradicts the code, the code is the
+> truth and this file is a bug — fix it in the same PR.
+
+## Overview
+
+Monorepo for the Ethio Djibouti Railway (EDR) digital platform. Contains the Freight
+Management and Passenger Management applications, a payment microservice, plus shared
+types, NestJS utilities, and React component libraries.
+
+The freight domain is the largest and most active area. Its core flow is:
+**booking → receive to warehouse → store → load onto train → dispatch → arrive → unload
+→ customer truck (self-haul) or EDR last mile → handover → exit paper → delivered.**
+Fees (storage, demurrage, double handling, truck detention) and allocation rules
+(warehouse/yard/zone) hang off the warehouse stage.
+
+## Apps
+
+| App                            | Package name                | Purpose                                            | Default port |
+| ------------------------------ | --------------------------- | -------------------------------------------------- | ------------ |
+| `edr-freight-api`              | `@edr/freight-api`          | NestJS API for freight management                  | 3001 |
+| `edr-freight-web/portal`       | `@edr/freight-portal`       | React frontend for freight customer/portal users   | 5173 |
+| `edr-freight-web/backoffice`   | `@edr/freight-backoffice`   | React frontend for freight backoffice employees    | 5183 |
+| `edr-passenger-api`            | `@edr/passenger-api`        | NestJS API for passenger management                | 3002 |
+| `edr-payment-api`              | `@edr/payment-api`          | NestJS payment microservice (intents, webhooks)    | 3003 |
+| `edr-passenger-web/portal`     | `@edr/passenger-portal`     | React frontend for passenger customer/portal users | 5174 |
+| `edr-passenger-web/backoffice` | `@edr/passenger-backoffice` | React frontend for passenger backoffice employees  | 5184 |
+
+`edr-freight-web` and `edr-passenger-web` are grouping folders, not workspace packages.
+Each holds a `portal/` and `backoffice/` sub-app, both independent pnpm workspace
+packages (see `pnpm-workspace.yaml`).
+
+`apps/edr-landing/` exists on disk but has **no `package.json`** — it is not a workspace
+package and is not built, linted, or type-checked. Leave it alone unless asked.
+
+## Packages
+
+| Package                | Purpose                                                                            |
+| ---------------------- | ---------------------------------------------------------------------------------- |
+| `@edr/types`           | Shared TypeScript interfaces and enums                                             |
+| `@edr/api-common`      | Shared NestJS decorators, filters, interceptors, pipes, BaseEntity, BaseRepository |
+| `@edr/ui-common`       | Shared React components and theme                                                  |
+| `@edr/eslint-config`   | Shared ESLint configurations (base/nestjs/react)                                   |
+| `@edr/tsconfig`        | Shared TypeScript configurations                                                   |
+| `@edr/prettier-config` | Shared Prettier configuration                                                      |
+
+**`@edr/types` is consumed as its built `dist/`** (`main: ./dist/index.js`). Editing a
+type in `packages/types/src` changes nothing for consumers until you rebuild:
+
+```bash
+pnpm turbo build --filter=@edr/types
+```
+
+If a type-check fails on a field you just added to `@edr/types`, this is why.
+
+## Commands
+
+| Command                     | Description                              |
+| --------------------------- | ---------------------------------------- |
+| `pnpm install`              | Install all workspace dependencies        |
+| `pnpm dev`                  | Run every app in dev mode                 |
+| `pnpm dev:freight`          | Freight API + portal + backoffice         |
+| `pnpm dev:freight:api`      | Freight API only                          |
+| `pnpm dev:freight:portal`   | Freight portal only                       |
+| `pnpm dev:freight:backoffice` | Freight backoffice only                 |
+| `pnpm dev:passenger`        | Passenger API + web                       |
+| `pnpm dev:payment`          | Payment API                               |
+| `pnpm build`                | Build every package and app               |
+| `pnpm test`                 | Run all tests (turbo)                     |
+| `pnpm lint`                 | Lint everything                           |
+| `pnpm type-check`           | Type-check every package                  |
+| `pnpm format`               | Format all files with Prettier            |
+
+Prefer targeted turbo filters over whole-repo runs — they are minutes faster:
+
+```bash
+pnpm turbo type-check --filter=@edr/freight-api --filter=@edr/freight-backoffice
+```
+
+`apps/edr-freight-api` also carries many `seed:*` scripts (demo bookings, wagons, trains,
+gate-pass scenarios). Read the script before running one; several write real rows.
+
+## Environment & database
+
+- Postgres is **external**. There is no postgres service in `docker-compose.yaml`, and
+  no port `5433`/`5434` is published anywhere in the repo.
+- Freight API connection comes from `DB_HOST`, `DB_PORT`, `DB_USER`, `DB_PASSWORD`,
+  `DB_NAME` (defaults: `localhost:5433`, `edr_freight`). Development points these at a
+  remote database.
+- The connection sits behind a **connection pooler**. Do **not** pass
+  `extra.options: '-c search_path=…'` — the pooler rejects it with
+  `08P01 unsupported startup parameter in options: search_path`. `search_path` is applied
+  per-connection in a pool `connect` handler instead. See
+  `apps/edr-freight-api/src/config/database.config.ts` before touching connection options.
+- Each app owns its own database. **No cross-database joins**; cross-domain data flows
+  through API calls or message queues.
+- `psql` is not installed on the dev machine. To query the database, write a short Node
+  script using the `pg` client and run it from `apps/edr-freight-api` (where `pg` resolves).
+
+## Hard rules
+
+These are non-negotiable. Everything else is a strong default.
+
+- **pnpm only.** Never run `npm install` or `yarn`.
+- **TypeScript strict mode** is on in every package and app. Do not weaken it, and do not
+  reach for `any` to make an error go away.
+- **Never `synchronize: true`.** Not in production, not anywhere. It is currently `false`
+  in every config and it has already corrupted this database twice (see *Migrations*).
+  All schema changes go through TypeORM migrations.
+- **All entities** use UUID primary keys (`@PrimaryGeneratedColumn('uuid')`).
+- **All entities** extend `BaseEntity` from `@edr/api-common` — `createdAt`, `updatedAt`,
+  `deletedAt` (soft delete).
+- **All columns** are `snake_case` in the database (`@Column({ name: 'snake_case' })`);
+  TypeScript properties are `camelCase`.
+- **Controllers contain no business logic.** They validate, delegate, and shape the response.
+- **Conventional commits.** `fix(warehouses): …`, `feat(bookings): …`.
+- **Do not commit or push unless asked.** Propose the change; let the human decide when it lands.
+- **Do not break working behaviour to add new behaviour.** When a fix is risky, say so and
+  offer the safe version.
+
+## Architecture
+
+### NestJS module shape
+
+`module → controller → service → repository`, with `entities/` and `dto/` alongside.
+
+### Data access — the real model
+
+There are two sanctioned ways to read and write, and you must pick the right one:
+
+1. **Entity CRUD → the custom repository class.** Extends `BaseRepository<Entity>` from
+   `@edr/api-common`. Services inject the repository class, never `Repository<T>` directly.
+2. **Read projections, queue endpoints, cross-table reports → raw SQL** via
+   `this.dataSource.query(...)` or `manager.query(...)` inside a transaction.
+
+Raw SQL is normal here, not a smell — the warehouse and scheduling modules are built on it.
+It carries one obligation:
+
+> **HARD RULE — validate every raw SQL statement against a real database before you ship it.**
+> A typo'd column name is a runtime 500 that no type-checker will catch. Run it through
+> `EXPLAIN` against the dev database. Column drift is real (see *Migrations*).
+
+Writes inside a transaction use `manager.getRepository(Entity)`, not the injected repository,
+so they join the caller's transaction.
+
+**Never do slow I/O inside a database transaction.** Queue the work and fan it out after
+commit. An SMS awaited inside a transaction once held capacity locks open for the whole
+gateway timeout. Any outbound HTTP call must set an explicit `timeout` — axios defaults to
+no timeout and will wait forever.
+
+### Migrations
+
+Migrations are the most dangerous surface in this repo. Two production-grade incidents have
+already come from it.
+
+- `migrationsRun: true` — **migrations run automatically on API boot**, with
+  `migrationsTransactionMode: 'each'`.
+- Consequences you must design for:
+  - Running several `nest start --watch` instances races `migrationsRun`. A non-idempotent
+    data migration can execute twice. Keep one instance.
+  - A watch-mode hot reload does **not** re-run migrations. If you add a column that new
+    code reads, apply it to the dev database yourself (idempotently) or fully restart.
+- **Give every migration a unique timestamp.** 34 timestamps are currently shared by two or
+  more migrations. TypeORM orders by timestamp and breaks ties non-deterministically. Before
+  adding one, check the filename prefix is unused *and* higher than the newest recorded row.
+- **Write idempotent DDL**: `ADD COLUMN IF NOT EXISTS`, `CREATE INDEX IF NOT EXISTS`, and
+  backfills guarded by `WHERE col IS NULL`.
+- **Never assume a recorded migration actually applied.** `AddGrnNumberToWarehouseInventory`
+  was recorded in `migrations` while its column was absent — it had been dropped out of band.
+  TypeORM will never re-run a recorded migration, so the fix is a *new repair migration*.
+- **A repair migration's `down()` should be a no-op.** Reverting a repair must not
+  re-introduce the outage it fixed.
+
+### Auth
+
+Auth **is implemented in this repo.** Do not add TODO stubs, and do not write your own.
+
+- `@CurrentUser()` (`@edr/api-common`) is a real `createParamDecorator`, not a metadata stub.
+- Route protection uses `@UseGuards(JwtGuard)` and `@UseGuards(PermissionGuard([...]))`.
+- Freight-domain checks use `hasFreightPermission(user, FREIGHT_PERMS.<area>.<action>)`.
+- Permissions are declared in `apps/edr-freight-api/src/seed/freight-permissions.registry.ts`.
+  Add a permission there before referencing it.
+- IAM has its own migrations, run ahead of freight migrations from the same data source, and
+  its own CLI scripts (`iam:migration:run`, `iam:seed:run`).
+
+Ownership checks are separate from permission checks. A staff user passes
+`hasFreightPermission`; a customer must additionally pass an ownership assertion such as
+`assertCustomerCanAccessBooking`. Do not drop the ownership check because the permission check passed.
+
+## Frontend conventions
+
+- The web apps use **Mantine v9**. Its APIs differ from v6/v7 — check the installed version
+  before copying a snippet.
+- `@edr/ui-common` holds shared components and theme; it is imported in ~94 files across the
+  freight web apps. Prefer it over re-implementing a component.
+- **Blob downloads need the async error decoder.** A request with `responseType: 'blob'`
+  delivers the JSON error body as a `Blob`, so the synchronous `extractErrorMessage` finds no
+  `.message` and degrades to `"Request failed with status code 400"`. Use
+  `await extractDownloadErrorMessage(error)` in every PDF/blob catch block. Mutation catches
+  keep the synchronous version — their bodies are already parsed JSON.
+- Server-side guards must be reflected in the UI. If the API will reject the action, the
+  button should be disabled, hidden, or explain the blocker — not fire and surface a 400.
+- Prefer disabling a control with a visible reason over silently hiding it.
+
+## Notifications
+
+In-app notifications resolve recipients from the company's **linked portal users**. If a
+company has none, `notify()` logs `0 recipients — skipped` and stores nothing, with no error.
+SMS and email still send, because they address the company's phone and email directly. Check
+this before debugging a "missing notification".
+
+## PDF generation
+
+Chromium is not installed in every environment. PDF paths must fall back to the hand-rolled
+generators (`styled-pdf.util.ts`, `buildFallbackPdf`, `buildTabularFallbackPdf`) rather than
+assume a headless browser exists.
+
+## Adding a new module to a NestJS app
+
+1. Create `modules/<feature>/` with `entities/`, `dto/`, and the four
+   `<feature>.{module,controller,service,repository}.ts` files.
+2. The entity extends `BaseEntity` from `@edr/api-common`.
+3. The repository extends `BaseRepository<Entity>` from `@edr/api-common`.
+4. The service injects the repository class (not `Repository<T>` directly).
+5. The controller uses `@ApiTags()` + `@ApiOperation()` for Swagger, and guards the route.
+6. Register the module in the app's `app.module.ts`.
+
+## Adding a new shared component to `@edr/ui-common`
+
+1. Create `src/components/<Name>/<Name>.tsx` and `src/components/<Name>/index.ts`.
+2. Export from `src/index.ts`.
+3. Component is a functional component with a `ComponentNameProps` interface
+   (named-exported alongside the default).
+
+## Definition of done
+
+A change is done when **all** of these hold. State explicitly which you ran.
+
+1. **It type-checks.** `pnpm turbo type-check --filter=<each touched package>` passes.
+   If you edited `packages/types`, you ran `pnpm turbo build --filter=@edr/types` first.
+2. **Raw SQL is verified.** Every new or edited SQL statement ran under `EXPLAIN` against the
+   dev database without error.
+3. **Migrations are safe.** Unique timestamp, idempotent DDL, and — if the migration adds
+   something the new code reads — applied to the dev database, since watch mode will not run it.
+4. **No new test failures.** `pnpm test` for `@edr/freight-api` is **currently red on `dev`**,
+   so a fully green suite is not the bar. Run the specs covering what you touched and confirm
+   you introduced no new failure.
+5. **Lint and format are clean** for the files you touched. Git hooks do **not** run these
+   automatically (see below), so run them yourself.
+6. **The behaviour was actually observed**, not merely compiled — you drove the flow, hit the
+   endpoint, or ran the query. If you could not, say so plainly.
+7. **Report honestly.** If a check was skipped, tests failed, or a fix is unverified, say it in
+   the summary. Never describe unverified work as done.
+
+### Hooks do not run
+
+`commitlint.config.js` and a `lint-staged` config both exist, and husky's shims are installed
+at `.husky/_/`. But there are **no user hook scripts** (`.husky/pre-commit`,
+`.husky/commit-msg`), so husky's shim exits 0 and **neither lint-staged nor commitlint ever
+fire.** Nothing validates your commit message or formats your staged files. Run the checks by
+hand; do not assume the hook caught it.
+
+## Known traps
+
+| Trap | What happens | What to do |
+| --- | --- | --- |
+| Schema drift | A recorded migration's column is missing; queries and inserts 500 | Write a new repair migration; never edit the recorded one |
+| Duplicate migration timestamps | Non-deterministic ordering; a migration can be skipped | Pick a fresh, higher timestamp |
+| `@edr/types` not rebuilt | Consumers can't see your new field | `pnpm turbo build --filter=@edr/types` |
+| Slow I/O in a transaction | Locks held for the gateway timeout | Queue it; fan out after commit; always set an HTTP timeout |
+| Blob error bodies | Real 400 message replaced by "Request failed with status code 400" | `await extractDownloadErrorMessage(error)` |
+| Company with no portal user | In-app notification silently vanishes | Check portal users before debugging |
+| Watch-mode reload | New code, old schema → 500 | Apply the migration to the dev DB or restart fully |
+
+## Project skills
+
+Reusable workflows live in `.claude/skills/`. Use them instead of re-deriving the steps:
+
+| Skill | Use for |
+| --- | --- |
+| `edr-db` | Query / `EXPLAIN`-validate / inspect the remote dev DB (`node .claude/skills/edr-db/query.cjs …`). psql is not installed — this is the sanctioned path. Also carries the 400/500 diagnosis loop. |
+| `verify` | The definition-of-done runner: targeted type-check, `@edr/types` rebuild, SQL validation, migration checklist, honest test bar. Run before calling anything finished. |
+| `standup` | "What did I do today / this week" reports for tickets, grounded in `git log` — including the check that commit subjects match their contents. |
+
+## Working style
+
+- **Verify before asserting.** Read the code or query the database. Do not infer behaviour
+  from a filename.
+- **Investigate, then propose.** For anything risky or wide-reaching, present the plan and the
+  trade-off before changing files.
+- **Small, reviewable commits**, one logical change each, conventional message.
+- **Branch from `dev`; PRs target `dev`.**
+- When a finding turns out to be wrong, say so and retract it. A rejected finding is a result.
diff --git a/apps/edr-freight-api/src/app.module.ts b/apps/edr-freight-api/src/app.module.ts
index 9561a7b73..afb214137 100644
--- a/apps/edr-freight-api/src/app.module.ts
+++ b/apps/edr-freight-api/src/app.module.ts
@@ -41,6 +41,7 @@ import { NotificationsModule } from "./modules/notifications/notifications.modul
 import { NotificationInboxModule } from "./modules/notification-inbox/notification-inbox.module";
 import { FileUploadSettingsModule } from "./modules/file-upload-settings/file-upload-settings.module";
 import { DropdownSettingsModule } from "./modules/dropdown-settings/dropdown-settings.module";
+import { ContractTemplatesModule } from "./modules/contract-templates/contract-templates.module";
 import { OtpModule } from "./modules/otp/otp.module";
 import { RuleEngineModule } from "./modules/rule-engine/rule-engine.module";
 import { BackofficeModule } from "./modules/backoffice/backoffice.module";
@@ -158,6 +159,7 @@ import { LoggerMiddleware } from "./logger.middleware";
     NotificationInboxModule,
     FileUploadSettingsModule,
     DropdownSettingsModule,
+    ContractTemplatesModule,
     OtpModule,
     RuleEngineModule,
     BackofficeModule,
diff --git a/apps/edr-freight-api/src/contracts/contract-article.util.ts b/apps/edr-freight-api/src/contracts/contract-article.util.ts
new file mode 100644
index 000000000..5f0c86a6c
--- /dev/null
+++ b/apps/edr-freight-api/src/contracts/contract-article.util.ts
@@ -0,0 +1,63 @@
+import Handlebars from 'handlebars';
+
+/** One numbered clause of a dynamic article, with optional nested bullets. */
+export interface RenderedClause {
+  text: string;
+  bullets: string[];
+}
+
+/** A dynamic article ready for the Handlebars template. */
+export interface RenderedArticle {
+  number: number;
+  title: string;
+  /** Set (instead of clauses) when the body is a single plain paragraph. */
+  paragraph?: string;
+  clauses: RenderedClause[];
+}
+
+/**
+ * Parse a template article body into clauses. Format: one clause per line;
+ * lines prefixed with "- " become bullets nested under the preceding clause.
+ * A body that reduces to a single clause without bullets renders as a plain
+ * paragraph rather than a numbered list of one.
+ */
+export function parseArticleBody(body: string): Pick<RenderedArticle, 'paragraph' | 'clauses'> {
+  const lines = (body ?? '')
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0);
+
+  const clauses: RenderedClause[] = [];
+  for (const line of lines) {
+    if (line.startsWith('- ')) {
+      const bullet = line.slice(2).trim();
+      if (clauses.length === 0) {
+        clauses.push({ text: bullet, bullets: [] });
+      } else {
+        clauses[clauses.length - 1].bullets.push(bullet);
+      }
+    } else {
+      clauses.push({ text: line, bullets: [] });
+    }
+  }
+
+  if (clauses.length === 1 && clauses[0].bullets.length === 0) {
+    return { paragraph: clauses[0].text, clauses: [] };
+  }
+  return { clauses };
+}
+
+/**
+ * Interpolate Handlebars placeholders ({{client.companyName}}, {{contractDate}},
+ * …) inside admin-authored template text against the contract view model.
+ * Malformed placeholders must never break document generation — fall back to
+ * the raw text.
+ */
+export function interpolateTemplateText(text: string, context: unknown): string {
+  if (!text || !text.includes('{{')) return text ?? '';
+  try {
+    return Handlebars.compile(text)(context);
+  } catch {
+    return text;
+  }
+}
diff --git a/apps/edr-freight-api/src/contracts/contract-document-view-model.builder.ts b/apps/edr-freight-api/src/contracts/contract-document-view-model.builder.ts
index 05061ed9a..559415fd8 100644
--- a/apps/edr-freight-api/src/contracts/contract-document-view-model.builder.ts
+++ b/apps/edr-freight-api/src/contracts/contract-document-view-model.builder.ts
@@ -8,6 +8,7 @@ import {
   ContractSignerRole,
 } from '../modules/contracts/entities/contract-signature.entity';
 import { ContractPricingBreakdown } from '../modules/contracts/contract-pricing.service';
+import { ContractTemplatesService } from '../modules/contract-templates/contract-templates.service';
 import { ContractTemplateResolver } from './contract-template.resolver';
 import { getTemplateMeta } from './contract-template.registry';
 import { ContractViewModel } from './contract-view-model.builder';
@@ -74,6 +75,7 @@ export class ContractDocumentViewModelBuilder {
   constructor(
     private readonly contractsRepository: ContractsRepository,
     private readonly templateResolver: ContractTemplateResolver,
+    private readonly contractTemplates: ContractTemplatesService,
   ) {}
 
   async build(
@@ -86,7 +88,32 @@ export class ContractDocumentViewModelBuilder {
 
     const templateKey =
       contract.contractTemplateKey ?? this.templateResolver.resolve(this.toResolverInput(contract));
-    const template = getTemplateMeta(templateKey);
+    let template = getTemplateMeta(templateKey);
+
+    // Prefer the admin-editable DB template matching the contract's
+    // direction/freight pair; fall back to the code-defined generic layout
+    // when none is active.
+    const dynamicSource = await this.contractTemplates.findActiveForContract(
+      contract.tradeDirection,
+      contract.freightType,
+    );
+    const dynamicTemplate = dynamicSource
+      ? {
+          code: dynamicSource.code,
+          name: dynamicSource.name,
+          documentTitle: dynamicSource.documentTitle,
+          whereasClauses: dynamicSource.whereasClauses ?? [],
+          articles: dynamicSource.articles ?? [],
+        }
+      : undefined;
+    if (dynamicTemplate) {
+      template = {
+        ...template,
+        title: dynamicTemplate.name,
+        templateFile: 'edr-dynamic.hbs',
+      };
+    }
+
     const pricing = this.buildPricing(contract);
     const signatures = await this.loadSignatures(contractId);
 
@@ -139,6 +166,7 @@ export class ContractDocumentViewModelBuilder {
       hasContractDocument: hasContractFile,
       hasCustomerSignature: hasCustomer,
       hasStaffSignature: hasStaff,
+      dynamicTemplate,
     };
 
     return { contract, view };
diff --git a/apps/edr-freight-api/src/contracts/contract-dynamic-template.spec.ts b/apps/edr-freight-api/src/contracts/contract-dynamic-template.spec.ts
new file mode 100644
index 000000000..032030243
--- /dev/null
+++ b/apps/edr-freight-api/src/contracts/contract-dynamic-template.spec.ts
@@ -0,0 +1,151 @@
+import { parseArticleBody, interpolateTemplateText } from './contract-article.util';
+import { ContractRendererService } from './contract-renderer.service';
+import { getTemplateMeta } from './contract-template.registry';
+import type { ContractViewModel } from './contract-view-model.builder';
+
+describe('parseArticleBody', () => {
+  it('numbers each non-empty line as a clause', () => {
+    const parsed = parseArticleBody('First clause.\nSecond clause.\n\nThird clause.');
+    expect(parsed.paragraph).toBeUndefined();
+    expect(parsed.clauses.map((c) => c.text)).toEqual([
+      'First clause.',
+      'Second clause.',
+      'Third clause.',
+    ]);
+  });
+
+  it('nests "- " lines as bullets under the previous clause', () => {
+    const parsed = parseArticleBody('Rates are:\n- USD 10 per ton\n- USD 20 per wagon\nPayment in advance.');
+    expect(parsed.clauses).toHaveLength(2);
+    expect(parsed.clauses[0].bullets).toEqual(['USD 10 per ton', 'USD 20 per wagon']);
+    expect(parsed.clauses[1].text).toBe('Payment in advance.');
+  });
+
+  it('renders a single bare line as a paragraph', () => {
+    const parsed = parseArticleBody('This Agreement becomes effective when signed.');
+    expect(parsed.paragraph).toBe('This Agreement becomes effective when signed.');
+    expect(parsed.clauses).toEqual([]);
+  });
+});
+
+describe('interpolateTemplateText', () => {
+  it('fills placeholders from the view model', () => {
+    expect(
+      interpolateTemplateText('Valid until August 31, {{contractYear}}.', {
+        contractYear: 2026,
+      }),
+    ).toBe('Valid until August 31, 2026.');
+  });
+
+  it('falls back to raw text on malformed placeholders', () => {
+    expect(interpolateTemplateText('Broken {{#if}} tag', {})).toBe('Broken {{#if}} tag');
+  });
+});
+
+describe('dynamic template rendering (edr-dynamic.hbs)', () => {
+  const renderer = new ContractRendererService();
+  renderer.onModuleInit();
+
+  function dynamicView(): ContractViewModel {
+    const meta = getTemplateMeta('IMP_BULK_USD_FORWARDING');
+    return {
+      bookingId: 'test-id',
+      reference: 'EDR/CT/2026/0042',
+      status: 'CONTRACT_READY',
+      templateKey: 'IMP_BULK_USD_FORWARDING',
+      template: { ...meta, title: 'Bulk Import Contract', templateFile: 'edr-dynamic.hbs' },
+      contractDate: '1 January 2026',
+      contractYear: 2026,
+      client: {
+        companyName: 'Abyssinia Trading PLC',
+        companyAddress: 'Bole Sub-city, Addis Ababa',
+        companyLocation: 'Ethiopia',
+        phone: '+251900000000',
+        email: 'test@example.com',
+        tinNumber: '1234567890',
+        vatNumber: 'VAT-001',
+        fanNumber: 'FAN-001',
+        businessLicense: 'BL-001',
+      },
+      provider: {
+        name: 'Ethio-Djibouti Standard Gauge Railway Share Company',
+        address: 'Nifas Silk Lafto Sub City, Addis Ababa, Ethiopia',
+        phone: '+251 11 872 0000',
+        email: 'info@edr.gov.et',
+        tinNumber: '—',
+      },
+      schedule: {
+        originLabel: 'Nagad',
+        destinationLabel: 'Galaan Multipurpose Port',
+        tradeDirection: 'IMPORT',
+        freightType: 'BULK',
+        serviceType: 'Rail + clearance',
+        scheduledDate: '—',
+        contractType: 'GENERAL',
+        cargoDescription: 'Steel billets',
+        totalWeightVgm: '—',
+        equipmentReturn: '—',
+        hazardousLabel: 'No',
+        firstMilePickupAddress: '—',
+        lastMileDeliveryAddress: '—',
+      },
+      pricing: {
+        displayMode: 'UNIT_RATES',
+        unitRates: [
+          { label: 'Rail transport', unitPrice: 59.4, unit: 'ton', currency: 'USD' },
+        ],
+        currency: 'USD',
+        equipmentReturn: '—',
+        originLabel: 'Nagad',
+        destinationLabel: 'Galaan Multipurpose Port',
+      } as unknown as ContractViewModel['pricing'],
+      signatures: [],
+      canSignCustomer: false,
+      canSignStaff: false,
+      hasContractDocument: false,
+      hasCustomerSignature: false,
+      hasStaffSignature: false,
+      dynamicTemplate: {
+        code: 'IMPORT_BULK',
+        name: 'Bulk Import Contract',
+        documentTitle: 'Bulk Cargo Transportation and Customs Clearance Services',
+        whereasClauses: ['The Client has agreed to engage the Service Provider.'],
+        articles: [
+          {
+            id: 'objective',
+            title: 'Objective of the Services',
+            body: 'Integrated logistics services including:\n- Rail transport to GMP\n- Customs clearance',
+            order: 1,
+          },
+          {
+            id: 'duration',
+            title: 'Duration',
+            body: 'Valid until August 31, {{contractYear}}.',
+            order: 2,
+          },
+        ],
+      },
+    };
+  }
+
+  it('renders numbered dynamic articles with bullets and interpolation', () => {
+    const html = renderer.render(dynamicView());
+    expect(html).toContain('Bulk Cargo Transportation and Customs Clearance Services');
+    expect(html).toContain('Article 1');
+    expect(html).toContain('Objective of the Services');
+    expect(html).toContain('Rail transport to GMP');
+    expect(html).toContain('Valid until August 31, 2026.');
+    expect(html).toContain('Abyssinia Trading PLC');
+    expect(html).toContain('Annex A — Commercial Schedule');
+    // Greenish theme marker from styles.hbs
+    expect(html).toContain('#1b9e7a');
+  });
+
+  it('keeps the generic layout when no dynamic template is attached', () => {
+    const view = dynamicView();
+    delete view.dynamicTemplate;
+    view.template = getTemplateMeta('IMP_BULK_USD_FORWARDING');
+    const html = renderer.render(view);
+    expect(html).toContain('Article 5: Contract Price');
+  });
+});
diff --git a/apps/edr-freight-api/src/contracts/contract-renderer.service.ts b/apps/edr-freight-api/src/contracts/contract-renderer.service.ts
index dd539df25..7b3301c87 100644
--- a/apps/edr-freight-api/src/contracts/contract-renderer.service.ts
+++ b/apps/edr-freight-api/src/contracts/contract-renderer.service.ts
@@ -3,6 +3,11 @@ import * as fs from 'fs';
 import * as path from 'path';
 import Handlebars from 'handlebars';
 
+import {
+  interpolateTemplateText,
+  parseArticleBody,
+  RenderedArticle,
+} from './contract-article.util';
 import { ContractViewModel } from './contract-view-model.builder';
 
 @Injectable()
@@ -31,9 +36,40 @@ export class ContractRendererService implements OnModuleInit {
     return template({
       ...view,
       paymentArticle: view.pricing.currency === 'ETB' ? 'ETB' : 'USD',
+      ...this.buildDynamicSections(view),
     });
   }
 
+  /**
+   * Turn the DB-backed dynamic template (when present) into render-ready data:
+   * interpolate placeholders against the view model, then parse each article
+   * body into numbered clauses with nested bullets.
+   */
+  private buildDynamicSections(view: ContractViewModel): {
+    dynamicDocumentTitle?: string;
+    dynamicWhereas?: string[];
+    dynamicArticles?: RenderedArticle[];
+  } {
+    const dyn = view.dynamicTemplate;
+    if (!dyn || dyn.articles.length === 0) return {};
+
+    const articles = [...dyn.articles]
+      .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
+      .map((article, index) => ({
+        number: index + 1,
+        title: interpolateTemplateText(article.title, view),
+        ...parseArticleBody(interpolateTemplateText(article.body, view)),
+      }));
+
+    return {
+      dynamicDocumentTitle: interpolateTemplateText(dyn.documentTitle, view),
+      dynamicWhereas: dyn.whereasClauses.map((clause) =>
+        interpolateTemplateText(clause, view),
+      ),
+      dynamicArticles: articles,
+    };
+  }
+
   private getCompiled(fileName: string): Handlebars.TemplateDelegate {
     const cached = this.compiled.get(fileName);
     if (cached) return cached;
diff --git a/apps/edr-freight-api/src/contracts/contract-view-model.builder.ts b/apps/edr-freight-api/src/contracts/contract-view-model.builder.ts
index 41a2f3b44..d90b8e709 100644
--- a/apps/edr-freight-api/src/contracts/contract-view-model.builder.ts
+++ b/apps/edr-freight-api/src/contracts/contract-view-model.builder.ts
@@ -17,6 +17,21 @@ export interface ContractSignatureView {
   signatureImageUrl?: string | null;
 }
 
+/**
+ * DB-backed contract template (freight.contract_templates) attached to the
+ * view model when an active template matches the contract's direction/freight
+ * pair. The renderer turns its articles into numbered clauses and switches to
+ * the dedicated edr-dynamic.hbs layout; absent, the legacy generic layout with
+ * code-defined clause packs is used.
+ */
+export interface ContractDynamicTemplateView {
+  code: string;
+  name: string;
+  documentTitle: string;
+  whereasClauses: string[];
+  articles: Array<{ id: string; title: string; body: string; order: number }>;
+}
+
 export interface ContractViewModel {
   bookingId: string;
   reference: string;
@@ -65,6 +80,7 @@ export interface ContractViewModel {
   hasContractDocument: boolean;
   hasCustomerSignature: boolean;
   hasStaffSignature: boolean;
+  dynamicTemplate?: ContractDynamicTemplateView;
 }
 
 @Injectable()
diff --git a/apps/edr-freight-api/src/contracts/templates/_partials/dynamic_articles.hbs b/apps/edr-freight-api/src/contracts/templates/_partials/dynamic_articles.hbs
new file mode 100644
index 000000000..717fbde8f
--- /dev/null
+++ b/apps/edr-freight-api/src/contracts/templates/_partials/dynamic_articles.hbs
@@ -0,0 +1,23 @@
+{{#each dynamicArticles}}
+<section class="article">
+  <h2 class="article-heading"><span class="article-no">Article {{number}}</span><span class="article-name">{{title}}</span></h2>
+  {{#if paragraph}}
+  <p class="article-paragraph">{{paragraph}}</p>
+  {{else}}
+  <ol class="clauses">
+    {{#each clauses}}
+    <li>
+      {{text}}
+      {{#if bullets.length}}
+      <ul class="clause-bullets">
+        {{#each bullets}}
+        <li>{{this}}</li>
+        {{/each}}
+      </ul>
+      {{/if}}
+    </li>
+    {{/each}}
+  </ol>
+  {{/if}}
+</section>
+{{/each}}
diff --git a/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs b/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs
index 43a5495ec..0207ff9fb 100644
--- a/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs
+++ b/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs
@@ -4,11 +4,11 @@
 
   body {
     margin: 0;
-    background: #f5f7fb;
-    color: #111827;
+    background: #f3f8f5;
+    color: #16241d;
     font-family: "Times New Roman", Times, serif;
     font-size: 10.5pt;
-    line-height: 1.48;
+    line-height: 1.5;
   }
 
   .contract {
@@ -21,25 +21,28 @@
 
   h1, h2, h3, p { margin-top: 0; }
   h1 {
-    color: #0f2742;
-    font-size: 18pt;
-    line-height: 1.25;
+    color: #0a3d2e;
+    font-size: 17pt;
+    letter-spacing: 0.02em;
+    line-height: 1.3;
     margin-bottom: 10px;
     text-align: center;
     text-transform: uppercase;
   }
   h2 {
-    border-bottom: 1.5px solid #1e3a5f;
-    color: #1e3a5f;
-    font-size: 12pt;
-    letter-spacing: 0.03em;
-    margin: 18px 0 10px;
+    border-bottom: 1.5px solid #1b9e7a;
+    color: #0e5b45;
+    font-family: Arial, sans-serif;
+    font-size: 11.5pt;
+    letter-spacing: 0.04em;
+    margin: 20px 0 10px;
     padding-bottom: 5px;
     text-transform: uppercase;
   }
   h3 {
-    color: #0f2742;
-    font-size: 10.8pt;
+    color: #0a3d2e;
+    font-family: Arial, sans-serif;
+    font-size: 10.5pt;
     margin: 12px 0 6px;
   }
   p { margin-bottom: 8px; }
@@ -52,16 +55,17 @@
     page-break-inside: avoid;
   }
 
+  /* ── Brand header ─────────────────────────────────────────────────────── */
   .brand-row {
     align-items: center;
-    border-bottom: 3px solid #1e3a5f;
+    border-bottom: 3px double #1b9e7a;
     display: flex;
     gap: 14px;
     padding-bottom: 14px;
   }
   .logo-mark {
     align-items: center;
-    background: #1e3a5f;
+    background: linear-gradient(135deg, #0e5b45 0%, #1b9e7a 100%);
     border-radius: 8px;
     color: #fff;
     display: flex;
@@ -74,7 +78,7 @@
     width: 72px;
   }
   .kicker {
-    color: #1e3a5f;
+    color: #0e5b45;
     font-family: Arial, sans-serif;
     font-size: 10pt;
     font-weight: 700;
@@ -83,36 +87,74 @@
     text-transform: uppercase;
   }
   .muted {
-    color: #6b7280;
+    color: #5c6f66;
     font-family: Arial, sans-serif;
     font-size: 9pt;
     margin: 0;
   }
+  .muted-note {
+    color: #5c6f66;
+    font-size: 9.5pt;
+  }
 
+  /* ── Cover page ───────────────────────────────────────────────────────── */
   .cover {
+    display: flex;
+    flex-direction: column;
     min-height: 255mm;
     position: relative;
   }
   .cover-title {
-    margin: 54mm 0 34mm;
+    margin: 34mm 0 22mm;
     text-align: center;
   }
+  .cover-rule {
+    background: #1b9e7a;
+    height: 2px;
+    margin: 14px auto;
+    width: 46mm;
+  }
   .document-label {
-    color: #6b7280;
+    color: #1b9e7a;
     font-family: Arial, sans-serif;
-    font-size: 10pt;
+    font-size: 11pt;
     font-weight: 700;
-    letter-spacing: 0.12em;
-    margin-bottom: 10px;
+    letter-spacing: 0.18em;
+    margin-bottom: 6px;
     text-transform: uppercase;
   }
+  .cover-for,
+  .cover-between {
+    color: #5c6f66;
+    font-family: Arial, sans-serif;
+    font-size: 9.5pt;
+    font-style: italic;
+    margin: 10px 0 6px;
+  }
+  .cover-party {
+    color: #0a3d2e;
+    font-family: Arial, sans-serif;
+    font-size: 12pt;
+    font-weight: 700;
+    margin: 4px 0;
+  }
   .summary-line {
-    color: #374151;
+    color: #38493f;
     font-family: Arial, sans-serif;
     font-size: 9.5pt;
     margin-top: 12px;
   }
+  .cover-year {
+    color: #0e5b45;
+    font-family: Arial, sans-serif;
+    font-size: 13pt;
+    font-weight: 700;
+    letter-spacing: 0.1em;
+    margin-top: auto;
+    text-align: right;
+  }
 
+  /* ── Tables ───────────────────────────────────────────────────────────── */
   table {
     border-collapse: collapse;
     width: 100%;
@@ -129,7 +171,7 @@
   .details-table td,
   .schedule th,
   .schedule td {
-    border: 1px solid #cbd5e1;
+    border: 1px solid #c9e4d9;
     padding: 7px 8px;
     text-align: left;
     vertical-align: top;
@@ -137,35 +179,46 @@
   .meta-grid th,
   .details-table th,
   .schedule th {
-    background: #eef4fb;
-    color: #1e3a5f;
+    background: #e9f6f0;
+    color: #0e5b45;
     font-family: Arial, sans-serif;
     font-size: 8.5pt;
     text-transform: uppercase;
   }
-  .schedule tbody tr:nth-child(even) td { background: #f8fafc; }
+  .schedule tbody tr:nth-child(even) td { background: #f5faf8; }
   .total-row td {
-    background: #e8f0f8 !important;
-    color: #0f2742;
+    background: #ddf2e9 !important;
+    color: #0a3d2e;
     font-weight: 700;
   }
 
+  /* ── Parties ──────────────────────────────────────────────────────────── */
   .lead {
-    color: #374151;
+    color: #38493f;
     font-size: 10.5pt;
   }
+  .between-label {
+    color: #0e5b45;
+    font-family: Arial, sans-serif;
+    font-size: 9.5pt;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+    margin: 10px 0 4px;
+    text-transform: uppercase;
+  }
   .party-grid {
     display: grid;
     gap: 12px;
     grid-template-columns: 1fr 1fr;
+    margin-top: 12px;
   }
   .party-card {
-    border: 1px solid #cbd5e1;
+    border: 1px solid #c9e4d9;
     border-radius: 8px;
     padding: 12px;
   }
   .party-card h3 {
-    background: #1e3a5f;
+    background: #0e5b45;
     border-radius: 5px;
     color: #fff;
     font-family: Arial, sans-serif;
@@ -175,7 +228,7 @@
     text-transform: uppercase;
   }
   .party-name {
-    color: #0f2742;
+    color: #0a3d2e;
     font-weight: 700;
     margin-bottom: 8px;
   }
@@ -185,7 +238,7 @@
     margin: 0;
   }
   dt {
-    color: #475569;
+    color: #47594f;
     font-family: Arial, sans-serif;
     font-size: 8.5pt;
     font-weight: 700;
@@ -196,6 +249,81 @@
     padding: 2px 0;
   }
 
+  /* ── Recitals ─────────────────────────────────────────────────────────── */
+  .whereas-label {
+    color: #0e5b45;
+    font-family: Arial, sans-serif;
+    font-size: 9pt;
+    font-weight: 700;
+    letter-spacing: 0.06em;
+    text-transform: uppercase;
+  }
+  .now-therefore {
+    color: #0a3d2e;
+    font-weight: 700;
+    margin-top: 10px;
+  }
+
+  /* ── Dynamic articles ─────────────────────────────────────────────────── */
+  .article-heading {
+    align-items: baseline;
+    display: flex;
+    gap: 10px;
+  }
+  .article-no {
+    color: #1b9e7a;
+    font-family: Arial, sans-serif;
+    font-size: 9.5pt;
+    font-weight: 700;
+    letter-spacing: 0.06em;
+    text-transform: uppercase;
+    white-space: nowrap;
+  }
+  .article-name { color: #0e5b45; }
+  .article-paragraph { margin: 4px 0 0; }
+  ol.clauses {
+    counter-reset: clause;
+    list-style: none;
+    margin: 6px 0 0;
+    padding-left: 0;
+  }
+  ol.clauses > li {
+    counter-increment: clause;
+    margin-bottom: 6px;
+    padding-left: 24px;
+    position: relative;
+    text-align: justify;
+  }
+  ol.clauses > li::before {
+    color: #0e5b45;
+    content: counter(clause) ".";
+    font-family: Arial, sans-serif;
+    font-size: 9.5pt;
+    font-weight: 700;
+    left: 0;
+    position: absolute;
+    top: 1px;
+  }
+  ul.clause-bullets {
+    margin: 5px 0 2px;
+    padding-left: 16px;
+  }
+  ul.clause-bullets > li {
+    list-style: none;
+    margin-bottom: 3px;
+    padding-left: 12px;
+    position: relative;
+  }
+  ul.clause-bullets > li::before {
+    color: #1b9e7a;
+    content: "▪";
+    font-size: 8pt;
+    left: 0;
+    position: absolute;
+    top: 1px;
+  }
+
+  /* ── Signatures ───────────────────────────────────────────────────────── */
   .signatures {
     display: grid;
     gap: 18px;
@@ -204,13 +332,13 @@
     page-break-inside: avoid;
   }
   .sig-block {
-    border: 1.5px solid #1e3a5f;
+    border: 1.5px solid #1b9e7a;
     border-radius: 8px;
     min-height: 96mm;
     padding: 12px;
   }
   .sig-title {
-    color: #1e3a5f;
+    color: #0e5b45;
     font-family: Arial, sans-serif;
     font-size: 9pt;
     font-weight: 700;
@@ -219,7 +347,7 @@
   }
   .sig-image-box {
     align-items: center;
-    border: 1px dashed #94a3b8;
+    border: 1px dashed #7fbfa9;
     display: flex;
     height: 28mm;
     justify-content: center;
@@ -231,21 +359,40 @@
     max-width: 70mm;
   }
   .sig-placeholder {
-    color: #94a3b8;
+    color: #7fbfa9;
     font-family: Arial, sans-serif;
     font-size: 8.5pt;
   }
   .sig-line {
-    border-top: 1px solid #111827;
+    border-top: 1px solid #16241d;
     margin-top: 16px;
     padding-top: 5px;
   }
   .sig-meta {
-    color: #475569;
+    color: #47594f;
     font-size: 9pt;
     margin: 4px 0;
   }
 
+  /* ── Witnesses ────────────────────────────────────────────────────────── */
+  .witnesses { margin-top: 20px; }
+  .witness-table {
+    font-size: 9.5pt;
+    margin-top: 6px;
+  }
+  .witness-table th,
+  .witness-table td {
+    border-bottom: 1px solid #c9e4d9;
+    padding: 9px 8px;
+    text-align: left;
+  }
+  .witness-table th {
+    color: #0e5b45;
+    font-family: Arial, sans-serif;
+    font-size: 8.5pt;
+    text-transform: uppercase;
+  }
+
   @media print {
     body { background: #fff; }
     .contract {
diff --git a/apps/edr-freight-api/src/contracts/templates/edr-dynamic.hbs b/apps/edr-freight-api/src/contracts/templates/edr-dynamic.hbs
new file mode 100644
index 000000000..4ba35ea3b
--- /dev/null
+++ b/apps/edr-freight-api/src/contracts/templates/edr-dynamic.hbs
@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title>{{dynamicDocumentTitle}} — {{reference}}</title>
+  {{> styles}}
+</head>
+<body>
+  <main class="contract">
+
+    {{!-- ─────────────────────────── Cover page ─────────────────────────── --}}
+    <section class="cover page-section">
+      <div class="brand-row">
+        <div class="logo-mark">EDR</div>
+        <div>
+          <p class="kicker">Ethio-Djibouti Standard Gauge Railway Share Company</p>
+          <p class="muted">Freight Transport Services</p>
+        </div>
+      </div>
+
+      <div class="cover-title">
+        <p class="document-label">Contract Agreement</p>
+        <div class="cover-rule"></div>
+        <p class="cover-for">for</p>
+        <h1>{{dynamicDocumentTitle}}</h1>
+        <p class="cover-between">between</p>
+        <p class="cover-party">Ethio-Djibouti Standard Gauge Railway Share Company</p>
+        <p class="cover-between">and</p>
+        <p class="cover-party">{{client.companyName}}</p>
+        <div class="cover-rule"></div>
+      </div>
+
+      <table class="meta-grid">
+        <tr>
+          <th>Contract Ref No.</th>
+          <td>{{reference}}</td>
+          <th>Contract Date</th>
+          <td>{{contractDate}}</td>
+        </tr>
+        <tr>
+          <th>Trade Direction</th>
+          <td>{{schedule.tradeDirection}}</td>
+          <th>Freight Type</th>
+          <td>{{schedule.freightType}}</td>
+        </tr>
+      </table>
+
+      <p class="cover-year">{{contractYear}}</p>
+    </section>
+
+    {{!-- ──────────────────────────── Preamble ──────────────────────────── --}}
+    <section class="page-section">
+      <h2>Parties to the Agreement</h2>
+      <p class="lead">
+        This Contract Agreement is made on <strong>{{contractDate}}</strong>.
+      </p>
+      <p class="between-label">Between</p>
+      <p>
+        <strong>Ethio-Djibouti Standard Gauge Railway Share Company (EDR)</strong>, a share company
+        incorporated under the laws of the Federal Democratic Republic of Ethiopia (FDRE), having its
+        principal place of business at {{provider.address}} (hereinafter referred to as the
+        <strong>"Service Provider"</strong>);
+      </p>
+      <p class="between-label">And</p>
+      <p>
+        <strong>{{client.companyName}}</strong>, an organization incorporated under the laws of the
+        Federal Democratic Republic of Ethiopia (FDRE), having its principal place of business at
+        {{client.companyAddress}} (hereinafter referred to as the <strong>"Client"</strong>).
+      </p>
+
+      <div class="party-grid">
+        <div class="party-card">
+          <h3>Service Provider</h3>
+          <p class="party-name">{{provider.name}}</p>
+          <dl>
+            <dt>Address</dt><dd>{{provider.address}}</dd>
+            <dt>Phone</dt><dd>{{provider.phone}}</dd>
+            <dt>Email</dt><dd>{{provider.email}}</dd>
+            <dt>TIN</dt><dd>{{provider.tinNumber}}</dd>
+          </dl>
+        </div>
+        <div class="party-card">
+          <h3>Client</h3>
+          <p class="party-name">{{client.companyName}}</p>
+          <dl>
+            <dt>Address</dt><dd>{{client.companyAddress}}</dd>
+            <dt>Location</dt><dd>{{client.companyLocation}}</dd>
+            <dt>Phone</dt><dd>{{client.phone}}</dd>
+            <dt>Email</dt><dd>{{client.email}}</dd>
+            <dt>TIN</dt><dd>{{client.tinNumber}}</dd>
+            <dt>VAT</dt><dd>{{client.vatNumber}}</dd>
+            <dt>Business license</dt><dd>{{client.businessLicense}}</dd>
+          </dl>
+        </div>
+      </div>
+    </section>
+
+    {{#if dynamicWhereas.length}}
+    <section class="page-section">
+      <h2>Recitals</h2>
+      {{#each dynamicWhereas}}
+      <p><span class="whereas-label">Whereas</span> {{this}}</p>
+      {{/each}}
+      <p class="now-therefore">Now, therefore, the parties agree as follows:</p>
+    </section>
+    {{/if}}
+
+    {{!-- ──────────────────────── Dynamic articles ──────────────────────── --}}
+    {{> dynamic_articles}}
+
+    {{!-- ─────────────────── Commercial schedule (annex) ─────────────────── --}}
+    <section class="page-section annex">
+      <h2>Annex A — Commercial Schedule</h2>
+      <table class="details-table">
+        <tbody>
+          <tr>
+            <th>Route</th>
+            <td>{{schedule.originLabel}} → {{schedule.destinationLabel}}</td>
+            <th>Service type</th>
+            <td>{{schedule.serviceType}}</td>
+          </tr>
+          <tr>
+            <th>Cargo</th>
+            <td>{{schedule.cargoDescription}}</td>
+            <th>Hazardous cargo</th>
+            <td>{{schedule.hazardousLabel}}</td>
+          </tr>
+          <tr>
+            <th>Equipment return</th>
+            <td>{{schedule.equipmentReturn}}</td>
+            <th>Payment currency</th>
+            <td>{{paymentArticle}}</td>
+          </tr>
+        </tbody>
+      </table>
+
+      {{#if pricing.unitRates.length}}
+      <h3>Agreed Unit Rates</h3>
+      <p class="muted-note">
+        The rates below are the frozen unit prices applicable to this contract. Quantities and resulting
+        totals are determined per shipment at booking time.
+      </p>
+      <table class="schedule">
+        <thead>
+          <tr><th>Item</th><th>Unit price</th></tr>
+        </thead>
+        <tbody>
+          {{#each pricing.unitRates}}
+          <tr>
+            <td>{{label}}</td>
+            <td>{{currency}} {{unitPrice}} / {{unit}}</td>
+          </tr>
+          {{/each}}
+        </tbody>
+      </table>
+      {{/if}}
+    </section>
+
+    {{!-- ────────────────────────── Signatures ───────────────────────────── --}}
+    <section class="page-section">
+      <h2>Execution</h2>
+      <p>
+        In witness whereof, the parties hereto have caused this contract to be signed in their respective
+        names as of the day and year first above written. The signatories confirm that they are fully
+        authorized to sign and execute this Contract Agreement.
+      </p>
+      {{> signatures_block}}
+
+      <div class="witnesses">
+        <p class="sig-title">Witnesses</p>
+        <table class="witness-table">
+          <thead>
+            <tr><th></th><th>Name</th><th>Signature</th><th>Date</th></tr>
+          </thead>
+          <tbody>
+            <tr><td>1.</td><td></td><td></td><td></td></tr>
+            <tr><td>2.</td><td></td><td></td><td></td></tr>
+          </tbody>
+        </table>
+      </div>
+    </section>
+  </main>
+</body>
+</html>
diff --git a/apps/edr-freight-api/src/migrations/2080000000000-DropWagonSpecColumns.ts b/apps/edr-freight-api/src/migrations/2080000000000-DropWagonSpecColumns.ts
new file mode 100644
index 000000000..0fe3569f4
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2080000000000-DropWagonSpecColumns.ts
@@ -0,0 +1,53 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Wagon spec belongs to the wagon TYPE, not to each physical wagon.
+ *
+ * `wagons.tare_weight` and `wagons.max_payload_weight` duplicated
+ * `wagon_types.tare_weight_tons` / `wagon_types.capacity_tons` on all 1100 rows,
+ * with nothing keeping them in step. They had drifted completely: every wagon
+ * disagreed with its type's tare (seeded ~20T against a real 22.4T NW5), and a
+ * third disagreed on payload (NW5 wagons claiming 22T–70T against a flat 70T).
+ * None of those numbers came from the railway.
+ *
+ * Nothing reads them for capacity — that math resolves tare and capacity through
+ * `wagon_type_id` — so dropping them removes a source of fiction rather than a
+ * source of truth. `wagon_type_id` is NOT NULL with no orphans, so the type is
+ * always reachable.
+ *
+ * A wagon re-tared after repair would need a nullable override column on
+ * `wagons` falling back to the type; deliberately not added, since no such
+ * per-wagon value exists today.
+ */
+export class DropWagonSpecColumns2080000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.wagons
+        DROP COLUMN IF EXISTS tare_weight,
+        DROP COLUMN IF EXISTS max_payload_weight;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Re-add nullable, backfill from the owning type, then restore NOT NULL.
+    // The pre-drop values were drifted seed data and are not recoverable — the
+    // type's spec is what they should always have held.
+    await queryRunner.query(`
+      ALTER TABLE freight.wagons
+        ADD COLUMN IF NOT EXISTS tare_weight NUMERIC(10, 2),
+        ADD COLUMN IF NOT EXISTS max_payload_weight NUMERIC(10, 2);
+    `);
+    await queryRunner.query(`
+      UPDATE freight.wagons w
+         SET tare_weight = t.tare_weight_tons,
+             max_payload_weight = t.capacity_tons
+        FROM freight.wagon_types t
+       WHERE t.id = w.wagon_type_id;
+    `);
+    await queryRunner.query(`
+      ALTER TABLE freight.wagons
+        ALTER COLUMN tare_weight SET NOT NULL,
+        ALTER COLUMN max_payload_weight SET NOT NULL;
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2090000000000-CreateContractTemplates.ts b/apps/edr-freight-api/src/migrations/2090000000000-CreateContractTemplates.ts
new file mode 100644
index 000000000..a553319cc
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2090000000000-CreateContractTemplates.ts
@@ -0,0 +1,58 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+import { CONTRACT_TEMPLATE_DEFAULTS } from '../seed/data/contract-template-defaults';
+
+/**
+ * Creates freight.contract_templates — the six editable contract document
+ * templates (direction × freight type) whose dynamic articles drive the
+ * generated contract PDF — and seeds them from the EDR reference contract
+ * documents. Seeding is idempotent (ON CONFLICT (code) DO NOTHING) so admin
+ * edits are never overwritten by redeploys.
+ */
+export class CreateContractTemplates2090000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.contract_templates (
+        id              UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+        code            VARCHAR(40) NOT NULL,
+        name            VARCHAR(200) NOT NULL,
+        description     TEXT,
+        document_title  VARCHAR(300) NOT NULL,
+        whereas_clauses JSONB NOT NULL DEFAULT '[]',
+        articles        JSONB NOT NULL DEFAULT '[]',
+        is_active       BOOLEAN NOT NULL DEFAULT TRUE,
+        created_at      TIMESTAMPTZ NOT NULL DEFAULT now(),
+        updated_at      TIMESTAMPTZ NOT NULL DEFAULT now(),
+        deleted_at      TIMESTAMPTZ,
+        CONSTRAINT uq_contract_templates_code UNIQUE (code)
+      );
+    `);
+
+    for (const seed of CONTRACT_TEMPLATE_DEFAULTS) {
+      const articles = seed.articles.map((article, index) => ({
+        ...article,
+        order: index + 1,
+      }));
+      await queryRunner.query(
+        `
+        INSERT INTO freight.contract_templates
+          (code, name, description, document_title, whereas_clauses, articles)
+        VALUES ($1, $2, $3, $4, $5::jsonb, $6::jsonb)
+        ON CONFLICT (code) DO NOTHING;
+        `,
+        [
+          seed.code,
+          seed.name,
+          seed.description,
+          seed.documentTitle,
+          JSON.stringify(seed.whereasClauses),
+          JSON.stringify(articles),
+        ],
+      );
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.contract_templates;`);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2090000000000-RepairGrnNumberColumn.ts b/apps/edr-freight-api/src/migrations/2090000000000-RepairGrnNumberColumn.ts
new file mode 100644
index 000000000..aa2f998a2
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2090000000000-RepairGrnNumberColumn.ts
@@ -0,0 +1,55 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Repairs `freight.warehouse_inventory.grn_number`.
+ *
+ * AddGrnNumberToWarehouseInventory1828000000000 is recorded in `migrations` but
+ * the column is absent on at least one environment - it was added, then dropped
+ * out-of-band (a stray `synchronize: true`, same class of damage that
+ * RepairSynchronizeDrift1870000000000 already had to undo). Because TypeORM has
+ * the original recorded, it will never re-run it.
+ *
+ * Without the column, everything that reads or writes a GRN fails with
+ * `column ... grn_number does not exist`:
+ *   - bulkReceive()             -> INSERT names grn_number  (receive to warehouse)
+ *   - importQueueByStatuses()   -> Unloaded + Dispatch queues
+ *   - exportInventoryByStatus() -> Received / Ready-To-Load / Loaded tabs
+ *   - grnDocument()             -> GRN PDF
+ *
+ * Idempotent: a no-op on environments where the column survived.
+ */
+export class RepairGrnNumberColumn2090000000000 implements MigrationInterface {
+  name = 'RepairGrnNumberColumn2090000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.warehouse_inventory
+      ADD COLUMN IF NOT EXISTS grn_number VARCHAR(100) NULL
+    `);
+
+    // Recover the GRN for rows received before the column existed: it was also
+    // written into the receive note as "GRN Number: <value>".
+    await queryRunner.query(`
+      UPDATE freight.warehouse_inventory
+         SET grn_number = substring(notes FROM 'GRN Number: ([^\\n\\r]+)')
+       WHERE grn_number IS NULL
+         AND notes IS NOT NULL
+         AND notes ~ 'GRN Number: '
+    `);
+
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_warehouse_inventory_grn_number
+      ON freight.warehouse_inventory(grn_number)
+      WHERE grn_number IS NOT NULL
+    `);
+  }
+
+  /**
+   * Deliberately a no-op. Dropping the column is what broke these environments
+   * in the first place, and the original 1828 migration already owns its own
+   * down(). Reverting this repair must not re-introduce the outage.
+   */
+  public async down(): Promise<void> {
+    // intentionally empty
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/auth/customer-reset.controller.ts b/apps/edr-freight-api/src/modules/auth/customer-reset.controller.ts
new file mode 100644
index 000000000..2bf9f82fd
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/auth/customer-reset.controller.ts
@@ -0,0 +1,48 @@
+import {
+  Body,
+  Controller,
+  NotFoundException,
+  Param,
+  ParseUUIDPipe,
+  Post,
+} from "@nestjs/common";
+import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger";
+
+import { BookingStaff } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
+import { BackofficeResetPasswordDto } from "./dto/forgot-password.dto";
+import { CustomerResetService } from "./customer-reset.service";
+
+/**
+ * Staff-triggered password reset. The customer receives the code and sets their
+ * own password — staff never see or handle a credential.
+ */
+@ApiTags("backoffice")
+@Controller("backoffice/customers")
+@ApiBearerAuth()
+export class CustomerResetController {
+  constructor(private readonly customerResetService: CustomerResetService) {}
+
+  @Post(":companyId/reset-password")
+  @BookingStaff(FREIGHT_PERMS.customers.resetPassword)
+  @ApiOperation({
+    summary: "Send a password-reset code to a customer's primary contact",
+  })
+  async resetPassword(
+    @Param("companyId", ParseUUIDPipe) companyId: string,
+    @Body() dto: BackofficeResetPasswordDto,
+  ) {
+    const maskedTarget = await this.customerResetService.sendResetToCustomer(
+      companyId,
+      dto.channel,
+    );
+
+    if (!maskedTarget) {
+      throw new NotFoundException(
+        `No active primary contact with ${dto.channel === "email" ? "an email address" : "a phone number"} for this customer`,
+      );
+    }
+
+    return { channel: dto.channel, maskedTarget };
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/auth/customer-reset.service.ts b/apps/edr-freight-api/src/modules/auth/customer-reset.service.ts
new file mode 100644
index 000000000..4c8f67599
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/auth/customer-reset.service.ts
@@ -0,0 +1,59 @@
+import { Injectable, Logger } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { Repository } from "typeorm";
+
+import { ExternalProfile } from "../companies/entities/external-profile.entity";
+import { ResetChannel } from "./dto/forgot-password.dto";
+import { ForgotPasswordService } from "./forgot-password.service";
+
+@Injectable()
+export class CustomerResetService {
+  private readonly logger = new Logger(CustomerResetService.name);
+
+  constructor(
+    @InjectRepository(ExternalProfile)
+    private readonly externalProfileRepository: Repository<ExternalProfile>,
+    private readonly forgotPasswordService: ForgotPasswordService,
+  ) {}
+
+  /**
+   * Send a reset code to the company's primary contact. Returns the masked
+   * destination, or null when there is no eligible account for that channel.
+   *
+   * Unlike the public flow this reports failure honestly — the caller is an
+   * authenticated staff member, so there is nothing to enumerate.
+   */
+  async sendResetToCustomer(
+    companyId: string,
+    channel: ResetChannel,
+  ): Promise<string | null> {
+    const profile = await this.externalProfileRepository.findOne({
+      where: { companyId, isPrimaryContact: true },
+    });
+
+    if (!profile) {
+      this.logger.warn(`Company ${companyId} has no primary contact profile`);
+      return null;
+    }
+
+    // Resolve through the same active-account gate the public flow uses, so a
+    // suspended customer cannot be reactivated by a staff-triggered reset.
+    const user = await this.forgotPasswordService.resolveActiveUserById(
+      profile.userId,
+    );
+    if (!user) {
+      this.logger.warn(
+        `Primary contact ${profile.userId} of company ${companyId} is not an active account`,
+      );
+      return null;
+    }
+
+    const target = await this.forgotPasswordService.requestReset(user, channel);
+    if (!target) return null;
+
+    this.logger.log(
+      `Staff-triggered ${channel} reset sent to user ${user.id} (company ${companyId})`,
+    );
+    return this.forgotPasswordService.maskTarget(target);
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/auth/dto/forgot-password.dto.ts b/apps/edr-freight-api/src/modules/auth/dto/forgot-password.dto.ts
new file mode 100644
index 000000000..be2f9bdac
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/auth/dto/forgot-password.dto.ts
@@ -0,0 +1,35 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum, IsNotEmpty, IsString } from "class-validator";
+
+/** The channel the reset code is delivered over. */
+export enum ResetChannel {
+  Email = "email",
+  Phone = "phone",
+}
+
+export class ForgotPasswordRequestDto {
+  @ApiProperty({
+    description: "Email, username, or phone number of the account to reset",
+    example: "name@company.com",
+  })
+  @IsString()
+  @IsNotEmpty()
+  identifier!: string;
+
+  @ApiProperty({ enum: ResetChannel })
+  @IsEnum(ResetChannel)
+  channel!: ResetChannel;
+}
+
+export class ForgotPasswordVerifyDto extends ForgotPasswordRequestDto {
+  @ApiProperty({ description: "The 6-digit code sent to the chosen channel" })
+  @IsString()
+  @IsNotEmpty()
+  otp!: string;
+}
+
+export class BackofficeResetPasswordDto {
+  @ApiProperty({ enum: ResetChannel })
+  @IsEnum(ResetChannel)
+  channel!: ResetChannel;
+}
diff --git a/apps/edr-freight-api/src/modules/auth/forgot-password.controller.ts b/apps/edr-freight-api/src/modules/auth/forgot-password.controller.ts
new file mode 100644
index 000000000..da49982d2
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/auth/forgot-password.controller.ts
@@ -0,0 +1,69 @@
+import { Body, Controller, Logger, Post } from "@nestjs/common";
+import { ApiOperation, ApiTags } from "@nestjs/swagger";
+import { Public } from "@edr/api-common";
+
+import {
+  ForgotPasswordRequestDto,
+  ForgotPasswordVerifyDto,
+} from "./dto/forgot-password.dto";
+import { ForgotPasswordService, ResetTicket } from "./forgot-password.service";
+
+/**
+ * Freight-owned reset flow. IAM ships a `forgot-password` route, but it only
+ * ever SMSes a magic link (no email channel, and it needs `FE_BASE_URL`, which
+ * this API does not set). These routes drive freight's own email-or-phone OTP
+ * service instead, then hand back a ticket for IAM's public `set-password`.
+ */
+@ApiTags("auth")
+@Controller("auth")
+@Public()
+export class ForgotPasswordController {
+  private readonly logger = new Logger(ForgotPasswordController.name);
+
+  constructor(private readonly forgotPasswordService: ForgotPasswordService) {}
+
+  @Post("forgot-password/request")
+  @ApiOperation({
+    summary: "Send a password-reset code over email or SMS",
+    description:
+      "Always reports success. An unknown, inactive, or channel-less account is " +
+      "indistinguishable from a real one, so this cannot be used to enumerate accounts.",
+  })
+  async request(@Body() dto: ForgotPasswordRequestDto): Promise<{ success: true }> {
+    const user = await this.forgotPasswordService.resolveActiveUser(dto.identifier);
+
+    if (user) {
+      try {
+        await this.forgotPasswordService.requestReset(user, dto.channel);
+      } catch (error) {
+        // A delivery failure must not change the response shape either — log it
+        // and let the caller sit on the OTP screen.
+        this.logger.error(
+          `Reset code delivery failed for user ${user.id}: ${
+            error instanceof Error ? error.message : String(error)
+          }`,
+          error instanceof Error ? error.stack : undefined,
+        );
+      }
+    } else {
+      this.logger.log("Reset requested for an unknown or inactive account");
+    }
+
+    return { success: true };
+  }
+
+  @Post("forgot-password/verify")
+  @ApiOperation({
+    summary: "Exchange a valid reset code for a single-use set-password ticket",
+    description:
+      "The returned { userId, verificationCode } is the body for PATCH /api/auth/set-password, " +
+      "alongside the same identifier and the new password.",
+  })
+  verify(@Body() dto: ForgotPasswordVerifyDto): Promise<ResetTicket> {
+    return this.forgotPasswordService.verifyAndMintTicket(
+      dto.identifier,
+      dto.channel,
+      dto.otp,
+    );
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/auth/forgot-password.service.ts b/apps/edr-freight-api/src/modules/auth/forgot-password.service.ts
new file mode 100644
index 000000000..42dc723d5
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/auth/forgot-password.service.ts
@@ -0,0 +1,169 @@
+import { randomBytes } from "node:crypto";
+
+import { BadRequestException, Injectable, Logger } from "@nestjs/common";
+import { InjectDataSource, InjectRepository } from "@nestjs/typeorm";
+import { DataSource, Repository } from "typeorm";
+
+import { hashPassword } from "@tria-plc/api-common/utils/argon";
+import { EOtpType } from "@tria-plc/iamapi-common/enums/otp.enum";
+import { User } from "@tria-plc/iamapi-common/entities/iam/user/user.entity";
+import { UserVerification } from "@tria-plc/iamapi-common/entities/iam/user/user-verification.entity";
+
+import { OtpService, OtpTarget } from "../otp/otp.service";
+import { ResetChannel } from "./dto/forgot-password.dto";
+
+/**
+ * How long the reset ticket minted for `PATCH /api/auth/set-password` stays
+ * valid. The IAM `setPassword` handler enforces this via `expiresAt`.
+ */
+const RESET_TICKET_TTL_MS = 10 * 60 * 1000;
+
+/** How long the emailed/SMS'd OTP stays valid before it must be re-requested. */
+const RESET_OTP_TTL_MS = 10 * 60 * 1000;
+
+export interface ResetTicket {
+  userId: string;
+  verificationCode: string;
+}
+
+@Injectable()
+export class ForgotPasswordService {
+  private readonly logger = new Logger(ForgotPasswordService.name);
+
+  constructor(
+    @InjectRepository(User)
+    private readonly userRepository: Repository<User>,
+    @InjectDataSource()
+    private readonly dataSource: DataSource,
+    private readonly otpService: OtpService,
+  ) {}
+
+  /**
+   * Resolve an account that is actually eligible for a password reset.
+   *
+   * IAM's `set-password` handler flips `isActive: true` on the user as a side
+   * effect, so a reset on a deactivated account would silently resurrect it.
+   * Gating here — rather than at the set-password call — is what keeps that
+   * from being reachable. Mirrors IAM's own login lookup: match on any of
+   * email / username / phone, and require an active credential row.
+   */
+  async resolveActiveUser(identifier: string): Promise<User | null> {
+    const id = identifier.trim();
+    if (!id) return null;
+
+    return await this.activeUserQuery()
+      .andWhere(
+        "(LOWER(u.email) = LOWER(:id) OR u.username = :id OR u.phoneNumber = :id)",
+        { id },
+      )
+      .getOne();
+  }
+
+  /** Same eligibility gate as {@link resolveActiveUser}, keyed by IAM user id. */
+  async resolveActiveUserById(userId: string): Promise<User | null> {
+    if (!userId) return null;
+    return await this.activeUserQuery()
+      .andWhere("u.id = :userId", { userId })
+      .getOne();
+  }
+
+  /**
+   * Base query for accounts eligible to reset. `.where()` is claimed here so
+   * callers must use `.andWhere()` — TypeORM's `.where()` resets the clause,
+   * which would silently drop the `isActive` gate.
+   */
+  private activeUserQuery() {
+    return this.userRepository
+      .createQueryBuilder("u")
+      .innerJoin("u.userCredentials", "uc", "uc.isActive = true")
+      .where("u.isActive = true")
+      .orderBy("u.createdAt", "DESC");
+  }
+
+  /** The address the code goes to, taken from the account — never from input. */
+  private targetFor(user: User, channel: ResetChannel): OtpTarget | null {
+    if (channel === ResetChannel.Email) {
+      return user.email ? { email: user.email } : null;
+    }
+    return user.phoneNumber ? { phone: user.phoneNumber } : null;
+  }
+
+  /**
+   * Send a reset code to the account's own email/phone. Returns the target so
+   * authenticated (backoffice) callers can echo a masked version; unauthenticated
+   * callers must discard it.
+   *
+   * Note: `otp_verifications` keys rows by a unique phone/email, and `sendOtp`
+   * upserts. A reset request therefore overwrites any pending signup code for
+   * the same address — last code sent wins. That is the pre-existing behaviour
+   * between any two flows sharing this table.
+   */
+  async requestReset(
+    user: User,
+    channel: ResetChannel,
+  ): Promise<OtpTarget | null> {
+    const target = this.targetFor(user, channel);
+    if (!target) return null;
+
+    await this.otpService.sendOtp(target);
+    return target;
+  }
+
+  /**
+   * Prove possession of the OTP, then mint an IAM reset ticket the caller can
+   * spend on the public `PATCH /api/auth/set-password`.
+   *
+   * Minting a `UserVerification` row rather than writing `UserCredential`
+   * ourselves keeps IAM as the single owner of the password write path (old
+   * credential deactivation, argon hashing, changed-at bookkeeping).
+   */
+  async verifyAndMintTicket(
+    identifier: string,
+    channel: ResetChannel,
+    otp: string,
+  ): Promise<ResetTicket> {
+    const user = await this.resolveActiveUser(identifier);
+    const target = user && this.targetFor(user, channel);
+
+    if (!user?.id || !target) {
+      // Same shape as a wrong code: a caller probing for accounts learns nothing
+      // beyond what the request step already (deliberately) refuses to tell them.
+      throw new BadRequestException("Invalid verification code");
+    }
+
+    await this.otpService.verifyOtpForAction(target, otp, RESET_OTP_TTL_MS);
+
+    const code = randomBytes(24).toString("base64url");
+    const verificationCode = await hashPassword(code);
+    const userId = user.id;
+
+    await this.dataSource.transaction(async (manager) => {
+      const repo = manager.getRepository(UserVerification);
+      // Retire any outstanding codes so only the ticket we just minted can be
+      // spent — `findVerificationForPrimaryReset` reads the newest row.
+      await repo.update({ userId }, { isUsed: true });
+      await repo.insert({
+        userId,
+        otpType: EOtpType.RESET_PASSWORD,
+        verificationCode,
+        expiresAt: new Date(Date.now() + RESET_TICKET_TTL_MS),
+        isUsed: false,
+        attemptCount: 0,
+      });
+    });
+
+    this.logger.log(`Reset ticket minted for user ${userId}`);
+    return { userId, verificationCode: code };
+  }
+
+  /** `+251911234567` -> `+251•••••4567`; `ab@x.com` -> `a•@x.com`. */
+  maskTarget(target: OtpTarget): string {
+    if (target.email) {
+      const [local, domain] = target.email.split("@");
+      const head = local.slice(0, 1);
+      return `${head}${"•".repeat(Math.max(local.length - 1, 1))}@${domain}`;
+    }
+    const phone = target.phone ?? "";
+    return `${phone.slice(0, 4)}${"•".repeat(Math.max(phone.length - 8, 1))}${phone.slice(-4)}`;
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/auth/freight-auth.module.ts b/apps/edr-freight-api/src/modules/auth/freight-auth.module.ts
index 16fbeffda..6415cf4c1 100644
--- a/apps/edr-freight-api/src/modules/auth/freight-auth.module.ts
+++ b/apps/edr-freight-api/src/modules/auth/freight-auth.module.ts
@@ -2,15 +2,35 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { User } from '@tria-plc/iamapi-common/entities/iam/user/user.entity';
+import { UserVerification } from '@tria-plc/iamapi-common/entities/iam/user/user-verification.entity';
 
+import { ExternalProfile } from '../companies/entities/external-profile.entity';
+import { OtpModule } from '../otp/otp.module';
 import { CheckAvailabilityController } from './check-availability.controller';
 import { CheckAvailabilityService } from './check-availability.service';
+import { CustomerResetController } from './customer-reset.controller';
+import { CustomerResetService } from './customer-reset.service';
+import { ForgotPasswordController } from './forgot-password.controller';
+import { ForgotPasswordService } from './forgot-password.service';
 import { FreightMeController } from './freight-me.controller';
 import { FreightMeService } from './freight-me.service';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([User])],
-  controllers: [FreightMeController, CheckAvailabilityController],
-  providers: [FreightMeService, CheckAvailabilityService],
+  imports: [
+    TypeOrmModule.forFeature([User, UserVerification, ExternalProfile]),
+    OtpModule,
+  ],
+  controllers: [
+    FreightMeController,
+    CheckAvailabilityController,
+    ForgotPasswordController,
+    CustomerResetController,
+  ],
+  providers: [
+    FreightMeService,
+    CheckAvailabilityService,
+    ForgotPasswordService,
+    CustomerResetService,
+  ],
 })
 export class FreightAuthModule {}
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
index d63106c2b..00cf55e17 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
@@ -400,8 +400,18 @@ export class BookingPricingService {
    * 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> {
+  async computeSubmitPriorityScore(
+    booking: Booking,
+    totalWagonsOverride?: number,
+  ): Promise<number> {
     const evalInput = await this.buildEvalInputForBooking(booking);
+    // BULK bookings have no container lines, so buildEvalInputForBooking yields
+    // totalWagons = 0 and every wagon-range priority config misses. The batch
+    // engine derives a bulk booking's wagon footprint from tonnage vs. live
+    // wagon capacity and passes it here to score the booking properly.
+    if (totalWagonsOverride != null && totalWagonsOverride > 0) {
+      evalInput.totalWagons = totalWagonsOverride;
+    }
     const ruleResult = await this.ruleEngineService.evaluate(evalInput);
     return ruleResult.priorityScore;
   }
diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.repository.ts b/apps/edr-freight-api/src/modules/bookings/bookings.repository.ts
index 2fe45bd8a..46b40d212 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.repository.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.repository.ts
@@ -44,6 +44,11 @@ export interface BookingListFilterOptions {
   customsClearingEnabled?: boolean;
   createdFrom?: string;
   createdTo?: string;
+  scheduledFrom?: string;
+  scheduledTo?: string;
+  originYardId?: string;
+  destinationYardId?: string;
+  isGovernment?: 'true' | 'false';
   consolidationPaired?: string;
 }
 
@@ -546,6 +551,11 @@ export class BookingsRepository extends BaseRepository<Booking> {
     if (!statuses.length) return [];
     return this.repository.find({
       where: { status: In(statuses) },
+      relations: {
+        company: true,
+        originYard: true,
+        destinationYard: true,
+      },
       order: { createdAt: 'DESC' },
     });
   }
@@ -809,6 +819,32 @@ export class BookingsRepository extends BaseRepository<Booking> {
         createdTo: options.createdTo,
       });
     }
+    if (options.scheduledFrom) {
+      qb.andWhere('booking.scheduled_date >= :scheduledFrom', {
+        scheduledFrom: options.scheduledFrom,
+      });
+    }
+    if (options.scheduledTo) {
+      // Inclusive end-of-day: callers pass a date; include the whole day.
+      qb.andWhere('booking.scheduled_date <= :scheduledTo', {
+        scheduledTo: options.scheduledTo,
+      });
+    }
+    if (options.originYardId) {
+      qb.andWhere('booking.origin_yard_id = :originYardId', {
+        originYardId: options.originYardId,
+      });
+    }
+    if (options.destinationYardId) {
+      qb.andWhere('booking.destination_yard_id = :destinationYardId', {
+        destinationYardId: options.destinationYardId,
+      });
+    }
+    if (options.isGovernment === 'true') {
+      qb.andWhere('booking.is_government = TRUE');
+    } else if (options.isGovernment === 'false') {
+      qb.andWhere('booking.is_government = FALSE');
+    }
     if (options.tradeDirection) {
       qb.andWhere('booking.trade_direction = :tradeDirection', {
         tradeDirection: options.tradeDirection,
@@ -994,6 +1030,7 @@ export class BookingsRepository extends BaseRepository<Booking> {
       .leftJoinAndSelect('booking.company', 'company')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
       .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .leftJoin(TrainScheduleBooking, 'sb', 'sb.booking_id = booking.id')
       .where('booking.train_schedule_id = :scheduleId', { scheduleId })
       .andWhere('sb.id IS NULL')
@@ -1025,6 +1062,7 @@ export class BookingsRepository extends BaseRepository<Booking> {
       .leftJoinAndSelect('booking.company', 'company')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
       .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .leftJoin(TrainScheduleBooking, 'sb', 'sb.booking_id = booking.id')
       .where('booking.origin_yard_id = :originYardId', { originYardId })
       .andWhere('booking.destination_yard_id = :destinationYardId', {
@@ -1064,6 +1102,7 @@ export class BookingsRepository extends BaseRepository<Booking> {
       .leftJoinAndSelect('booking.company', 'company')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
       .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .leftJoin(TrainScheduleBooking, 'sb', 'sb.booking_id = booking.id')
       .where('booking.origin_yard_id IN (:...corridorYardIds)', { corridorYardIds })
       .andWhere('booking.destination_yard_id IN (:...corridorYardIds)', {
@@ -1129,6 +1168,7 @@ export class BookingsRepository extends BaseRepository<Booking> {
       .leftJoinAndSelect('booking.company', 'company')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
       .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .where('booking.train_schedule_id = :scheduleId', { scheduleId })
       .orderBy('booking.is_government', 'DESC')
       .addOrderBy('booking.priority_score', 'DESC')
@@ -1143,6 +1183,7 @@ export class BookingsRepository extends BaseRepository<Booking> {
       .leftJoinAndSelect('booking.company', 'company')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
       .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .where('booking.train_schedule_id = :scheduleId', { scheduleId })
       .andWhere(`booking.status IN ('SELECTED_FOR_BATCH', 'AWAITING_PAYMENT')`)
       .getMany();
@@ -1172,6 +1213,8 @@ export class BookingsRepository extends BaseRepository<Booking> {
     return this.repository
       .createQueryBuilder('booking')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
+      .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .innerJoin(
         TrainScheduleBooking,
         'sb',
diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.service.ts b/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
index 48a29988a..dac739fbf 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
@@ -1125,6 +1125,30 @@ export class BookingsService {
     );
   }
 
+  /**
+   * Batched version of the findById flag: marks each page item whose booking
+   * has a generated-but-unsigned SELF_HAUL handover, so list rows (portal
+   * dashboard) can show "Approve delivery" for exactly the generated→signed
+   * window. One query for the whole page.
+   */
+  private async attachHandoverFlags(bookings: Booking[]): Promise<void> {
+    const ids = bookings.map((b) => b.id);
+    if (!ids.length) return;
+    const rows: Array<{ bookingId: string }> = await this.dataSource.query(
+      `SELECT DISTINCT booking_id AS "bookingId"
+         FROM freight.booking_handovers
+        WHERE booking_id = ANY($1::uuid[])
+          AND signed_at IS NULL AND deleted_at IS NULL
+          AND mile_type = 'SELF_HAUL'`,
+      [ids],
+    );
+    const pending = new Set(rows.map((r) => r.bookingId));
+    for (const b of bookings) {
+      (b as Booking & { handoverAwaitingSignature?: boolean }).handoverAwaitingSignature =
+        pending.has(b.id);
+    }
+  }
+
   async findAll(
     filter: FilterBookingDto,
     forceCompanyId?: string,
@@ -1135,7 +1159,7 @@ export class BookingsService {
     const statusFilter = this.parseStatusFilter(filter);
     const schedulingStatusFilter = this.parseSchedulingStatusFilter(filter);
 
-    return this.bookingsRepository.findAllPaginated({
+    const result = await this.bookingsRepository.findAllPaginated({
       page,
       pageSize,
       ...statusFilter,
@@ -1158,10 +1182,17 @@ export class BookingsService {
       paymentStatus: filter.paymentStatus,
       createdFrom: filter.createdFrom,
       createdTo: filter.createdTo,
+      scheduledFrom: filter.scheduledFrom,
+      scheduledTo: filter.scheduledTo,
+      originYardId: filter.originYardId,
+      destinationYardId: filter.destinationYardId,
+      isGovernment: filter.isGovernment,
       consolidationPaired: filter.consolidationPaired,
       sortBy: filter.sortBy,
       sortOrder: filter.sortOrder,
     });
+    await this.attachHandoverFlags(result.items ?? []);
+    return result;
   }
 
   /** Booking statuses at which a customer can pay (mirrors booking-payment.service). */
@@ -1371,11 +1402,17 @@ export class BookingsService {
       serviceTypeId: filter.serviceTypeId,
       cargoTypeId: filter.cargoTypeId,
       freightType: filter.freightType,
+      bookingType: filter.bookingType,
       tradeDirection: filter.tradeDirection,
       paymentCurrency: filter.paymentCurrency,
       paymentStatus: filter.paymentStatus,
       createdFrom: filter.createdFrom,
       createdTo: filter.createdTo,
+      scheduledFrom: filter.scheduledFrom,
+      scheduledTo: filter.scheduledTo,
+      originYardId: filter.originYardId,
+      destinationYardId: filter.destinationYardId,
+      isGovernment: filter.isGovernment,
       consolidationPaired: filter.consolidationPaired,
     };
 
diff --git 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
index d189f5448..ae973b97d 100644
--- 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
@@ -81,6 +81,31 @@ export class FilterBookingDto {
   @IsDateString()
   createdTo?: string;
 
+  @ApiPropertyOptional({ description: 'Filter bookings scheduled on/after this date (ISO)' })
+  @IsOptional()
+  @IsDateString()
+  scheduledFrom?: string;
+
+  @ApiPropertyOptional({ description: 'Filter bookings scheduled on/before this date (ISO)' })
+  @IsOptional()
+  @IsDateString()
+  scheduledTo?: string;
+
+  @ApiPropertyOptional({ format: 'uuid', description: 'Filter by origin yard' })
+  @IsOptional()
+  @IsUUID()
+  originYardId?: string;
+
+  @ApiPropertyOptional({ format: 'uuid', description: 'Filter by destination yard' })
+  @IsOptional()
+  @IsUUID()
+  destinationYardId?: string;
+
+  @ApiPropertyOptional({ enum: ['true', 'false'], description: 'Filter government vs private bookings' })
+  @IsOptional()
+  @IsIn(['true', 'false'])
+  isGovernment?: 'true' | 'false';
+
   @ApiPropertyOptional({ enum: TRADE_DIRECTIONS })
   @IsOptional()
   @IsIn([...TRADE_DIRECTIONS])
diff --git a/apps/edr-freight-api/src/modules/companies/company-change-request.repository.spec.ts b/apps/edr-freight-api/src/modules/companies/company-change-request.repository.spec.ts
new file mode 100644
index 000000000..73271e0af
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/companies/company-change-request.repository.spec.ts
@@ -0,0 +1,88 @@
+import { Repository } from "typeorm";
+
+import { CompanyChangeRequestRepository } from "./company-change-request.repository";
+import {
+  ChangeRequestStatus,
+  CompanyChangeRequest,
+} from "./entities/company-change-request.entity";
+
+type Row = Pick<CompanyChangeRequest, "id" | "status"> & { createdAt: Date };
+
+const COMPANY_ID = "company-1";
+
+/**
+ * Stands in for the TypeORM repository over a fixed set of rows, honouring the
+ * `where.status` filter and the `createdAt DESC` ordering findOne relies on.
+ */
+function mockRepositoryOver(rows: Row[]) {
+  return {
+    findOne: jest.fn(
+      ({ where }: { where: Partial<Row> & { companyId: string } }) =>
+        Promise.resolve(
+          rows
+            .filter(
+              (row) =>
+                where.companyId === COMPANY_ID &&
+                (where.status === undefined || row.status === where.status),
+            )
+            .sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())[0] ??
+            null,
+        ),
+    ),
+  } as unknown as Repository<CompanyChangeRequest>;
+}
+
+function subject(rows: Row[]) {
+  return new CompanyChangeRequestRepository(mockRepositoryOver(rows));
+}
+
+describe("CompanyChangeRequestRepository.findLatestOpenByCompanyId", () => {
+  const rejected: Row = {
+    id: "rejected",
+    status: ChangeRequestStatus.Rejected,
+    createdAt: new Date("2026-01-01T00:00:00.000Z"),
+  };
+
+  it("returns the pending request when one is open", async () => {
+    const pending: Row = {
+      id: "pending",
+      status: ChangeRequestStatus.Pending,
+      createdAt: new Date("2026-01-02T00:00:00.000Z"),
+    };
+
+    const result = await subject([rejected, pending]).findLatestOpenByCompanyId(
+      COMPANY_ID,
+    );
+
+    expect(result?.id).toBe("pending");
+  });
+
+  it("returns the latest rejected request when nothing is pending", async () => {
+    const result = await subject([rejected]).findLatestOpenByCompanyId(
+      COMPANY_ID,
+    );
+
+    expect(result?.id).toBe("rejected");
+  });
+
+  it("returns null once a resubmit of a rejected request is approved", async () => {
+    const approved: Row = {
+      id: "approved",
+      status: ChangeRequestStatus.Approved,
+      createdAt: new Date("2026-01-02T00:00:00.000Z"),
+    };
+
+    const result = await subject([
+      rejected,
+      approved,
+    ]).findLatestOpenByCompanyId(COMPANY_ID);
+
+    expect(result).toBeNull();
+  });
+
+  it("returns null when the company has no requests", async () => {
+    const result = await subject([]).findLatestOpenByCompanyId(COMPANY_ID);
+
+    expect(result).toBeNull();
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/companies/company-change-request.repository.ts b/apps/edr-freight-api/src/modules/companies/company-change-request.repository.ts
index 24d988452..eb44d56cb 100644
--- a/apps/edr-freight-api/src/modules/companies/company-change-request.repository.ts
+++ b/apps/edr-freight-api/src/modules/companies/company-change-request.repository.ts
@@ -28,18 +28,23 @@ export class CompanyChangeRequestRepository extends BaseRepository<CompanyChange
 
   /**
    * The company's latest "open" request — pending (locks the customer) or the
-   * most recent rejected one (drives the reapply banner + prefill). Approved
-   * requests are terminal and ignored here.
+   * most recent rejected one (drives the reapply banner + prefill).
+   *
+   * Only the company's newest request may be open. A rejection is superseded the
+   * moment the customer resubmits: that resubmit opens a *new* request, so once
+   * it is approved the newest request is terminal and nothing is open — even
+   * though the older rejected row still sits in the table as history.
    */
   async findLatestOpenByCompanyId(
     companyId: string,
   ): Promise<CompanyChangeRequest | null> {
     const pending = await this.findPendingByCompanyId(companyId);
     if (pending) return pending;
-    return this.repository.findOne({
-      where: { companyId, status: ChangeRequestStatus.Rejected },
+    const latest = await this.repository.findOne({
+      where: { companyId },
       order: { createdAt: "DESC" },
     });
+    return latest?.status === ChangeRequestStatus.Rejected ? latest : null;
   }
 
   async findById(id: string): Promise<CompanyChangeRequest | null> {
diff --git a/apps/edr-freight-api/src/modules/companies/company-profile.repository.ts b/apps/edr-freight-api/src/modules/companies/company-profile.repository.ts
index 15aec5ac6..9bf14cd61 100644
--- a/apps/edr-freight-api/src/modules/companies/company-profile.repository.ts
+++ b/apps/edr-freight-api/src/modules/companies/company-profile.repository.ts
@@ -1,4 +1,4 @@
-import { Injectable } from "@nestjs/common";
+import { Injectable, InternalServerErrorException } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
 import { BaseRepository } from "@edr/api-common";
@@ -20,6 +20,11 @@ const PREFIX_MAP: Record<ProfileType, string> = {
   [ProfileType.transporter]: "TR",
 };
 
+const SERIES_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+/** Numbers per series letter: A00001..A99999, then B00001. */
+const SERIES_SIZE = 99_999;
+
 @Injectable()
 export class CompanyProfileRepository extends BaseRepository<CompanyProfile> {
   constructor(
@@ -38,9 +43,20 @@ export class CompanyProfileRepository extends BaseRepository<CompanyProfile> {
     const result = await this.repository.query(
       `SELECT nextval('${seqName}') AS next_id`,
     );
-    const nextId = result[0].next_id as number;
+    const nextId = Number(result[0].next_id);
+    const offset = nextId - 1;
+    const seriesIndex = Math.floor(offset / SERIES_SIZE);
+
+    if (seriesIndex >= SERIES_LETTERS.length) {
+      throw new InternalServerErrorException(
+        `Company profile reference series exhausted for type "${type}"`,
+      );
+    }
+
+    const letter = SERIES_LETTERS[seriesIndex];
+    const number = (offset % SERIES_SIZE) + 1;
     const prefix = PREFIX_MAP[type];
-    return `${prefix}-${String(nextId).padStart(5, "0")}`;
+    return `${prefix}-${letter}${String(number).padStart(5, "0")}`;
   }
 
   async findByCompanyId(companyId: string): Promise<CompanyProfile[]> {
diff --git a/apps/edr-freight-api/src/modules/companies/entities/company-profile.entity.ts b/apps/edr-freight-api/src/modules/companies/entities/company-profile.entity.ts
index 72696766f..2266b0c65 100644
--- a/apps/edr-freight-api/src/modules/companies/entities/company-profile.entity.ts
+++ b/apps/edr-freight-api/src/modules/companies/entities/company-profile.entity.ts
@@ -60,7 +60,7 @@ export class CompanyProfile extends BaseEntity {
   type!: ProfileType;
 
   /**
-   * Official profile reference (e.g. "EX-00001"). Minted only when the profile
+   * Official profile reference (e.g. "EX-A00001"). Minted only when the profile
    * is approved (status → Active); pending/unapproved profiles carry NULL.
    * The unique index tolerates this because Postgres treats NULLs as distinct.
    * API responses surface it as "" when absent — see ResponseCompanyProfileDto.
diff --git a/apps/edr-freight-api/src/modules/contract-templates/contract-templates.controller.ts b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.controller.ts
new file mode 100644
index 000000000..8cf1c5671
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.controller.ts
@@ -0,0 +1,97 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Patch,
+  Post,
+  Put,
+} from "@nestjs/common";
+import { ApiOperation, ApiTags } from "@nestjs/swagger";
+
+import { FreightAdmin } from "../../common/booking-guards";
+import { ContractTemplatesService } from "./contract-templates.service";
+import {
+  CreateArticleDto,
+  PreviewContractTemplateDto,
+  ReplaceArticlesDto,
+  UpdateArticleDto,
+  UpdateContractTemplateDto,
+} from "./dto/contract-template.dto";
+
+@ApiTags("contract-templates")
+@Controller("contract-templates")
+export class ContractTemplatesController {
+  constructor(private readonly service: ContractTemplatesService) {}
+
+  // Reads stay open to authenticated staff (the backoffice Templates tab);
+  // writes are admin-guarded like other freight configuration resources.
+
+  @Get()
+  @ApiOperation({ summary: "List the six contract document templates" })
+  list() {
+    return this.service.list();
+  }
+
+  @Get(":code")
+  @ApiOperation({ summary: "Get one contract template by code" })
+  getByCode(@Param("code") code: string) {
+    return this.service.getByCode(code);
+  }
+
+  @Patch(":code")
+  @FreightAdmin()
+  @ApiOperation({ summary: "Update template metadata (name, title, recitals, active flag)" })
+  update(@Param("code") code: string, @Body() dto: UpdateContractTemplateDto) {
+    return this.service.update(code, dto);
+  }
+
+  @Post(":code/preview")
+  @ApiOperation({
+    summary: "Render an HTML preview of the template against mock contract data",
+  })
+  preview(
+    @Param("code") code: string,
+    @Body() dto: PreviewContractTemplateDto,
+  ) {
+    return this.service.preview(code, dto);
+  }
+
+  /* ------------------------- article routes ------------------------- */
+
+  @Put(":code/articles")
+  @FreightAdmin()
+  @ApiOperation({ summary: "Replace the full ordered article list (used for reorder)" })
+  replaceArticles(@Param("code") code: string, @Body() dto: ReplaceArticlesDto) {
+    return this.service.replaceArticles(code, dto.articles);
+  }
+
+  @Post(":code/articles")
+  @FreightAdmin()
+  @ApiOperation({ summary: "Add an article to the template" })
+  addArticle(@Param("code") code: string, @Body() dto: CreateArticleDto) {
+    return this.service.addArticle(code, dto);
+  }
+
+  @Patch(":code/articles/:articleId")
+  @FreightAdmin()
+  @ApiOperation({ summary: "Update an article's title or body" })
+  updateArticle(
+    @Param("code") code: string,
+    @Param("articleId") articleId: string,
+    @Body() dto: UpdateArticleDto,
+  ) {
+    return this.service.updateArticle(code, articleId, dto);
+  }
+
+  @Delete(":code/articles/:articleId")
+  @FreightAdmin()
+  @ApiOperation({ summary: "Remove an article from the template" })
+  removeArticle(
+    @Param("code") code: string,
+    @Param("articleId") articleId: string,
+  ) {
+    return this.service.removeArticle(code, articleId);
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/contract-templates/contract-templates.module.ts b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.module.ts
new file mode 100644
index 000000000..d2a658ca8
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.module.ts
@@ -0,0 +1,21 @@
+import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+
+import { ContractRendererService } from "../../contracts/contract-renderer.service";
+import { ContractTemplatesController } from "./contract-templates.controller";
+import { ContractTemplatesRepository } from "./contract-templates.repository";
+import { ContractTemplatesService } from "./contract-templates.service";
+import { ContractTemplate } from "./entities/contract-template.entity";
+
+@Module({
+  imports: [TypeOrmModule.forFeature([ContractTemplate])],
+  controllers: [ContractTemplatesController],
+  providers: [
+    ContractTemplatesRepository,
+    ContractTemplatesService,
+    // Stateless Handlebars renderer reused from src/contracts for previews.
+    ContractRendererService,
+  ],
+  exports: [ContractTemplatesService],
+})
+export class ContractTemplatesModule {}
diff --git a/apps/edr-freight-api/src/modules/contract-templates/contract-templates.repository.ts b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.repository.ts
new file mode 100644
index 000000000..2f4fb0117
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.repository.ts
@@ -0,0 +1,31 @@
+import { BaseRepository } from "@edr/api-common";
+import { Injectable } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { Repository } from "typeorm";
+
+import {
+  ContractTemplate,
+  ContractTemplateCode,
+} from "./entities/contract-template.entity";
+
+@Injectable()
+export class ContractTemplatesRepository extends BaseRepository<ContractTemplate> {
+  constructor(
+    @InjectRepository(ContractTemplate)
+    repository: Repository<ContractTemplate>,
+  ) {
+    super(repository);
+  }
+
+  findByCode(code: ContractTemplateCode): Promise<ContractTemplate | null> {
+    return this.repository.findOne({ where: { code } });
+  }
+
+  override findAll(): Promise<ContractTemplate[]> {
+    return this.repository.find({ order: { code: "ASC" } });
+  }
+
+  async saveTemplate(template: ContractTemplate): Promise<ContractTemplate> {
+    return this.repository.save(template);
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/contract-templates/contract-templates.service.spec.ts b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.service.spec.ts
new file mode 100644
index 000000000..0478db102
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.service.spec.ts
@@ -0,0 +1,66 @@
+import { ContractRendererService } from "../../contracts/contract-renderer.service";
+import { CONTRACT_TEMPLATE_DEFAULTS } from "../../seed/data/contract-template-defaults";
+import { ContractTemplatesService } from "./contract-templates.service";
+import { ContractTemplatesRepository } from "./contract-templates.repository";
+import {
+  ContractTemplate,
+  contractTemplateCodeFor,
+} from "./entities/contract-template.entity";
+
+function seededTemplate(code: string): ContractTemplate {
+  const seed = CONTRACT_TEMPLATE_DEFAULTS.find((t) => t.code === code)!;
+  return {
+    id: "00000000-0000-0000-0000-000000000001",
+    code: seed.code,
+    name: seed.name,
+    description: seed.description,
+    documentTitle: seed.documentTitle,
+    whereasClauses: seed.whereasClauses,
+    articles: seed.articles.map((article, index) => ({ ...article, order: index + 1 })),
+    isActive: true,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    deletedAt: null,
+  } as ContractTemplate;
+}
+
+describe("contractTemplateCodeFor", () => {
+  it("maps every direction/freight pair to one of the six codes", () => {
+    expect(contractTemplateCodeFor("IMPORT", "BULK")).toBe("IMPORT_BULK");
+    expect(contractTemplateCodeFor("EXPORT", "CONTAINER")).toBe("EXPORT_CONTAINER");
+    expect(contractTemplateCodeFor("DOMESTIC", "CONTAINER")).toBe("INTERCITY_CONTAINER");
+    expect(contractTemplateCodeFor("DOMESTIC", "BULK")).toBe("INTERCITY_BULK");
+    expect(contractTemplateCodeFor(null, null)).toBe("INTERCITY_CONTAINER");
+  });
+});
+
+describe("ContractTemplatesService.preview", () => {
+  const renderer = new ContractRendererService();
+  renderer.onModuleInit();
+
+  const repository = {
+    findByCode: jest.fn((code: string) => Promise.resolve(seededTemplate(code))),
+  } as unknown as ContractTemplatesRepository;
+
+  const service = new ContractTemplatesService(repository, renderer);
+
+  it.each(CONTRACT_TEMPLATE_DEFAULTS.map((t) => [t.code] as const))(
+    "renders a complete mock preview for %s",
+    async (code) => {
+      const { html } = await service.preview(code);
+      expect(html).toContain("Article 1");
+      expect(html).toContain("Article 13");
+      expect(html).toContain("Abyssinia Trading PLC");
+      expect(html).toContain("Annex A — Commercial Schedule");
+      // No unrendered handlebars placeholders may leak into the document.
+      expect(html).not.toContain("{{");
+      // Greenish theme applied.
+      expect(html).toContain("#1b9e7a");
+    },
+  );
+
+  it("interpolates {{contractYear}} inside seeded article bodies", async () => {
+    const { html } = await service.preview("IMPORT_BULK");
+    expect(html).toContain(`August 31, ${new Date().getFullYear()}`);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/contract-templates/contract-templates.service.ts b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.service.ts
new file mode 100644
index 000000000..d2aea9bc7
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contract-templates/contract-templates.service.ts
@@ -0,0 +1,276 @@
+import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
+import { randomUUID } from "node:crypto";
+
+import { ContractRendererService } from "../../contracts/contract-renderer.service";
+import { getTemplateMeta } from "../../contracts/contract-template.registry";
+import {
+  ContractDynamicTemplateView,
+  ContractViewModel,
+} from "../../contracts/contract-view-model.builder";
+import { ContractTemplatesRepository } from "./contract-templates.repository";
+import {
+  CreateArticleDto,
+  PreviewContractTemplateDto,
+  ReplaceArticleDto,
+  UpdateArticleDto,
+  UpdateContractTemplateDto,
+} from "./dto/contract-template.dto";
+import {
+  CONTRACT_TEMPLATE_CODES,
+  ContractTemplate,
+  ContractTemplateArticle,
+  ContractTemplateCode,
+  contractTemplateCodeFor,
+} from "./entities/contract-template.entity";
+
+/** Registry keys used to derive labels for the mock preview per template code. */
+const PREVIEW_TEMPLATE_KEYS: Record<ContractTemplateCode, string> = {
+  IMPORT_BULK: "IMP_BULK_USD_FORWARDING",
+  EXPORT_BULK: "EXP_BULK_USD_TRANSPORT_ONLY",
+  INTERCITY_BULK: "DOM_BULK_USD_TRANSPORT_ONLY",
+  IMPORT_CONTAINER: "IMP_CON_USD_TRANSPORT_ONLY",
+  EXPORT_CONTAINER: "EXP_CON_USD_FORWARDING",
+  INTERCITY_CONTAINER: "DOM_CON_USD_TRANSPORT_ONLY",
+};
+
+@Injectable()
+export class ContractTemplatesService {
+  constructor(
+    private readonly repository: ContractTemplatesRepository,
+    private readonly renderer: ContractRendererService,
+  ) {}
+
+  async list(): Promise<ContractTemplate[]> {
+    const templates = await this.repository.findAll();
+    const rank = new Map(CONTRACT_TEMPLATE_CODES.map((code, i) => [code, i] as const));
+    return templates.sort(
+      (a, b) => (rank.get(a.code) ?? 99) - (rank.get(b.code) ?? 99),
+    );
+  }
+
+  async getByCode(code: string): Promise<ContractTemplate> {
+    const template = await this.repository.findByCode(this.assertCode(code));
+    if (!template) {
+      throw new NotFoundException(`Contract template ${code} not found`);
+    }
+    return template;
+  }
+
+  /**
+   * The active template used when generating a contract document for the given
+   * direction/freight pair; null when missing or deactivated (the renderer then
+   * falls back to the built-in generic layout).
+   */
+  async findActiveForContract(
+    tradeDirection?: string | null,
+    freightType?: string | null,
+  ): Promise<ContractTemplate | null> {
+    const code = contractTemplateCodeFor(tradeDirection, freightType);
+    const template = await this.repository.findByCode(code);
+    return template?.isActive ? template : null;
+  }
+
+  async update(code: string, dto: UpdateContractTemplateDto): Promise<ContractTemplate> {
+    const template = await this.getByCode(code);
+    if (dto.name !== undefined) template.name = dto.name;
+    if (dto.description !== undefined) template.description = dto.description;
+    if (dto.documentTitle !== undefined) template.documentTitle = dto.documentTitle;
+    if (dto.whereasClauses !== undefined) template.whereasClauses = dto.whereasClauses;
+    if (dto.isActive !== undefined) template.isActive = dto.isActive;
+    return this.repository.saveTemplate(template);
+  }
+
+  async addArticle(code: string, dto: CreateArticleDto): Promise<ContractTemplate> {
+    const template = await this.getByCode(code);
+    const articles = this.sorted(template.articles);
+    const article: ContractTemplateArticle = {
+      id: randomUUID(),
+      title: dto.title,
+      body: dto.body,
+      order: 0,
+    };
+    const index =
+      dto.position && dto.position <= articles.length ? dto.position - 1 : articles.length;
+    articles.splice(index, 0, article);
+    template.articles = this.renumber(articles);
+    return this.repository.saveTemplate(template);
+  }
+
+  async updateArticle(
+    code: string,
+    articleId: string,
+    dto: UpdateArticleDto,
+  ): Promise<ContractTemplate> {
+    const template = await this.getByCode(code);
+    const article = template.articles.find((item) => item.id === articleId);
+    if (!article) {
+      throw new NotFoundException(`Article ${articleId} not found on template ${code}`);
+    }
+    if (dto.title !== undefined) article.title = dto.title;
+    if (dto.body !== undefined) article.body = dto.body;
+    template.articles = this.renumber(this.sorted(template.articles));
+    return this.repository.saveTemplate(template);
+  }
+
+  async removeArticle(code: string, articleId: string): Promise<ContractTemplate> {
+    const template = await this.getByCode(code);
+    const remaining = template.articles.filter((item) => item.id !== articleId);
+    if (remaining.length === template.articles.length) {
+      throw new NotFoundException(`Article ${articleId} not found on template ${code}`);
+    }
+    template.articles = this.renumber(this.sorted(remaining));
+    return this.repository.saveTemplate(template);
+  }
+
+  /** Replace the full ordered article list (also how the editor reorders). */
+  async replaceArticles(
+    code: string,
+    articles: ReplaceArticleDto[],
+  ): Promise<ContractTemplate> {
+    const template = await this.getByCode(code);
+    template.articles = this.renumber(
+      articles.map((item) => ({
+        id: item.id ?? randomUUID(),
+        title: item.title,
+        body: item.body,
+        order: 0,
+      })),
+    );
+    return this.repository.saveTemplate(template);
+  }
+
+  /**
+   * Render the template against a representative mock contract so admins can
+   * see the final document without touching a real contract. Draft overrides
+   * allow previewing unsaved editor state.
+   */
+  async preview(
+    code: string,
+    overrides?: PreviewContractTemplateDto,
+  ): Promise<{ html: string }> {
+    const template = await this.getByCode(code);
+
+    const dynamicTemplate: ContractDynamicTemplateView = {
+      code: template.code,
+      name: overrides?.name ?? template.name,
+      documentTitle: overrides?.documentTitle ?? template.documentTitle,
+      whereasClauses: overrides?.whereasClauses ?? template.whereasClauses,
+      articles: overrides?.articles
+        ? overrides.articles.map((item, index) => ({
+            id: item.id ?? randomUUID(),
+            title: item.title,
+            body: item.body,
+            order: index + 1,
+          }))
+        : this.sorted(template.articles),
+    };
+
+    const view = this.buildMockView(template.code, dynamicTemplate);
+    return { html: this.renderer.render(view) };
+  }
+
+  private buildMockView(
+    code: ContractTemplateCode,
+    dynamicTemplate: ContractDynamicTemplateView,
+  ): ContractViewModel {
+    const meta = getTemplateMeta(PREVIEW_TEMPLATE_KEYS[code]);
+    const isBulk = code.endsWith("_BULK");
+    const now = new Date();
+
+    const unitRates = isBulk
+      ? [
+          { label: "Rail transport — per metric ton", unitPrice: 59.4, unit: "ton", currency: "USD" },
+          { label: "Origin handling and documentation", unitPrice: 18, unit: "ton", currency: "USD" },
+          { label: "Lashing material (when provided by EDR)", unitPrice: 150, unit: "unit", currency: "USD" },
+        ]
+      : [
+          { label: "Rail transport — 40ft container", unitPrice: 1916, unit: "container", currency: "USD" },
+          { label: "Rail transport — 2 × 20ft containers", unitPrice: 1944, unit: "container", currency: "USD" },
+          { label: "Excess tonnage surcharge", unitPrice: 10, unit: "ton", currency: "USD" },
+        ];
+
+    return {
+      bookingId: "00000000-0000-0000-0000-000000000000",
+      reference: "EDR/CT/2026/0042",
+      status: "CONTRACT_READY",
+      templateKey: PREVIEW_TEMPLATE_KEYS[code],
+      template: { ...meta, title: dynamicTemplate.name, templateFile: "edr-dynamic.hbs" },
+      contractDate: now.toLocaleDateString("en-GB", {
+        day: "numeric",
+        month: "long",
+        year: "numeric",
+      }),
+      contractYear: now.getFullYear(),
+      client: {
+        companyName: "Abyssinia Trading PLC",
+        companyAddress: "Bole Sub-city, Woreda 03, H.No 1234, Addis Ababa",
+        companyLocation: "Ethiopia",
+        phone: "+251 91 123 4567",
+        email: "logistics@abyssiniatrading.et",
+        tinNumber: "0011223344",
+        vatNumber: "VAT-556677",
+        fanNumber: "FAN-889900",
+        businessLicense: "BL/AA/12/345678",
+      },
+      provider: {
+        name: "Ethio-Djibouti Standard Gauge Railway Share Company",
+        address: "Nifas Silk Lafto Sub City, Addis Ababa, Ethiopia",
+        phone: "+251 11 872 0000",
+        email: "info@edr.gov.et",
+        tinNumber: "—",
+      },
+      schedule: {
+        originLabel: isBulk ? "Nagad Railway Station" : "SGTD Freight Station",
+        destinationLabel: "Galaan Multipurpose Port (GMP)",
+        tradeDirection: code.startsWith("IMPORT")
+          ? "IMPORT"
+          : code.startsWith("EXPORT")
+            ? "EXPORT"
+            : "DOMESTIC",
+        freightType: isBulk ? "BULK" : "CONTAINER",
+        serviceType: "Rail transport and customs clearance",
+        scheduledDate: "—",
+        contractType: "GENERAL",
+        cargoDescription: isBulk ? "Steel billets — 2,800 MT" : "40ft containers — FMCG cargo",
+        totalWeightVgm: "—",
+        equipmentReturn: isBulk ? "—" : "With empty return",
+        hazardousLabel: "No",
+        firstMilePickupAddress: "—",
+        lastMileDeliveryAddress: "—",
+      },
+      pricing: {
+        displayMode: "UNIT_RATES",
+        unitRates,
+        currency: "USD",
+        equipmentReturn: isBulk ? "—" : "With empty return",
+        originLabel: isBulk ? "Nagad Railway Station" : "SGTD Freight Station",
+        destinationLabel: "Galaan Multipurpose Port (GMP)",
+      } as unknown as ContractViewModel["pricing"],
+      signatures: [],
+      canSignCustomer: false,
+      canSignStaff: false,
+      hasContractDocument: false,
+      hasCustomerSignature: false,
+      hasStaffSignature: false,
+      dynamicTemplate,
+    };
+  }
+
+  private assertCode(code: string): ContractTemplateCode {
+    const upper = code?.toUpperCase() as ContractTemplateCode;
+    if (!CONTRACT_TEMPLATE_CODES.includes(upper)) {
+      throw new BadRequestException(
+        `Unknown contract template code "${code}". Valid codes: ${CONTRACT_TEMPLATE_CODES.join(", ")}`,
+      );
+    }
+    return upper;
+  }
+
+  private sorted(articles: ContractTemplateArticle[]): ContractTemplateArticle[] {
+    return [...(articles ?? [])].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  }
+
+  private renumber(articles: ContractTemplateArticle[]): ContractTemplateArticle[] {
+    return articles.map((article, index) => ({ ...article, order: index + 1 }));
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/contract-templates/dto/contract-template.dto.ts b/apps/edr-freight-api/src/modules/contract-templates/dto/contract-template.dto.ts
new file mode 100644
index 000000000..0ea69f262
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contract-templates/dto/contract-template.dto.ts
@@ -0,0 +1,134 @@
+import { ApiPropertyOptional, ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import {
+  IsArray,
+  IsBoolean,
+  IsInt,
+  IsOptional,
+  IsString,
+  MaxLength,
+  Min,
+  MinLength,
+  ValidateNested,
+} from "class-validator";
+
+export class UpdateContractTemplateDto {
+  @ApiPropertyOptional({ description: "Display name of the template" })
+  @IsOptional()
+  @IsString()
+  @MinLength(3)
+  @MaxLength(200)
+  name?: string;
+
+  @ApiPropertyOptional({ description: "Short description shown on the template card" })
+  @IsOptional()
+  @IsString()
+  description?: string;
+
+  @ApiPropertyOptional({ description: "Cover-page service title of the generated document" })
+  @IsOptional()
+  @IsString()
+  @MinLength(3)
+  @MaxLength(300)
+  documentTitle?: string;
+
+  @ApiPropertyOptional({ description: "WHEREAS recitals", type: [String] })
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  whereasClauses?: string[];
+
+  @ApiPropertyOptional({ description: "Whether the template is used for generation" })
+  @IsOptional()
+  @IsBoolean()
+  isActive?: boolean;
+}
+
+export class CreateArticleDto {
+  @ApiProperty({ description: "Article heading (without the Article N prefix)" })
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  title!: string;
+
+  @ApiProperty({
+    description:
+      'Article body. One clause per line; prefix a line with "- " to nest it as a bullet under the previous clause.',
+  })
+  @IsString()
+  @MinLength(2)
+  body!: string;
+
+  @ApiPropertyOptional({ description: "1-based position to insert at (appends when omitted)" })
+  @IsOptional()
+  @IsInt()
+  @Min(1)
+  position?: number;
+}
+
+export class UpdateArticleDto {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  title?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  @MinLength(2)
+  body?: string;
+}
+
+export class ReplaceArticleDto {
+  @ApiPropertyOptional({ description: "Existing article id (new id assigned when omitted)" })
+  @IsOptional()
+  @IsString()
+  id?: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  title!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(2)
+  body!: string;
+}
+
+export class ReplaceArticlesDto {
+  @ApiProperty({ type: [ReplaceArticleDto], description: "Full ordered article list" })
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => ReplaceArticleDto)
+  articles!: ReplaceArticleDto[];
+}
+
+/** Optional draft overrides so the editor can preview unsaved changes. */
+export class PreviewContractTemplateDto {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  name?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  documentTitle?: string;
+
+  @ApiPropertyOptional({ type: [String] })
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  whereasClauses?: string[];
+
+  @ApiPropertyOptional({ type: [ReplaceArticleDto] })
+  @IsOptional()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => ReplaceArticleDto)
+  articles?: ReplaceArticleDto[];
+}
diff --git a/apps/edr-freight-api/src/modules/contract-templates/entities/contract-template.entity.ts b/apps/edr-freight-api/src/modules/contract-templates/entities/contract-template.entity.ts
new file mode 100644
index 000000000..73729fbb6
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contract-templates/entities/contract-template.entity.ts
@@ -0,0 +1,77 @@
+import { BaseEntity } from "@edr/api-common";
+import { Column, Entity, Index } from "typeorm";
+
+/**
+ * The six canonical contract document templates, one per
+ * (trade direction × freight type) combination. Contracts store DOMESTIC for
+ * intercity movements; the template layer labels those INTERCITY to match the
+ * commercial vocabulary used on the printed documents.
+ */
+export const CONTRACT_TEMPLATE_CODES = [
+  "IMPORT_BULK",
+  "EXPORT_BULK",
+  "INTERCITY_BULK",
+  "IMPORT_CONTAINER",
+  "EXPORT_CONTAINER",
+  "INTERCITY_CONTAINER",
+] as const;
+
+export type ContractTemplateCode = (typeof CONTRACT_TEMPLATE_CODES)[number];
+
+/**
+ * One dynamic article on a contract template. `body` is plain multiline text:
+ * each non-empty line renders as a numbered clause; lines prefixed with "- "
+ * render as bullet points nested under the preceding clause. A single-line
+ * body renders as an unnumbered paragraph. Handlebars placeholders (e.g.
+ * {{client.companyName}}, {{contractDate}}, {{contractYear}}, {{reference}})
+ * are interpolated against the contract view model at render time.
+ */
+export interface ContractTemplateArticle {
+  id: string;
+  title: string;
+  body: string;
+  order: number;
+}
+
+/** Map a contract's stored direction/freight pair onto a template code. */
+export function contractTemplateCodeFor(
+  tradeDirection?: string | null,
+  freightType?: string | null,
+): ContractTemplateCode {
+  const direction =
+    tradeDirection === "IMPORT"
+      ? "IMPORT"
+      : tradeDirection === "EXPORT"
+        ? "EXPORT"
+        : "INTERCITY";
+  const freight =
+    (freightType ?? "").toUpperCase().includes("BULK") ? "BULK" : "CONTAINER";
+  return `${direction}_${freight}` as ContractTemplateCode;
+}
+
+@Entity({ schema: "freight", name: "contract_templates" })
+@Index(["code"], { unique: true })
+export class ContractTemplate extends BaseEntity {
+  @Column({ name: "code", type: "varchar", length: 40, unique: true })
+  code!: ContractTemplateCode;
+
+  @Column({ name: "name", type: "varchar", length: 200 })
+  name!: string;
+
+  @Column({ name: "description", type: "text", nullable: true })
+  description?: string | null;
+
+  /** Cover-page service line, e.g. "Steel Billet Transportation and Customs Clearance Services". */
+  @Column({ name: "document_title", type: "varchar", length: 300 })
+  documentTitle!: string;
+
+  /** WHEREAS recitals rendered between the parties block and the articles. */
+  @Column({ name: "whereas_clauses", type: "jsonb", default: () => "'[]'" })
+  whereasClauses!: string[];
+
+  @Column({ name: "articles", type: "jsonb", default: () => "'[]'" })
+  articles!: ContractTemplateArticle[];
+
+  @Column({ name: "is_active", type: "boolean", default: true })
+  isActive!: boolean;
+}
diff --git a/apps/edr-freight-api/src/modules/contracts/booking-request.service.ts b/apps/edr-freight-api/src/modules/contracts/booking-request.service.ts
index 4752b004f..e038c7bff 100644
--- a/apps/edr-freight-api/src/modules/contracts/booking-request.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/booking-request.service.ts
@@ -51,6 +51,11 @@ export class BookingRequestService {
     const contract = await this.contractsService.findById(contractId);
     await this.contractsService.assertCustomerCanAccessContract(userId, contract);
     this.assertGeneralCustoms(contract);
+    if (contract.status === 'CONTRACT_CLOSED') {
+      throw new ConflictException(
+        'This contract is completed — the full contracted quantity has been booked.',
+      );
+    }
     if (contract.status !== 'CONTRACT_ACTIVE') {
       throw new ConflictException(
         'The contract must be active before requesting a shipment.',
diff --git a/apps/edr-freight-api/src/modules/contracts/clearance-milestone.risk.spec.ts b/apps/edr-freight-api/src/modules/contracts/clearance-milestone.risk.spec.ts
new file mode 100644
index 000000000..eb77533ac
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contracts/clearance-milestone.risk.spec.ts
@@ -0,0 +1,68 @@
+import { BadRequestException } from '@nestjs/common';
+import type { DataSource } from 'typeorm';
+
+import { ClearanceMilestoneService } from './clearance-milestone.service';
+import type { ClearanceMilestone } from './entities/clearance-milestone.entity';
+
+type Status = 'PENDING' | 'COMPLETED' | 'SKIPPED';
+
+/**
+ * Risk assignment is gated on the T1 being closed (catalog order
+ * T1_CLOSED → RISK_ASSIGNED): customs cannot rate cargo still under transit.
+ */
+function makeService(t1Status: Status | 'MISSING') {
+  const rows = new Map<string, ClearanceMilestone>();
+  if (t1Status !== 'MISSING') {
+    rows.set('T1_CLOSED', { milestoneCode: 'T1_CLOSED', status: t1Status } as ClearanceMilestone);
+  }
+  const risk = { milestoneCode: 'RISK_ASSIGNED', status: 'PENDING' } as ClearanceMilestone;
+  rows.set('RISK_ASSIGNED', risk);
+
+  const repo = {
+    findOne: jest.fn(({ where }: { where: { milestoneCode: string } }) =>
+      Promise.resolve(rows.get(where.milestoneCode) ?? null),
+    ),
+    save: jest.fn((m: ClearanceMilestone) => Promise.resolve(m)),
+  };
+  const dataSource = { getRepository: () => repo } as unknown as DataSource;
+  return { service: new ClearanceMilestoneService(dataSource), repo, risk };
+}
+
+describe('ClearanceMilestoneService.assignRisk', () => {
+  it('rejects the assignment while the T1 is still open', async () => {
+    const { service, repo } = makeService('PENDING');
+
+    await expect(service.assignRisk('b-1', 'GREEN')).rejects.toBeInstanceOf(
+      BadRequestException,
+    );
+    expect(repo.save).not.toHaveBeenCalled();
+  });
+
+  it('rejects the assignment when the booking has no T1_CLOSED milestone', async () => {
+    const { service, repo } = makeService('MISSING');
+
+    await expect(service.assignRisk('b-1', 'GREEN')).rejects.toBeInstanceOf(
+      BadRequestException,
+    );
+    expect(repo.save).not.toHaveBeenCalled();
+  });
+
+  it('assigns the risk level once the T1 is closed', async () => {
+    const { service, risk } = makeService('COMPLETED');
+
+    const saved = await service.assignRisk('b-1', 'RED', 'user-1');
+
+    expect(saved.status).toBe('COMPLETED');
+    expect(saved.metadata?.riskLevel).toBe('RED');
+    expect(risk.triggeredByUserId).toBe('user-1');
+  });
+
+  it('assigns the risk level when the T1 step was skipped', async () => {
+    const { service } = makeService('SKIPPED');
+
+    const saved = await service.assignRisk('b-1', 'YELLOW');
+
+    expect(saved.status).toBe('COMPLETED');
+    expect(saved.metadata?.riskLevel).toBe('YELLOW');
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/contracts/clearance-milestone.service.ts b/apps/edr-freight-api/src/modules/contracts/clearance-milestone.service.ts
index 4a58e50be..81ed305e4 100644
--- a/apps/edr-freight-api/src/modules/contracts/clearance-milestone.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/clearance-milestone.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 
 import {
@@ -181,6 +181,10 @@ export class ClearanceMilestoneService {
    * Assign a customs risk level (GREEN/YELLOW/RED) and complete the RISK_ASSIGNED
    * milestone on a booking (GL Import US-04 / §11.3 #19). Stores the level in the
    * milestone metadata so the timeline shows it.
+   *
+   * Customs cannot risk-rate cargo still moving under transit: the T1 must be
+   * closed (accepted by GL Ethiopia after the train arrives) first, which is the
+   * catalog order T1_CLOSED → RISK_ASSIGNED.
    */
   async assignRisk(
     bookingId: string,
@@ -188,9 +192,22 @@ export class ClearanceMilestoneService {
     userId?: string,
     note?: string,
   ): Promise<ClearanceMilestone> {
+    await this.assertT1Closed(bookingId);
     return this.completeWithMetadata(bookingId, 'RISK_ASSIGNED', { riskLevel }, userId, note);
   }
 
+  /** Guard: the booking's T1 must be closed before customs risk can be assigned. */
+  private async assertT1Closed(bookingId: string): Promise<void> {
+    const t1 = await this.repo.findOne({
+      where: { bookingId, milestoneCode: 'T1_CLOSED' },
+    });
+    if (t1?.status !== 'COMPLETED' && t1?.status !== 'SKIPPED') {
+      throw new BadRequestException(
+        'The T1 must be closed before a customs risk level can be assigned.',
+      );
+    }
+  }
+
   /**
    * Advise duty & tax (amount + declaration serial) and complete the
    * DUTY_TAXES_ADVISED milestone (§11.3 #6). The customer then uploads the
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts
new file mode 100644
index 000000000..fb57be209
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts
@@ -0,0 +1,149 @@
+import { BadRequestException } from '@nestjs/common';
+
+import { ContractBookingService } from './contract-booking.service';
+import { Contract } from './entities/contract.entity';
+
+/**
+ * Contract auto-completion by quantity cap. Once a GENERAL contract's capped
+ * scope is fully consumed (e.g. a split remainder rebooked), the contract moves
+ * to CONTRACT_CLOSED even inside its validity window, and further bookings are
+ * blocked — including while a booking window is open. Released capacity
+ * (cancelled/expired booking) reopens the contract on the next attempt.
+ */
+describe('ContractBookingService — quantity-cap completion', () => {
+  function makeService() {
+    const contractsRepository = {
+      findByIdWithRelations: jest.fn(),
+      update: jest.fn().mockResolvedValue(undefined),
+    };
+    const service = new ContractBookingService(
+      contractsRepository as never,
+      {} as never, // bookingsRepository
+      {} as never, // bookingPricingService
+      {} as never, // consolidationService
+      {} as never, // containerTypesService
+      {} as never, // ruleEngineService
+      {} as never, // milestoneService
+      {} as never, // workflowService
+      {} as never, // invoiceService
+      {} as never, // dataSource
+      {} as never, // trainSchedulingService
+    );
+    return { service, contractsRepository };
+  }
+
+  type WithPrivate = {
+    maybeCompleteContract: (c: Contract) => Promise<void>;
+  };
+
+  const generalContract = (status: string): Contract =>
+    ({
+      id: 'c-1',
+      reference: 'CTR-1',
+      contractKind: 'GENERAL',
+      status,
+    }) as Contract;
+
+  it('closes a GENERAL contract when every capped line is exhausted', async () => {
+    const { service, contractsRepository } = makeService();
+    jest.spyOn(service, 'computeCapacity').mockResolvedValue([
+      { containerSize: '20FT', cap: 10, booked: 10, remaining: 0 },
+      { containerSize: '40FT', cap: 4, booked: 4, remaining: 0 },
+    ]);
+
+    await (service as never as WithPrivate).maybeCompleteContract(
+      generalContract('CONTRACT_ACTIVE'),
+    );
+
+    expect(contractsRepository.update).toHaveBeenCalledWith('c-1', {
+      status: 'CONTRACT_CLOSED',
+    });
+  });
+
+  it('absorbs bulk-ton float dust when judging exhaustion', async () => {
+    const { service, contractsRepository } = makeService();
+    jest
+      .spyOn(service, 'computeCapacity')
+      .mockResolvedValue([{ cap: 100, booked: 99.9995, remaining: 0.0005 }]);
+
+    await (service as never as WithPrivate).maybeCompleteContract(
+      generalContract('FULLY_EXECUTED'),
+    );
+
+    expect(contractsRepository.update).toHaveBeenCalledWith('c-1', {
+      status: 'CONTRACT_CLOSED',
+    });
+  });
+
+  it('keeps the contract open while any capped line has capacity left', async () => {
+    const { service, contractsRepository } = makeService();
+    jest.spyOn(service, 'computeCapacity').mockResolvedValue([
+      { containerSize: '20FT', cap: 10, booked: 10, remaining: 0 },
+      { containerSize: '40FT', cap: 4, booked: 3, remaining: 1 },
+    ]);
+
+    await (service as never as WithPrivate).maybeCompleteContract(
+      generalContract('CONTRACT_ACTIVE'),
+    );
+
+    expect(contractsRepository.update).not.toHaveBeenCalled();
+  });
+
+  it('never closes an uncapped contract', async () => {
+    const { service, contractsRepository } = makeService();
+    jest.spyOn(service, 'computeCapacity').mockResolvedValue([]);
+
+    await (service as never as WithPrivate).maybeCompleteContract(
+      generalContract('CONTRACT_ACTIVE'),
+    );
+
+    expect(contractsRepository.update).not.toHaveBeenCalled();
+  });
+
+  it('never closes a ONE_TIME contract (single-slot rule governs it)', async () => {
+    const { service, contractsRepository } = makeService();
+    const spy = jest.spyOn(service, 'computeCapacity');
+
+    await (service as never as WithPrivate).maybeCompleteContract({
+      id: 'c-1',
+      contractKind: 'ONE_TIME',
+      status: 'FULLY_EXECUTED',
+    } as Contract);
+
+    expect(spy).not.toHaveBeenCalled();
+    expect(contractsRepository.update).not.toHaveBeenCalled();
+  });
+
+  it('rejects a new booking on a completed contract even inside an open window', async () => {
+    const { service, contractsRepository } = makeService();
+    contractsRepository.findByIdWithRelations.mockResolvedValue(
+      generalContract('CONTRACT_CLOSED'),
+    );
+    jest
+      .spyOn(service, 'computeCapacity')
+      .mockResolvedValue([{ cap: 10, booked: 10, remaining: 0 }]);
+
+    await expect(
+      service.createUnderContract('c-1', {} as never, null, null),
+    ).rejects.toThrow(BadRequestException);
+    expect(contractsRepository.update).not.toHaveBeenCalled();
+  });
+
+  it('reopens a completed contract when capacity was released', async () => {
+    const { service, contractsRepository } = makeService();
+    contractsRepository.findByIdWithRelations.mockResolvedValue(
+      generalContract('CONTRACT_CLOSED'),
+    );
+    jest
+      .spyOn(service, 'computeCapacity')
+      .mockResolvedValue([{ cap: 10, booked: 8, remaining: 2 }]);
+
+    // The create path continues past the gate and dies later on the bare mocks —
+    // only the reopen transition is under test here.
+    await service.createUnderContract('c-1', {} as never, null, null).catch(() => undefined);
+
+    expect(contractsRepository.update).toHaveBeenCalledWith('c-1', {
+      status: 'CONTRACT_ACTIVE',
+    });
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts
index 55dd5c29f..70083a2ae 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts
@@ -83,6 +83,24 @@ export class ContractBookingService {
     const contract = await this.contractsRepository.findByIdWithRelations(contractId);
     if (!contract) throw new NotFoundException(`Contract ${contractId} not found`);
 
+    // A contract whose quantity cap was fully booked is completed — no further
+    // bookings, even while contract validity and a booking window are still
+    // open. Capacity released after closure (a cancelled/expired booking)
+    // reopens the contract on the next booking attempt.
+    if (contract.status === 'CONTRACT_CLOSED') {
+      const capacity = await this.computeCapacity(contract);
+      const hasRoom = capacity.some((c) => c.remaining == null || c.remaining > 0);
+      if (!hasRoom) {
+        throw new BadRequestException(
+          'This contract is completed — the full contracted quantity has been booked.',
+        );
+      }
+      await this.contractsRepository.update(contract.id, {
+        status: 'CONTRACT_ACTIVE',
+      } as never);
+      contract.status = 'CONTRACT_ACTIVE';
+    }
+
     // GL Ethiopia is identified by the dedicated contract create-booking permission
     // (granted to the edr_gl_ethiopia preset).
     const isGlActor =
@@ -122,6 +140,15 @@ export class ContractBookingService {
     const generalCustoms =
       contract.contractKind === 'GENERAL' && Boolean(contract.customsClearingEnabled);
 
+    // GENERAL without customs (Path A) ALSO clears per booking: the customer
+    // uploads his own clearance proof on each booking and Operations reviews it
+    // (legacy AWAITING_DOCUMENTS → DOCUMENTS_UNDER_REVIEW → CLEARANCE_READY →
+    // requestOperation machine). DOMESTIC has no border, so no gate.
+    const generalSelfClear =
+      contract.contractKind === 'GENERAL' &&
+      !contract.customsClearingEnabled &&
+      contract.tradeDirection !== 'DOMESTIC';
+
     // Intercity (DOMESTIC) bookings ride on a passing import/export train:
     // there is no window and no date — staff accept them onto a train at
     // finalize time, so both the window gate and scheduledDate are skipped.
@@ -140,9 +167,10 @@ export class ContractBookingService {
     // Booking-window gate (config-driven): an operations booking may only be
     // created while the route's booking window is open — import: the day's window
     // (windowOpenHour EAT, importWindowLeadDays before departure, windowDurationHours);
-    // export: within exportBookingLeadHours of departure. Customs Path B bookings
-    // enter clearance first and are scheduled later, so they are not gated here.
-    if (!generalCustoms && !isIntercity) {
+    // export: within exportBookingLeadHours of departure. Bookings that enter the
+    // clearance gate first (Path B customs AND Path A per-booking self-clearance)
+    // are scheduled later, so they are not gated here.
+    if (!generalCustoms && !generalSelfClear && !isIntercity) {
       await this.trainSchedulingService.assertBookingWindowOpen({
         originYardId: route?.originYardId ?? null,
         destinationYardId: route?.destinationYardId ?? null,
@@ -174,7 +202,10 @@ export class ContractBookingService {
       companyProfileId: contract.companyProfileId ?? null,
       isGovernment: contract.isGovernment,
       governmentInstitution: contract.governmentInstitution ?? null,
-      status: generalCustoms ? 'AWAITING_DOCUMENTS' : 'OPERATION_REQUEST_PENDING',
+      status:
+        generalCustoms || generalSelfClear
+          ? 'AWAITING_DOCUMENTS'
+          : 'OPERATION_REQUEST_PENDING',
       bookingType: 'ONE_TIME',
       contractId: contract.id,
       contractRouteId: route?.id ?? null,
@@ -259,9 +290,10 @@ export class ContractBookingService {
     const withContainers = await this.bookingsRepository.findByIdWithFiles(
       booking.id,
     );
-    const intendedStatus = generalCustoms
-      ? 'AWAITING_DOCUMENTS'
-      : 'OPERATION_REQUEST_PENDING';
+    const intendedStatus =
+      generalCustoms || generalSelfClear
+        ? 'AWAITING_DOCUMENTS'
+        : 'OPERATION_REQUEST_PENDING';
     if (
       withContainers &&
       freightType === 'CONTAINER' &&
@@ -277,6 +309,9 @@ export class ContractBookingService {
       if (!parked.paired) {
         // Waiting for a partner — stop here. The booking sits in
         // PENDING_CONSOLIDATION, unbilled and unscheduled, until it pairs.
+        // A parked booking still holds contract capacity, so the cap may
+        // already be exhausted by it.
+        await this.maybeCompleteContract(contract);
         const pendingResult = await this.bookingsRepository.findByIdWithFiles(
           booking.id,
         );
@@ -290,6 +325,8 @@ export class ContractBookingService {
       generalCustoms,
     );
 
+    await this.maybeCompleteContract(contract);
+
     const result = await this.bookingsRepository.findByIdWithFiles(booking.id);
     return { booking: result ?? booking, warnings };
   }
@@ -592,6 +629,44 @@ export class ContractBookingService {
     });
   }
 
+  /**
+   * Complete the contract once its quantity cap is fully consumed. Runs after
+   * every booking created under a GENERAL contract (including a split remainder
+   * being rebooked): when no capped scope line has capacity left, the contract
+   * moves to CONTRACT_CLOSED even though its validity window is still open —
+   * blocking further bookings and shipment requests, including inside an open
+   * booking window. Never throws: a status hiccup must not undo the booking
+   * that was just created.
+   */
+  private async maybeCompleteContract(contract: Contract): Promise<void> {
+    try {
+      // ONE_TIME contracts are governed by the single-active-booking slot (and
+      // are promoted to GENERAL on split), so only GENERAL completes by cap.
+      if (contract.contractKind !== 'GENERAL') return;
+      if (!['CONTRACT_ACTIVE', 'FULLY_EXECUTED'].includes(contract.status)) return;
+      const capacity = await this.computeCapacity(contract);
+      if (capacity.length === 0) return; // uncapped — completes only by expiry
+      // 0.001 tolerance absorbs bulk-ton float rounding (split weights round to
+      // 3 decimals); container caps are integers and unaffected.
+      const exhausted = capacity.every(
+        (c) => c.remaining != null && c.remaining <= 0.001,
+      );
+      if (!exhausted) return;
+      await this.contractsRepository.update(contract.id, {
+        status: 'CONTRACT_CLOSED',
+      } as never);
+      this.logger.log(
+        `Contract ${contract.reference} quantity cap fully booked — completed; no further bookings within validity.`,
+      );
+    } catch (err) {
+      this.logger.error(
+        `Could not evaluate completion for contract ${contract.id}: ${
+          err instanceof Error ? err.message : String(err)
+        }`,
+      );
+    }
+  }
+
   /**
    * Quantities already booked under a contract that still hold capacity. Excludes
    * bookings that never shipped (CANCELLED / REJECTED / EXPIRED).
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts
index 9f12b937d..4da2677bd 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts
@@ -350,6 +350,17 @@ export class ContractTransitionService {
     const updated = await this.contractsService.findById(contractId);
     if (allDone) {
       this.notifier.approved(updated);
+      // Final approval step also generates the contract document from the
+      // template matching the contract's direction/freight pair. Best-effort:
+      // a rendering hiccup must not roll back the approval — the document can
+      // still be generated manually or lazily on view/download.
+      try {
+        return await this.generateContract(contractId);
+      } catch (err) {
+        this.logger.warn(
+          `Auto contract generation after final approval failed for ${updated.reference}: ${err}`,
+        );
+      }
     }
     return updated;
   }
@@ -582,7 +593,7 @@ export class ContractTransitionService {
       if (!dto.otpPhone || !dto.otp) {
         throw new BadRequestException('OTP verification is required to sign the contract');
       }
-      await this.otpService.verifyOtpForAction(dto.otpPhone, dto.otp);
+      await this.otpService.verifyOtpForAction({ phone: dto.otpPhone }, dto.otp);
       await this.applySignature(contract, dto, options);
       await this.contractsRepository.update(contractId, {
         status: 'SIGNED_CUSTOMER',
@@ -632,16 +643,15 @@ export class ContractTransitionService {
       contract.customsClearingEnabled ?? false,
     );
 
-    // GENERAL + customs (Path B) runs clearance PER BOOKING, not at the contract
-    // level: there is no contract clearance cycle. The contract just becomes
-    // active; the customer then files shipment requests and GL books + clears
-    // each one. ONE_TIME customs and Path A self-clearance keep the contract
-    // cycle below.
-    const isGeneralCustoms =
-      contract.contractKind === 'GENERAL' &&
-      Boolean(contract.customsClearingEnabled);
+    // GENERAL contracts run clearance PER BOOKING, not at the contract level —
+    // both paths. Customs (Path B): the customer files shipment requests, GL
+    // books each one and the booking carries its own clearance. Self-clearance
+    // (Path A): the customer books, then uploads the clearance docs on that
+    // booking for Operations to review. Only ONE_TIME contracts keep the
+    // contract-level cycle below.
+    const isGeneral = contract.contractKind === 'GENERAL';
 
-    if (clearanceCode && !isGeneralCustoms) {
+    if (clearanceCode && !isGeneral) {
       // Open a clearance cycle, seed the pre-booking milestones, and route the
       // customer to upload. Path A is ops-reviewed; Path B is GL-reviewed — the
       // distinction is enforced at the review/finalize endpoints, not here.
@@ -652,8 +662,8 @@ export class ContractTransitionService {
       updates.clearanceStatus = 'AWAITING_DOCUMENTS';
       updates.clearanceCycleNumber = cycleNumber;
     } else {
-      // No contract-level clearance gate — DOMESTIC, or GENERAL+customs (which
-      // clears per booking). Ready for shipment requests / direct booking.
+      // No contract-level clearance gate — DOMESTIC, or any GENERAL contract
+      // (which clears per booking). Ready for shipment requests / direct booking.
       updates.status =
         contract.contractKind === 'GENERAL' ? 'CONTRACT_ACTIVE' : 'FULLY_EXECUTED';
       updates.clearanceStatus = 'NOT_APPLICABLE';
diff --git a/apps/edr-freight-api/src/modules/contracts/contracts.module.ts b/apps/edr-freight-api/src/modules/contracts/contracts.module.ts
index 33a547a9f..96bdf22b1 100644
--- a/apps/edr-freight-api/src/modules/contracts/contracts.module.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contracts.module.ts
@@ -16,6 +16,7 @@ import { NotificationsModule } from '../notifications/notifications.module';
 import { NotificationInboxModule } from '../notification-inbox/notification-inbox.module';
 import { BookingsModule } from '../bookings/bookings.module';
 import { TrainSchedulingModule } from '../train-scheduling/train-scheduling.module';
+import { ContractTemplatesModule } from '../contract-templates/contract-templates.module';
 
 import { ContractsController } from './contracts.controller';
 import { ContractsService } from './contracts.service';
@@ -81,6 +82,9 @@ import { ContractDocumentViewModelBuilder } from '../../contracts/contract-docum
     NotificationsModule,
     NotificationInboxModule,
     CompaniesModule,
+    // Provides the admin-editable contract document templates consumed by
+    // ContractDocumentViewModelBuilder when rendering contract PDFs.
+    ContractTemplatesModule,
     // BookingsModule provides BookingsRepository/BookingPricingService used by the
     // contract PDF builders (they read a Booking today — see docs/new-doc.md §3.3).
     forwardRef(() => BookingsModule),
diff --git a/apps/edr-freight-api/src/modules/contracts/contracts.service.ts b/apps/edr-freight-api/src/modules/contracts/contracts.service.ts
index 095857959..517d818bf 100644
--- a/apps/edr-freight-api/src/modules/contracts/contracts.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contracts.service.ts
@@ -265,10 +265,11 @@ export class ContractsService {
       }
     }
 
-    // Attach the company profile's onboarding / business-license documents to the
-    // contract by reference. The separate "Documents" intake step was removed —
-    // the profile documents are simply carried onto every contract automatically.
-    await this.attachProfileDocuments(contract.id, companyProfileId);
+    // Attach the company's onboarding documents (TIN, licenses, IDs) and the
+    // profile's business-license documents to the contract by reference. The
+    // separate "Documents" intake step was removed — the profile documents are
+    // simply carried onto every contract automatically.
+    await this.attachProfileDocuments(contract.id, companyId ?? null, companyProfileId);
 
     return { contract: await this.findById(contract.id), warnings };
   }
@@ -316,51 +317,95 @@ export class ContractsService {
   }
 
   /**
-   * Copy a company profile's stored business-license / onboarding documents onto
-   * a contract by reference (no byte re-upload). Codes are slugged from each
-   * document name so they group under "Profile documents" on the contract detail
-   * page. No-op when the contract has no profile or the profile has no documents.
+   * Copy the company's onboarding documents (TIN certificate, commercial /
+   * investment license, national ID, passport — resource "companies", coded by
+   * the upload-setting fileKey) and the company profile's business-license
+   * documents (resource "company_profiles") onto a contract by reference (no
+   * byte re-upload). Idempotent: codes already present on the contract — user
+   * uploads or an earlier carry — are never duplicated or overwritten, so it is
+   * safe to run on every create and update. No-op when there is nothing to copy.
    */
   private async attachProfileDocuments(
     contractId: string,
+    companyId: string | null,
     companyProfileId: string | null,
   ): Promise<void> {
-    if (!companyProfileId) return;
-    // Business-license files are FileRecords (resource "company_profiles"); carry
-    // the live ones by reference. Staged/pending uploads are excluded by code.
-    const records = await this.filesService.findByResource(
-      companyProfileId,
-      'company_profiles',
+    if (!companyId && !companyProfileId) return;
+
+    const existingCodes = new Set(
+      (await this.filesService.findByResource(contractId, 'contracts')).map(
+        (r) => r.code,
+      ),
     );
-    const docs = records
-      .filter((r) => r.code === 'business_license')
-      .map((r) => ({
-        name: r.name,
-        url: r.url,
-        size: r.size,
-        mimeType: r.mimeType,
-      }));
+    const docs: Array<{
+      code: string;
+      name: string;
+      url: string;
+      size: number;
+      mimeType?: string;
+    }> = [];
+
+    if (companyId) {
+      // Company onboarding documents keep their fileKey codes (tin_certificate,
+      // commercial_license, …) so the portal can match them against the
+      // onboarding upload-setting fields. Re-uploads append rows, so keep only
+      // the newest record per code.
+      const companyRecords = await this.filesService.findByResource(
+        companyId,
+        'companies',
+      );
+      const latestByCode = new Map<string, (typeof companyRecords)[number]>();
+      for (const r of companyRecords) {
+        const prev = latestByCode.get(r.code);
+        if (!prev || r.createdAt > prev.createdAt) latestByCode.set(r.code, r);
+      }
+      for (const r of latestByCode.values()) {
+        if (existingCodes.has(r.code)) continue;
+        docs.push({
+          code: r.code,
+          name: r.name,
+          url: r.url,
+          size: r.size,
+          mimeType: r.mimeType,
+        });
+      }
+    }
+
+    if (companyProfileId) {
+      // Business-license files are FileRecords (resource "company_profiles");
+      // carry the live ones by reference. Staged/pending uploads are excluded by
+      // code. Codes are slugged from each document name so they group under
+      // "Profile documents" on the contract detail page.
+      const records = await this.filesService.findByResource(
+        companyProfileId,
+        'company_profiles',
+      );
+      const slug = (name: string) =>
+        name
+          .toLowerCase()
+          .replace(/\.[a-z0-9]+$/, '')
+          .replace(/[^a-z0-9]+/g, '_')
+          .replace(/^_+|_+$/g, '') || 'profile_document';
+
+      records
+        .filter((r) => r.code === 'business_license')
+        .forEach((r, i) => {
+          const code = `${slug(r.name)}_${i + 1}`;
+          if (existingCodes.has(code)) return;
+          docs.push({
+            code,
+            name: r.name,
+            url: r.url,
+            size: r.size,
+            mimeType: r.mimeType,
+          });
+        });
+    }
+
     if (docs.length === 0) return;
 
-    const slug = (name: string) =>
-      name
-        .toLowerCase()
-        .replace(/\.[a-z0-9]+$/, '')
-        .replace(/[^a-z0-9]+/g, '_')
-        .replace(/^_+|_+$/g, '') || 'profile_document';
-
     try {
-      await this.filesService.attachExistingFiles(
-        contractId,
-        'contracts',
-        docs.map((d, i) => ({
-          code: `${slug(d.name)}_${i + 1}`,
-          name: d.name,
-          url: d.url,
-          size: d.size,
-          mimeType: d.mimeType,
-        })),
-      );
+      await this.filesService.attachExistingFiles(contractId, 'contracts', docs);
     } catch {
       // Non-fatal — the contract is still valid without the carried documents.
     }
@@ -481,6 +526,15 @@ export class ContractsService {
       await this.filesService.uploadMany(id, 'contracts', files);
     }
 
+    // Re-carry any company/profile document that is still missing from the
+    // contract (runs after the upload so fresh replacements keep their slot).
+    // Backfills contracts created before profile documents were carried over.
+    await this.attachProfileDocuments(
+      id,
+      existing.companyId ?? null,
+      existing.companyProfileId ?? null,
+    );
+
     return { contract: await this.findById(id), warnings };
   }
 
diff --git a/apps/edr-freight-api/src/modules/gps-tracking/README.md b/apps/edr-freight-api/src/modules/gps-tracking/README.md
new file mode 100644
index 000000000..668b581b8
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/gps-tracking/README.md
@@ -0,0 +1,150 @@
+# GPS Tracking (GT06) — Operations & Device Configuration
+
+GT06 trackers speak a **raw TCP binary protocol**, not HTTP/HTTPS. This shapes
+everything about how the service is deployed and how devices are pointed at it.
+
+---
+
+## 1. Why GPS needs its own dedicated TCP port
+
+- **Not HTTP.** GT06 devices send binary frames
+  (`0x78 0x78 | len | protocol | payload | serial | CRC16 | 0x0D 0x0A`).
+  An HTTP server receiving these answers `400 Bad Request` and closes.
+- **Dedicated port required.** A listening socket is keyed on `(IP, port)`; two
+  listeners on the same pair collide (`EADDRINUSE`). The REST API already owns
+  its port, so GPS traffic needs a separate one.
+- **No hostname routing.** GT06 frames carry no `Host` header and no TLS SNI, so
+  L7 proxies (Nginx `http`, AWS ALB, Cloudflare proxy) cannot route them by
+  domain. Routing must happen at **Layer 4 (TCP)** by port.
+- **DNS carries no port.** An A record maps a name to an IP only. The tracker
+  config must state the port explicitly (e.g. `gps.example.com:5023`).
+
+### Operational requirements
+
+| Item | Value |
+| --- | --- |
+| Protocol | Raw TCP (not HTTP, not TLS) |
+| Default port | `5023` (configurable via `GT06_TCP_PORT`) |
+| Listener bind | `0.0.0.0` inside the `freight-gps` container |
+| Edge terminator | **L4** — AWS NLB or Nginx `stream {}`. **Not** ALB / Cloudflare proxy. |
+
+---
+
+## 2. Port configuration
+
+`5023` is only this project's default — **not** a GT06 protocol requirement. The
+listener binds whatever `GT06_TCP_PORT` says, as long as trackers are configured
+with the same number.
+
+Host and container ports are decoupled in `docker-compose.yaml`:
+
+```yaml
+freight-gps:
+  ports:
+    - "${GT06_TCP_PORT:-5023}:5023"   # host is configurable; container fixed
+  environment:
+    GT06_TCP_PORT: "5023"             # pinned inside the container
+```
+
+- The **container** always listens on `5023`.
+- The **host/public** port is configurable (443, 5023, 9000, …) via the root
+  `.env`'s `GT06_TCP_PORT`.
+- This split is required because the image runs as a **non-root** user
+  (`nestjs`, uid 1001), which cannot bind ports `<1024`. Docker (root) binds the
+  host port and forwards to `5023` inside.
+- Running **outside Docker** (`pnpm dev:gps`, systemd), `GT06_TCP_PORT` is the
+  actual bind port, so `<1024` needs root or `CAP_NET_BIND_SERVICE`.
+- **443 is allowed but risky:** GT06 stays raw TCP, not TLS. Middleboxes that
+  expect a TLS handshake on 443 may drop the connection.
+
+---
+
+## 3. Deployment topology
+
+The GT06 listener runs as its own process (`dist/main.gps.js`, module
+`GpsIngestModule`) — DB + GPS only, no HTTP server. It shares the `edr_freight`
+DB with the API; the DB is the seam (ingester writes `gps_devices` /
+`gps_positions`, API reads them).
+
+```
+freight-api    HTTP :3001   GT06_TCP_PORT=0        (listener off, applies migrations)
+freight-gps    TCP  :5023   DB_MIGRATIONS_RUN=false (owns the tracker socket)
+```
+
+`DB_MIGRATIONS_RUN=false` keeps the second process from racing migrations.
+
+Horizontal scale: each tracker holds one long-lived TCP connection with
+per-socket session state, so N `freight-gps` replicas can run behind an L4 LB —
+each device sticks to one replica. `ensureDevice` is safe under concurrency
+(unique IMEI).
+
+---
+
+## 4. Device configuration (GT06 side)
+
+Config is done by **SMS to the tracker's SIM**. Commands below are the canonical
+Concox/GT06 set — **verify against your unit's sheet**, syntax varies by firmware.
+Default command password is usually `123456`.
+
+Prep: data-enabled SIM, SMS on, **SIM PIN off**, know your carrier APN.
+
+```
+STATUS#                          # 1. sanity check — returns GSM/GPS/batt/GPRS
+APN,<apn>#                       # 2. carrier data APN (add ,user,pass if needed)
+SERVER,1,gps.example.com,5023,0# # 3. point at server (1=domain). Port MUST match GT06_TCP_PORT
+GPRSON,1#                        # 4. enable data
+GPSON,1#                         #    enable GPS
+TIMER,10#                        # 5. upload interval, seconds (some use UPLOAD,10#)
+RESET#                           # 6. reboot so it reconnects (many cache DNS until reboot)
+```
+
+Raw-IP variant of step 3: `SERVER,0,203.0.113.50,5023,0#`
+Custom host port (e.g. 443): `SERVER,1,gps.example.com,443,0#`
+
+### Verify from the server
+
+```bash
+docker compose logs -f freight-gps | grep -Ei "login|Auto-registering|ingester up"
+nc -vz gps.example.com 5023
+curl -H "Authorization: Bearer <token>" https://api.example.com/api/gps/positions/latest
+```
+
+First login packet **auto-registers** the IMEI (no manual step). `online:true`
+only when `lastSeenAt` < 5 min (computed at read time).
+
+### Link a tracker to a vehicle (optional)
+
+Auto-register leaves `vehicleId` null. Attach it (needs `tracking.manage`):
+
+```
+PATCH /api/gps/devices/:id   { "vehicleId": "<uuid>", "name": "Truck 03-ET" }
+```
+
+### Failure map
+
+| Symptom | Cause |
+| --- | --- |
+| No SMS reply | SIM PIN on / no signal / wrong number |
+| Replies but never connects | APN wrong, or `SERVER` port ≠ `GT06_TCP_PORT` |
+| Connects then drops | server not ACKing, or middlebox on 443 expecting TLS |
+| Registered but `online:false` | packets blocked by firewall — open inbound TCP |
+| Wrong location / `positioned:false` | no GPS fix yet — open sky, cold start ~1–2 min |
+
+---
+
+## 5. Security
+
+- GT06 authenticates with **IMEI only**, which is **spoofable**. Anyone who can
+  reach the port can inject fake positions.
+- **Do not** expose the port to `0.0.0.0/0`. Restrict at the firewall / security
+  group to the SIM provider's **APN / IP range**.
+- Trackers must use the same host+port as the server:
+  `SERVER,1,gps.example.com,<port>,0#`.
+
+---
+
+## 6. Edge (L4) termination
+
+See [`infrastructure/nginx/gps-stream.conf`](../../../../../infrastructure/nginx/gps-stream.conf)
+for an Nginx `stream {}` example, and the AWS NLB notes in the same file.
+Reminder: **L4 only** — an HTTP proxy cannot route GT06.
diff --git a/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.controller.ts b/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.controller.ts
index 1d7fd27fc..80fecf1bf 100644
--- a/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.controller.ts
+++ b/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.controller.ts
@@ -13,8 +13,10 @@ import {
   Patch,
   Post,
   Query,
+  UseGuards,
 } from "@nestjs/common";
-import { ApiOperation, ApiTags } from "@nestjs/swagger";
+import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger";
+import { JwtGuard } from "@tria-plc/api-common/modules/auth/services/jwt.guard";
 
 import {
   AuthUserPayload,
@@ -24,6 +26,8 @@ import { ListNotificationsQueryDto } from "./dto/list-notifications-query.dto";
 import { NotificationInboxService } from "./notification-inbox.service";
 
 @ApiTags("notifications")
+@ApiBearerAuth()
+@UseGuards(JwtGuard)
 @Controller("notifications")
 export class NotificationInboxController {
   constructor(private readonly service: NotificationInboxService) {}
diff --git a/apps/edr-freight-api/src/modules/notification-inbox/notifications.gateway.ts b/apps/edr-freight-api/src/modules/notification-inbox/notifications.gateway.ts
index c14dcbaa5..0c4704170 100644
--- a/apps/edr-freight-api/src/modules/notification-inbox/notifications.gateway.ts
+++ b/apps/edr-freight-api/src/modules/notification-inbox/notifications.gateway.ts
@@ -15,9 +15,10 @@ import { WsAuthService } from "./ws-auth.service";
 
 /**
  * Server → client push for in-app notifications. Clients only *listen* (no
- * `@SubscribeMessage` handlers), so the global HTTP JwtGuard never applies here;
- * the handshake is authenticated in `handleConnection` and each socket joins a
- * private `user:<id>` room the service targets.
+ * `@SubscribeMessage` handlers), and `@UseGuards(JwtGuard)` on the REST
+ * controller does not cover WebSockets; the handshake is authenticated in
+ * `handleConnection` and each socket joins a private `user:<id>` room the
+ * service targets.
  */
 @WebSocketGateway({
   namespace: NOTIFICATION_WS_NAMESPACE,
diff --git a/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts b/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts
index d8404e84c..cddc67b2d 100644
--- a/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts
+++ b/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts
@@ -22,6 +22,10 @@ export class SmsNotificationStrategy implements NotificationStrategy {
 
     this.logger.debug(`Sending SMS to ${recipient} via ${url}`);
 
+    // axios defaults to no timeout — a hanging gateway would block the caller
+    // (and any transaction it sits in) indefinitely. Always bound the wait.
+    const timeout = Number(this.configService.get<string>("SMS_TIMEOUT_MS") ?? 8000);
+
     try {
       const response = await axios.post(
         url,
@@ -34,6 +38,7 @@ export class SmsNotificationStrategy implements NotificationStrategy {
           callbackUrl: "",
         },
         {
+          timeout,
           headers: {
             accept: "*/*",
             "Content-Type": "application/json",
diff --git a/apps/edr-freight-api/src/modules/otp/otp.service.ts b/apps/edr-freight-api/src/modules/otp/otp.service.ts
index e26ed35c9..b98b41d8d 100644
--- a/apps/edr-freight-api/src/modules/otp/otp.service.ts
+++ b/apps/edr-freight-api/src/modules/otp/otp.service.ts
@@ -50,6 +50,9 @@ export class OtpService {
         await this.otpRepository.createOtp(target, otp);
       }
 
+      // A freshly issued code gets a fresh guess budget.
+      this.actionAttempts.delete(this.targetKey(target));
+
       if (target.email) {
         // send email (queued to RabbitMQ via the shared Email service)
         await this.emailClient.sendEmail({
@@ -121,24 +124,44 @@ export class OtpService {
   // ---------------------------------------------------------------------------
 
   // Fresh, single-use challenge gating a sensitive action (e.g. applying a
-  // contract signature). Unlike verifyOtp above — which marks a phone verified
-  // and leaves the code in place — this enforces a short TTL and consumes the
-  // code on success so it can never be replayed.
+  // contract signature, resetting a forgotten password). Unlike verifyOtp above
+  // — which marks a target verified and leaves the code in place — this enforces
+  // a TTL and consumes the code on success so it can never be replayed.
   private readonly ACTION_OTP_TTL_MS = 5 * 60 * 1000;
 
-  async verifyOtpForAction(phone: string, otp: string) {
-    const otpData = await this.otpRepository.findByPhone(phone);
+  // Without a cap, a 6-digit code guarding a password reset is brute-forceable
+  // within its own TTL. `otp_verifications` has no attempt column, so the
+  // counter lives here and the code is burned once the budget is spent.
+  // Per-process: it resets on restart and is not shared across replicas — a
+  // persisted counter needs a migration on OtpVerification.
+  private readonly MAX_ACTION_ATTEMPTS = 5;
+  private readonly actionAttempts = new Map<string, number>();
+
+  private targetKey(target: OtpTarget): string {
+    return target.email ? `email:${target.email}` : `phone:${target.phone}`;
+  }
+
+  async verifyOtpForAction(
+    target: OtpTarget,
+    otp: string,
+    ttlMs: number = this.ACTION_OTP_TTL_MS,
+  ) {
+    const otpData = await this.otpRepository.findByTarget(target);
+    const key = this.targetKey(target);
 
     if (!otpData) {
       throw new BadRequestException(
-        "No verification code was requested for this phone",
+        target.email
+          ? "No verification code was requested for this email"
+          : "No verification code was requested for this phone",
       );
     }
 
     const ageMs = Date.now() - new Date(otpData.updatedAt).getTime();
 
-    if (ageMs > this.ACTION_OTP_TTL_MS) {
+    if (ageMs > ttlMs) {
       await this.otpRepository.deleteOtp(otpData);
+      this.actionAttempts.delete(key);
 
       throw new BadRequestException(
         "Verification code has expired. Request a new one.",
@@ -146,11 +169,24 @@ export class OtpService {
     }
 
     if (otpData.otp !== otp) {
+      const attempts = (this.actionAttempts.get(key) ?? 0) + 1;
+
+      if (attempts >= this.MAX_ACTION_ATTEMPTS) {
+        await this.otpRepository.deleteOtp(otpData);
+        this.actionAttempts.delete(key);
+
+        throw new BadRequestException(
+          "Too many incorrect attempts. Request a new code.",
+        );
+      }
+
+      this.actionAttempts.set(key, attempts);
       throw new BadRequestException("Invalid verification code");
     }
 
     // single-use: consume on success
     await this.otpRepository.deleteOtp(otpData);
+    this.actionAttempts.delete(key);
 
     return { success: true };
   }
diff --git a/apps/edr-freight-api/src/modules/routes/entities/route.entity.ts b/apps/edr-freight-api/src/modules/routes/entities/route.entity.ts
index a79a54503..23399bb4d 100644
--- a/apps/edr-freight-api/src/modules/routes/entities/route.entity.ts
+++ b/apps/edr-freight-api/src/modules/routes/entities/route.entity.ts
@@ -39,12 +39,17 @@ export class Route extends BaseEntity {
   milestones?: RouteMilestone[];
 }
 
+/**
+ * Human-readable route label: yard names, not yard codes — "Addis Ababa → Dire Dawa",
+ * not "ADDIS_ABABA → DIRE_DAWA". A yard's display name is its `label`; `code` is the
+ * machine identifier and is only a fallback for a yard missing one.
+ */
 export function formatRouteLabel(route: {
-  originYard?: { code?: string; name?: string } | null;
-  destinationYard?: { code?: string; name?: string } | null;
+  originYard?: { code?: string; label?: string } | null;
+  destinationYard?: { code?: string; label?: string } | null;
 }): string {
-  const origin = route.originYard?.code ?? route.originYard?.name ?? 'Origin';
-  const dest = route.destinationYard?.code ?? route.destinationYard?.name ?? 'Destination';
+  const origin = route.originYard?.label ?? route.originYard?.code ?? 'Origin';
+  const dest = route.destinationYard?.label ?? route.destinationYard?.code ?? 'Destination';
   return `${origin} → ${dest}`;
 }
 
diff --git a/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts b/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts
index 700a38983..a64faabbe 100644
--- a/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts
+++ b/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts
@@ -22,7 +22,9 @@ export class TrainSchedulesRepository extends BaseRepository<TrainSchedule> {
     return this.repo(manager).findOne({
       where: { id },
       relations: {
-        route: true,
+        // Yards carry the route's display name; without them formatRouteLabel
+        // degrades to the literal "Origin → Destination".
+        route: { originYard: true, destinationYard: true },
         trainSet: {
           locomotive: true,
           locomotives: { locomotive: true },
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.constants.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.constants.ts
index 1ff1880b7..62ed50c0a 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.constants.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.constants.ts
@@ -34,3 +34,13 @@ export const DEFAULT_CONTAINER_WAGON_TARE_TONS = 22.4;
 
 /** Default CW3 gondola tare for bulk bookings (T). */
 export const DEFAULT_BULK_WAGON_TARE_TONS = 23.4;
+
+/**
+ * Fallback rated payloads (T) matching the tare fallbacks above. A bulk booking's
+ * wagon count is its cargo divided by this, so a zero here would make the count
+ * infinite — callers must floor it at a positive number.
+ */
+export const DEFAULT_CONTAINER_WAGON_CAPACITY_TONS = 70;
+
+/** Default CW3 gondola rated payload for bulk bookings (T). */
+export const DEFAULT_BULK_WAGON_CAPACITY_TONS = 60;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts
index 6f59ca123..24e908761 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts
@@ -136,6 +136,7 @@ describe('BookingBatchService — PAID reconcile', () => {
         expirePayable: jest.fn().mockResolvedValue(undefined),
       } as never,
       { emitPhase: jest.fn() } as never,
+      { computeSubmitPriorityScore: jest.fn().mockResolvedValue(0) } as never,
     );
   });
 
@@ -563,6 +564,7 @@ describe('BookingBatchService — PAID reconcile', () => {
         trainSchedulingService as never,
         { syncPayableDueDate: jest.fn(), expirePayable: jest.fn() } as never,
         { emitPhase: jest.fn() } as never,
+        { computeSubmitPriorityScore: jest.fn().mockResolvedValue(0) } as never,
         undefined,
         { findOpenOffer: jest.fn() } as never,
       );
@@ -585,6 +587,7 @@ describe('BookingBatchService — PAID reconcile', () => {
         trainSchedulingService as never,
         { syncPayableDueDate: jest.fn(), expirePayable: jest.fn() } as never,
         { emitPhase: jest.fn() } as never,
+        { computeSubmitPriorityScore: jest.fn().mockResolvedValue(0) } as never,
         undefined,
         { findOpenOffer: jest.fn() } as never,
       );
@@ -615,6 +618,7 @@ describe('BookingBatchService — PAID reconcile', () => {
         trainSchedulingService as never,
         { syncPayableDueDate: jest.fn(), expirePayable: jest.fn() } as never,
         { emitPhase: jest.fn() } as never,
+        { computeSubmitPriorityScore: jest.fn().mockResolvedValue(0) } as never,
         undefined,
         { findOpenOffer: jest.fn() } as never,
       );
@@ -630,4 +634,236 @@ describe('BookingBatchService — PAID reconcile', () => {
       expect(check({ ...importGeneral, contractKind: null } as Booking, false)).toBe(false);
     });
   });
+
+  describe('settleDueReservations — expire then promote the waiting list', () => {
+    const originYardId = 'yard-origin';
+    const destinationYardId = 'yard-dest';
+    const trainId = 'train-a';
+    // 14m / 70t default wagon → two wagon slots on this locomotive.
+    const smallLoco = { maxPullWeightTons: 200, maxTrainLengthMeters: 28 };
+
+    const booking = (id: string, priority: number, overrides = {}): Booking =>
+      ({
+        id,
+        reference: id,
+        isGovernment: false,
+        priorityScore: priority,
+        status: 'FULLY_EXECUTED',
+        wagonsRequired: 1,
+        cargoTotalWeightVgm: 10,
+        freightType: 'CONTAINER',
+        bookingContainers: [],
+        originYardId,
+        destinationYardId,
+        trainScheduleId: trainId,
+        ...overrides,
+      }) as unknown as Booking;
+
+    beforeEach(() => {
+      const scheduleRow = {
+        id: trainId,
+        maxWagons: 2,
+        bookingWindowStatus: 'CLOSED',
+        windowPhase: 'PAYMENT',
+        direction: 'IMPORT',
+        trainSetId: `set-${trainId}`,
+        trainSet: { locomotive: smallLoco },
+        scheduleBookings: [],
+        scheduledDepartureDate: new Date('2026-06-20T06:00:00.000Z'),
+        originStationId: originYardId,
+        destinationStationId: destinationYardId,
+      };
+      trainSchedulesRepository.findAll.mockResolvedValue([{ ...scheduleRow }]);
+      trainSchedulesRepository.findByIdWithFullGraph.mockResolvedValue(scheduleRow);
+      trainSchedulesRepository.findById.mockResolvedValue({
+        id: trainId,
+        bookingWindowStatus: 'CLOSED',
+        windowPhase: 'PAYMENT',
+        scheduledDepartureDate: scheduleRow.scheduledDepartureDate,
+        originStationId: originYardId,
+        destinationStationId: destinationYardId,
+      });
+    });
+
+    it('promotes a waiting booking into the wagons an expired reservation frees', async () => {
+      // One reservation whose pay window lapsed, and one booking on the waiting list.
+      const lapsed = booking('lapsed', 50, {
+        status: 'SELECTED_FOR_BATCH',
+        paymentDeadline: new Date(Date.now() - 60_000),
+      });
+      const waiting = booking('waiting', 10, { trainScheduleId: null });
+
+      bookingsRepository.findReservedForSchedule
+        .mockResolvedValueOnce([lapsed]) // settleReserved sees the lapsed one
+        .mockResolvedValue([]); // afterwards nothing is reserved
+      // The day pool the top-up draws from: only the waiting booking is eligible.
+      bookingsRepository.findBatchPoolByCorridorDay
+        .mockResolvedValueOnce([waiting])
+        .mockResolvedValue([]);
+
+      await service.settleDueReservations(trainId);
+
+      // The lapsed reservation expired...
+      expect(notifier.expired).toHaveBeenCalledTimes(1);
+      expect((notifier.expired.mock.calls[0][0] as Booking).id).toBe('lapsed');
+      // ...and the waiting booking was promoted in the SAME settle, not next cycle.
+      expect(notifier.payNow).toHaveBeenCalledTimes(1);
+      expect((notifier.payNow.mock.calls[0][0] as Booking).id).toBe('waiting');
+    });
+
+    it('serialises concurrent settles so the same reservation is not settled twice', async () => {
+      const lapsed = booking('lapsed', 50, {
+        status: 'SELECTED_FOR_BATCH',
+        paymentDeadline: new Date(Date.now() - 60_000),
+      });
+      // Both callers read the reservation; the lock must stop the second from
+      // acting on rows the first already expired. (The PAYMENT transition and the
+      // tick's overdue backstop do exactly this, in the same second.)
+      let reads = 0;
+      bookingsRepository.findReservedForSchedule.mockImplementation(() => {
+        reads += 1;
+        return Promise.resolve(reads === 1 ? [lapsed] : []);
+      });
+      bookingsRepository.findBatchPoolByCorridorDay.mockResolvedValue([]);
+
+      await Promise.all([
+        service.settleDueReservations(trainId),
+        service.settleDueReservations(trainId),
+      ]);
+
+      expect(notifier.expired).toHaveBeenCalledTimes(1);
+    });
+  });
+});
+
+describe('BookingBatchService — wagonsFor', () => {
+  // wagonsFor is pure arithmetic over its two arguments and touches no injected
+  // dependency, so the service can be built with none.
+  const service = new BookingBatchService(
+    null as never,
+    null as never,
+    null as never,
+    null as never,
+    null as never,
+    null as never,
+    null as never,
+    null as never,
+    null as never,
+    null as never,
+  ) as unknown as {
+    wagonsFor(booking: unknown, dims: unknown): number;
+    needFor(booking: unknown, dims: unknown): {
+      wagons: number;
+      weightTons: number;
+      lengthMeters: number;
+    };
+  };
+
+  // PW2 box wagon: 70T rated payload, 25.2T tare, 17.066m.
+  const dims = {
+    container: { lengthMeters: 13.966, tareWeightTons: 22.4, capacityTons: 70 },
+    bulk: { lengthMeters: 17.066, tareWeightTons: 25.2, capacityTons: 70 },
+    byWagonTypeId: new Map(),
+  };
+
+  const bulk = (cargoTons: number, over: Record<string, unknown> = {}) => ({
+    freightType: 'BULK',
+    cargoTotalWeightVgm: cargoTons,
+    bookingContainers: [],
+    ...over,
+  });
+
+  it('sizes a bulk booking by cargo ÷ rated payload, not a flat 1 wagon', () => {
+    // 37 × 1400 fertilizer packages × 50kg = 2590T of cargo.
+    expect(service.wagonsFor(bulk(2590), dims)).toBe(37);
+  });
+
+  it('rounds a partial wagon up', () => {
+    expect(service.wagonsFor(bulk(70.1), dims)).toBe(2);
+    expect(service.wagonsFor(bulk(70), dims)).toBe(1);
+  });
+
+  it('still floors at one wagon when a bulk booking has no recorded cargo', () => {
+    expect(service.wagonsFor(bulk(0), dims)).toBe(1);
+  });
+
+  it('honours an explicit wagonsRequired override', () => {
+    expect(service.wagonsFor(bulk(2590, { wagonsRequired: 40 }), dims)).toBe(40);
+  });
+
+  it('ignores a stale undersized wagonsRequired: 700T of sugar rides 10 wagons, not 1', () => {
+    // Rows written while sumWagonsRequired hardcoded BULK to 1 are still in the
+    // DB; trusting them charged one tare for the whole consist (700 + 25.2
+    // instead of 700 + 10 × 25.2 gross).
+    expect(service.wagonsFor(bulk(700, { wagonsRequired: 1 }), dims)).toBe(10);
+  });
+
+  it('takes the binding axis for containers: weight can exceed TEU geometry', () => {
+    // Two 40ft units => 2 wagons by TEU geometry, but 210T needs 3 at 70T each.
+    const booking = {
+      freightType: 'CONTAINER',
+      cargoTotalWeightVgm: 210,
+      bookingContainers: [
+        { quantity: 2, wagonsRequired: 2, containerType: { wagonsPerUnit: 1, sizeFt: 40 } },
+      ],
+    };
+    expect(service.wagonsFor(booking, dims)).toBe(3);
+  });
+
+  it('keeps TEU geometry when it binds before weight', () => {
+    // Four 20ft units => 2 wagons by geometry; 40T of cargo needs only 1 by weight.
+    const booking = {
+      freightType: 'CONTAINER',
+      cargoTotalWeightVgm: 40,
+      bookingContainers: [
+        { quantity: 4, wagonsRequired: 2, containerType: { wagonsPerUnit: 0.5, sizeFt: 20 } },
+      ],
+    };
+    expect(service.wagonsFor(booking, dims)).toBe(2);
+  });
+
+  describe('per-booking wagon type (cargo/container type FK)', () => {
+    // The booking's cargo type rides PW2 (25.2T tare / 70T), but the
+    // representative bulk fallback is a CW3-ish 23.4T tare. Measuring the
+    // booking on the fallback under-charged its gross (2100 + 30 × 23.4 =
+    // 2802 instead of 2856), so the fill loop admitted sets that allocation's
+    // real-consist check later rejected — after the customer had paid.
+    const dimsWithTypes = {
+      container: { lengthMeters: 13.966, tareWeightTons: 22.4, capacityTons: 70 },
+      bulk: { lengthMeters: 17.066, tareWeightTons: 23.4, capacityTons: 70 },
+      byWagonTypeId: new Map([
+        ['pw2-id', { lengthMeters: 17.066, tareWeightTons: 25.2, capacityTons: 70 }],
+      ]),
+    };
+
+    it('charges a bulk booking the tare of ITS wagon type, not the representative', () => {
+      const booking = bulk(2100, { cargoType: { wagonTypeId: 'pw2-id' } });
+      const need = service.needFor(booking, dimsWithTypes);
+      expect(need.wagons).toBe(30);
+      expect(need.weightTons).toBe(2856); // 2100 + 30 × 25.2 — matches allocation
+    });
+
+    it('falls back to the representative dims when no wagon type is configured', () => {
+      const need = service.needFor(bulk(2100), dimsWithTypes);
+      expect(need.weightTons).toBe(2802); // 2100 + 30 × 23.4 (legacy behavior)
+    });
+
+    it('resolves a container booking through its container type', () => {
+      const booking = {
+        freightType: 'CONTAINER',
+        cargoTotalWeightVgm: 140,
+        bookingContainers: [
+          {
+            quantity: 2,
+            wagonsRequired: 2,
+            containerType: { wagonsPerUnit: 1, sizeFt: 40, wagonTypeId: 'pw2-id' },
+          },
+        ],
+      };
+      const need = service.needFor(booking, dimsWithTypes);
+      expect(need.wagons).toBe(2);
+      expect(need.weightTons).toBe(190.4); // 140 + 2 × 25.2
+      expect(need.lengthMeters).toBeCloseTo(34.132, 3); // 2 × 17.066, not NW5's 13.966
+    });
+  });
 });
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts
index f0ac6f4a4..7dd78d167 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts
@@ -1,6 +1,8 @@
 import {
   BadRequestException,
   ConflictException,
+  forwardRef,
+  Inject,
   Injectable,
   Logger,
   NotFoundException,
@@ -9,10 +11,19 @@ import {
 } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
 import { SchedulerRegistry } from '@nestjs/schedule';
-import { DataSource, In } from 'typeorm';
+import {
+  Between,
+  DataSource,
+  FindOptionsWhere,
+  ILike,
+  In,
+  LessThanOrEqual,
+  MoreThanOrEqual,
+} from 'typeorm';
 
 import { Booking } from '../bookings/entities/booking.entity';
 import { BookingsRepository } from '../bookings/bookings.repository';
+import { BookingPricingService } from '../bookings/booking-pricing.service';
 import { Locomotive } from '../locomotives/entities/locomotive.entity';
 import { formatRouteLabel } from '../routes/entities/route.entity';
 import { RouteMilestone } from '../routes/entities/route-milestone.entity';
@@ -24,13 +35,19 @@ import { TrainSchedulingGlobalRules } from './entities/train-scheduling-global-r
 import { BookingNotifierService } from './booking-notifier.service';
 import { TrainSchedulingService } from './train-scheduling.service';
 import { eatDay, groupBookingsIntoBoardWindows } from './batch-window.util';
+import {
+  BATCH_BOARD_STATUSES,
+  BatchBoardQueryDto,
+} from './dto/batch-board-query.dto';
 import { Freight, TrainScheduleStatus as TrainScheduleStatusEnum } from "@edr/types";
 import { BillingService } from "../billing/billing.service";
 
 
 import {
+  DEFAULT_BULK_WAGON_CAPACITY_TONS,
   DEFAULT_BULK_WAGON_LENGTH_METERS,
   DEFAULT_BULK_WAGON_TARE_TONS,
+  DEFAULT_CONTAINER_WAGON_CAPACITY_TONS,
   DEFAULT_CONTAINER_WAGON_LENGTH_METERS,
   DEFAULT_CONTAINER_WAGON_TARE_TONS,
   DEFAULT_WAGONS_PER_BOOKING,
@@ -38,8 +55,8 @@ import {
 import {
   WagonTypeDimensions,
   bookingGrossWeightTons,
-  bookingTrainLengthMeters,
   deriveTrainCapacityFromLocomotive,
+  sizePartialOfferWagons,
   trainHardCaps,
   wagonTypeDimensionsFromEntity,
 } from './train-capacity.util';
@@ -55,11 +72,18 @@ import {
   Capacity,
   CorridorBudget,
   CorridorLeg,
+  OverageTolerance,
   stopYardsFor,
 } from './corridor-capacity.util';
 
 export type { Capacity } from './corridor-capacity.util';
 
+/**
+ * A train's fill limits: the base caps the corridor budget spends from, plus
+ * the locomotive overage tolerance spendable only on whole-booking admission.
+ */
+type TrainLimits = { base: Capacity; tolerance: OverageTolerance };
+
 /** A day-level pool key: all trains on this route departing on this EAT day. */
 interface RouteDayGroup {
   originYardId: string;
@@ -68,13 +92,20 @@ interface RouteDayGroup {
   day: string;
 }
 
+/** One wagon type's footprint: its length on the train, the tare it adds to the
+ * locomotive's gross load, and the payload it carries. */
+type PerWagonDims = { lengthMeters: number; tareWeightTons: number; capacityTons: number };
+
 /**
- * Per-freight-type wagon dimensions used to size a booking's capacity draw:
- * its length on the train and the tare it adds to the locomotive's gross load.
+ * Wagon dimensions used to size a booking's capacity draw. `byWagonTypeId` holds
+ * every wagon type so a booking is measured on the type its cargo/container type
+ * actually rides (the same FK resolution allocation uses); `container`/`bulk` are
+ * representative fallbacks for bookings whose type has no wagon type configured.
  */
 type WagonDims = {
-  container: { lengthMeters: number; tareWeightTons: number };
-  bulk: { lengthMeters: number; tareWeightTons: number };
+  container: PerWagonDims;
+  bulk: PerWagonDims;
+  byWagonTypeId: Map<string, PerWagonDims>;
 };
 
 export type BatchBoardBookingState =
@@ -139,6 +170,8 @@ export interface BatchWindowGroup {
 
 export interface BatchBoardScheduleDetail {
   scheduleId: string;
+  /** Human-facing schedule reference (S-YYYY-NNNNN). */
+  scheduleReference: string | null;
   trainNumber: string | null;
   routeName: string | null;
   origin: string | null;
@@ -163,11 +196,14 @@ export interface BatchBoardScheduleDetail {
 
 export interface BatchBoardSchedule {
   scheduleId: string;
+  /** Human-facing schedule reference (S-YYYY-NNNNN). */
+  scheduleReference: string | null;
   trainNumber: string | null;
   routeName: string | null;
   origin: string | null;
   destination: string | null;
   scheduleDate: string | null;
+  createdAt: string | null;
   status: string;
   bookingWindowStatus: string;
   direction: string | null;
@@ -206,6 +242,16 @@ export interface BatchBoardSchedule {
   bookings: BatchBoardBooking[];
 }
 
+/** Paginated batch-board list. `items` (not `data`) — the API response wrapper
+ * already uses `data`, and the frontend's unwrap() strips one `data` level. */
+export interface BatchBoardListResponse {
+  items: BatchBoardSchedule[];
+  total: number;
+  page: number;
+  pageSize: number;
+  totalPages: number;
+}
+
 /**
  * Demand-batching engine: every 3h (EAT) it ranks each OPEN schedule's ready pool
  * by priority, greedily fills the train to capacity (skipping bookings that don't fit),
@@ -219,6 +265,14 @@ export interface BatchBoardSchedule {
 export class BookingBatchService implements OnModuleInit {
   private readonly logger = new Logger(BookingBatchService.name);
 
+  /**
+   * Serialises settle/top-up per schedule. The PAYMENT phase transition and the
+   * tick's overdue backstop both call settleDueReservations for the same schedule
+   * in the same second; without this they interleave and the top-up runs against a
+   * schedule whose phase has already been concluded.
+   */
+  private readonly scheduleLocks = new Map<string, Promise<void>>();
+
   constructor(
     @InjectDataSource() private readonly dataSource: DataSource,
     private readonly bookingsRepository: BookingsRepository,
@@ -229,6 +283,8 @@ export class BookingBatchService implements OnModuleInit {
     private readonly trainSchedulingService: TrainSchedulingService,
     private readonly billing: BillingService,
     private readonly bookingWindowGateway: BookingWindowGateway,
+    @Inject(forwardRef(() => BookingPricingService))
+    private readonly pricingService: BookingPricingService,
 
     @Optional() private readonly milestoneService?: ClearanceMilestoneService,
     @Optional() private readonly splitService?: BookingSplitService,
@@ -425,7 +481,7 @@ export class BookingBatchService implements OnModuleInit {
     const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(
       booking.trainScheduleId,
     );
-    if (schedule && (await this.remainingWagons(schedule)) <= 0) {
+    if (schedule && (await this.isTrainFull(schedule))) {
       await this.setWindow(booking.trainScheduleId, "FULL");
     }
 
@@ -555,7 +611,14 @@ export class BookingBatchService implements OnModuleInit {
 
     const partner = await this.dataSource
       .getRepository(Booking)
-      .findOne({ where: { id: partnerId }, relations: { company: true, bookingContainers: true } });
+      .findOne({
+        where: { id: partnerId },
+        relations: {
+          company: true,
+          bookingContainers: { containerType: true },
+          cargoType: true,
+        },
+      });
     // Partner not yet accepted → this booking is now FULLY_EXECUTED and simply
     // waits; the partner's later accept will reserve the pair.
     if (!partner || partner.status !== 'FULLY_EXECUTED') {
@@ -576,7 +639,7 @@ export class BookingBatchService implements OnModuleInit {
     this.armSettle(scheduleId);
     const schedule =
       await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
-    if (schedule && (await this.remainingWagons(schedule)) <= 0) {
+    if (schedule && (await this.isTrainFull(schedule))) {
       await this.setWindow(scheduleId, 'FULL');
     }
   }
@@ -617,19 +680,80 @@ export class BookingBatchService implements OnModuleInit {
   // ---- monitoring board -----------------------------------------------------
 
   /**
-   * Read model for the batch monitoring page: every still-relevant schedule (not arrived/
-   * cancelled) with its locomotive, capacity usage and its bookings grouped by lifecycle
-   * state (allocated / awaiting payment / paid-waiting / pending contract / expired).
+   * Read model for the batch monitoring page: every import schedule — including
+   * dispatched, arrived and cancelled history — with its locomotive, capacity
+   * usage and its bookings grouped by lifecycle state (allocated / awaiting
+   * payment / paid-waiting / pending contract / expired). Paginated and
+   * filterable; per-schedule booking summaries are only computed for the
+   * requested page.
    */
-  async getBatchBoard(): Promise<BatchBoardSchedule[]> {
-    const schedules = await this.trainSchedulesRepository.findAll({
+  async getBatchBoard(
+    query: BatchBoardQueryDto = {},
+  ): Promise<BatchBoardListResponse> {
+    const page = query.page ?? 1;
+    const pageSize = query.pageSize ?? 12;
+
+    // Status filter: any subset of the lifecycle. Omitted = all statuses, so
+    // arrived / cancelled / dispatched schedules stay visible as history.
+    const allowedStatuses = new Set<string>(BATCH_BOARD_STATUSES);
+    const statuses = (query.statuses ?? "")
+      .split(",")
+      .map((v) => v.trim().toUpperCase())
+      .filter((v) => allowedStatuses.has(v));
+
+    const dateRange = (from?: string, to?: string) => {
+      const f = from ? new Date(from) : null;
+      const t = to ? new Date(to) : null;
+      if (f && t) return Between(f, t);
+      if (f) return MoreThanOrEqual(f);
+      if (t) return LessThanOrEqual(t);
+      return undefined;
+    };
+
+    // Batch board is IMPORT-only: export is FCFS with no batch/priority calc,
+    // and domestic/legacy schedules run the legacy fill, not the window batch.
+    const base: FindOptionsWhere<TrainSchedule> = { direction: "IMPORT" };
+    if (statuses.length) base.status = In(statuses) as never;
+    if (query.bookingWindowStatus) {
+      base.bookingWindowStatus = query.bookingWindowStatus;
+    }
+    const departure = dateRange(query.departureFrom, query.departureTo);
+    if (departure) base.scheduledDepartureDate = departure as never;
+    const created = dateRange(query.createdFrom, query.createdTo);
+    if (created) base.createdAt = created as never;
+
+    // Search fans out across every human-recognizable label. Each OR variant
+    // repeats the base filters so the search never widens them.
+    const term = query.search?.trim();
+    let where: FindOptionsWhere<TrainSchedule> | FindOptionsWhere<TrainSchedule>[] =
+      base;
+    if (term) {
+      const like = ILike(`%${term}%`);
+      where = [
+        { ...base, trainNumber: like as never },
+        { ...base, originStation: { label: like } },
+        { ...base, destinationStation: { label: like } },
+        { ...base, route: { originYard: { label: like } } },
+        { ...base, route: { destinationYard: { label: like } } },
+        { ...base, trainSet: { locomotive: { code: like } } },
+      ] as FindOptionsWhere<TrainSchedule>[];
+    }
+
+    const sortBy = query.sortBy ?? "createdAt";
+    const sortOrder = query.sortOrder ?? "DESC";
+
+    const [schedules, total] = await this.trainSchedulesRepository.findAndCount({
+      where,
       relations: {
         trainSet: { locomotive: true },
         originStation: true,
         destinationStation: true,
-        route: true,
+        // Yards supply the route's display name for `routeName` below.
+        route: { originYard: true, destinationYard: true },
       },
-      order: { scheduledDepartureDate: "ASC" },
+      order: { [sortBy]: sortOrder } as never,
+      skip: (page - 1) * pageSize,
+      take: pageSize,
     });
 
     const wagonDims = await this.loadWagonDims();
@@ -638,11 +762,6 @@ export class BookingBatchService implements OnModuleInit {
 
     const board: BatchBoardSchedule[] = [];
     for (const s of schedules) {
-      if (s.status === "ARRIVED" || s.status === "CANCELLED") continue;
-      // Batch board is IMPORT-only: export is FCFS with no batch/priority calc,
-      // and domestic/legacy schedules run the legacy fill, not the window batch.
-      if (s.direction !== "IMPORT") continue;
-
       const links = await linkRepo.find({ where: { trainScheduleId: s.id } });
       const linkedIds = new Set(links.map((l) => l.bookingId));
       const bookings = await this.bookingsRepository.findAllBySchedule(s.id);
@@ -670,7 +789,14 @@ export class BookingBatchService implements OnModuleInit {
 
       board.push(this.buildScheduleSummary(s, items, rules));
     }
-    return board;
+
+    return {
+      items: board,
+      total,
+      page,
+      pageSize,
+      totalPages: Math.max(1, Math.ceil(total / pageSize)),
+    };
   }
 
   /** Schedule-level batch board with EAT 3h windows grouped by fullyExecutedAt. */
@@ -681,9 +807,8 @@ export class BookingBatchService implements OnModuleInit {
       await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
     if (!s)
       throw new NotFoundException(`Train schedule ${scheduleId} not found`);
-    if (s.status === "ARRIVED" || s.status === "CANCELLED") {
-      throw new BadRequestException("Schedule is no longer active");
-    }
+    // Arrived / cancelled schedules stay viewable — the board is also the
+    // historical record of what each train carried.
     // Batch board is IMPORT-only (export is FCFS, no batch/priority calc).
     if (s.direction !== "IMPORT") {
       throw new BadRequestException(
@@ -858,6 +983,7 @@ export class BookingBatchService implements OnModuleInit {
 
     return {
       scheduleId: s.id,
+      scheduleReference: s.reference ?? null,
       trainNumber: s.trainNumber ?? null,
       routeName: s.route ? formatRouteLabel(s.route) : null,
       origin: s.originStation?.label ?? s.originStation?.code ?? null,
@@ -979,6 +1105,7 @@ export class BookingBatchService implements OnModuleInit {
 
     return {
       scheduleId: s.id,
+      scheduleReference: s.reference ?? null,
       trainNumber: s.trainNumber ?? null,
       routeName: s.route ? formatRouteLabel(s.route) : null,
       origin: s.originStation?.label ?? s.originStation?.code ?? null,
@@ -987,6 +1114,7 @@ export class BookingBatchService implements OnModuleInit {
       scheduleDate: s.scheduledDepartureDate
         ? s.scheduledDepartureDate.toISOString()
         : null,
+      createdAt: s.createdAt ? s.createdAt.toISOString() : null,
       status: s.status,
       bookingWindowStatus: s.bookingWindowStatus,
       direction: s.direction ?? null,
@@ -1080,12 +1208,17 @@ export class BookingBatchService implements OnModuleInit {
     const limits = await this.capacityLimits(locomotive, rules);
     await this.syncScheduleMaxWagons(schedule, locomotive, rules);
     const budget = await this.remainingBudget(schedule, limits, wagonDims);
-    if (budget.maxRemaining().wagons <= 0) {
+    const minPerWagon = this.minPerWagonNeed(wagonDims);
+    if (budget.isExhausted(minPerWagon)) {
       await this.setWindow(scheduleId, "FULL");
       return 0;
     }
 
     const pool = await this.bookingsRepository.findBatchPool(scheduleId);
+    // Same bulk re-score as fillRouteDayInternal — the legacy per-schedule fill
+    // must rank bulk bookings by their wagon-derived priority too.
+    await this.recomputeBulkPriorities(pool, wagonDims);
+    this.resortPoolByPriority(pool);
     const units = this.groupConsolidatedPool(pool);
     let armed = false;
     let reservedThisPass = 0;
@@ -1172,7 +1305,7 @@ export class BookingBatchService implements OnModuleInit {
     this.logger.log(
       `[fillSchedule ${scheduleId}] reserved ${reservedThisPass}/${units.length} unit(s) this pass`,
     );
-    if (budget.maxRemaining().wagons <= 0) await this.setWindow(scheduleId, "FULL");
+    if (budget.isExhausted(minPerWagon)) await this.setWindow(scheduleId, "FULL");
     if (armed) this.armSettle(scheduleId);
     void this.triggerWagonAllocation(scheduleId);
     return commercialReserved;
@@ -1303,6 +1436,10 @@ export class BookingBatchService implements OnModuleInit {
       corridorYards,
       day,
     );
+    // BULK bookings only get their real (wagon-derived) priority score now, at
+    // batch time — stamp it and re-rank before the fill consumes the pool.
+    await this.recomputeBulkPriorities(pool, wagonDims);
+    this.resortPoolByPriority(pool);
     // Consolidated partners collapse into one atomic unit (both-or-neither); a
     // consolidated booking whose partner isn't ready this cycle is skipped.
     const units = this.groupConsolidatedPool(pool);
@@ -1416,8 +1553,9 @@ export class BookingBatchService implements OnModuleInit {
       `[fillRouteDay ${originYardId}->${destinationYardId} ${day}] reserved ${reservedThisPass}/${units.length} unit(s) this pass`,
     );
 
+    const minPerWagon = this.minPerWagonNeed(wagonDims);
     for (const t of trains) {
-      if (t.budget.maxRemaining().wagons <= 0) await this.setWindow(t.id, "FULL");
+      if (t.budget.isExhausted(minPerWagon)) await this.setWindow(t.id, "FULL");
       if (t.armed) this.armSettle(t.id);
       void this.triggerWagonAllocation(t.id);
     }
@@ -1493,12 +1631,28 @@ export class BookingBatchService implements OnModuleInit {
     if (await this.splitService.findOpenOffer(booking.id)) return null;
 
     const wagonDims = await this.loadWagonDims();
-    const bulkCapacityTons = await this.loadBulkWagonCapacityTons();
+
+    // The wagon-slot axis alone under-constrains the offer. On a weight- or
+    // length-limited train (slots to spare, but e.g. only 798T of pull weight
+    // left) sizing by slots either produced an offer the fits() check below
+    // rejected, or — when the free slots exceeded the booking's own wagon
+    // count — sizeOffer refused outright, so a bulk booking on a weight-bound
+    // train was never offered a split at all. Size across all three axes,
+    // measured on the booking's REAL wagon type — the same one allocation
+    // validates against. Bulk splits ride FULL wagons only: the offer never
+    // part-loads its last wagon.
+    const perWagon = this.dimsFor(booking, wagonDims);
+    const partial = sizePartialOfferWagons(budget, need.wagons, perWagon, {
+      fullWagonsOnly: booking.freightType === "BULK",
+    });
+    if (!partial) return null;
+
     const sized = await this.splitService.sizeOffer(
       booking,
-      budget.wagons,
+      partial.wagons,
       need.wagons,
-      bulkCapacityTons,
+      perWagon.capacityTons,
+      partial.maxCargoTons,
     );
     if (!sized) return null;
 
@@ -1507,13 +1661,9 @@ export class BookingBatchService implements OnModuleInit {
       weightTons: bookingGrossWeightTons(
         sized.offeredWeightTons,
         sized.offeredWagons,
-        this.tareFor(booking.freightType, wagonDims),
-      ),
-      lengthMeters: bookingTrainLengthMeters(
-        booking.freightType,
-        sized.offeredWagons,
-        this.lengthsOf(wagonDims),
+        perWagon.tareWeightTons,
       ),
+      lengthMeters: sized.offeredWagons * perWagon.lengthMeters,
     };
     if (!this.fits(offeredNeed, budget)) return null;
 
@@ -1531,14 +1681,6 @@ export class BookingBatchService implements OnModuleInit {
     return offeredNeed;
   }
 
-  private async loadBulkWagonCapacityTons(): Promise<number> {
-    const cw3 = await this.dataSource
-      .getRepository(WagonType)
-      .findOne({ where: { code: "CW3" } });
-    const capacity = cw3 ? wagonTypeDimensionsFromEntity(cw3).capacityTons : 60;
-    return capacity > 0 ? capacity : 60;
-  }
-
   /**
    * Settle a schedule's reserved bookings. `expireUnpaidUnknownDeadline` decides
    * how to treat a reservation with no deadline (durable path: leave it; timeout
@@ -1602,21 +1744,92 @@ export class BookingBatchService implements OnModuleInit {
     return anySettled;
   }
 
-  /** Durable settle: allocate paid / expire overdue reservations, then top up. */
+  /**
+   * Durable settle: allocate paid / expire overdue reservations, then top up the
+   * freed capacity from the waiting list.
+   *
+   * Serialised per schedule. Two callers race here every time a payment phase
+   * ends: `advanceImport`'s PAYMENT branch and the tick's `settleOverdueReservations`
+   * backstop. Both read the same reserved rows in the same second, so without the
+   * lock the second caller re-settles rows the first is mid-way through expiring,
+   * and `concludeCycle` observes capacity that is neither pre- nor post-expiry.
+   */
   async settleDueReservations(scheduleId: string): Promise<void> {
-    const anySettled = await this.settleReserved(scheduleId, false);
-    // A settle that allocated/expired anything frees or fills capacity → re-run the
-    // fill so the next waiting-list bookings get a fresh pay window (top-up).
-    if (anySettled) {
+    await this.withScheduleLock(scheduleId, () =>
+      this.settleAndTopUp(scheduleId, false),
+    );
+  }
+
+  /**
+   * Settle, then keep promoting the waiting list until the train can take no more.
+   * Returns whether anything settled.
+   *
+   * One top-up pass is not enough: expiring an N-wagon booking can free room for
+   * several smaller ones, and reserving those can in turn leave room for the next
+   * size down. Loop until a pass reserves nothing, so the batch ends with the train
+   * as full as the pool allows — rather than leaving a booking stranded until the
+   * next window cycle.
+   *
+   * Each round that opens a fresh pay window pushes `paymentPhaseEndsAt` out, so
+   * `concludeCycle` cannot fire before the promoted customers' deadlines.
+   */
+  private async settleAndTopUp(
+    scheduleId: string,
+    expireUnpaidUnknownDeadline: boolean,
+  ): Promise<boolean> {
+    const anySettled = await this.settleReserved(
+      scheduleId,
+      expireUnpaidUnknownDeadline,
+    );
+    if (!anySettled) return false;
+
+    this.logger.log(
+      `[BATCH] settle changed state on ${scheduleId} — running top-up fill for the waiting list`,
+    );
+
+    // Bounded: every round either reserves at least one unit (shrinking the pool)
+    // or breaks. The cap is a backstop against a pathological reserve/expire cycle.
+    let promoted = 0;
+    for (let round = 0; round < 10; round += 1) {
+      const reservedThisRound = await this.topUpFill(scheduleId);
+      if (reservedThisRound <= 0) break;
+      promoted += reservedThisRound;
+      await this.extendPaymentPhaseForTopUp(scheduleId);
+    }
+
+    if (promoted > 0) {
       this.logger.log(
-        `[BATCH] settle changed state on ${scheduleId} — running top-up fill for the waiting list`,
+        `[BATCH] top-up promoted ${promoted} waiting booking(s) onto ${scheduleId} ` +
+          `— payment phase extended for them`,
       );
-      const topUpReserved = await this.topUpFill(scheduleId);
-      // A top-up opened a fresh pay window for waiting bookings — push the
-      // schedule's PAYMENT phase out so the window tick's concludeCycle doesn't
-      // fire before those customers' new deadlines and expire them prematurely.
-      if (topUpReserved > 0) {
-        await this.extendPaymentPhaseForTopUp(scheduleId);
+    }
+    return true;
+  }
+
+  /**
+   * Run `fn` with exclusive access to `scheduleId`. Concurrent callers await the
+   * in-flight run rather than interleaving with it. Single-process only — a second
+   * API replica would need a row lock on the schedule instead.
+   */
+  private async withScheduleLock<T>(
+    scheduleId: string,
+    fn: () => Promise<T>,
+  ): Promise<T> {
+    const inFlight = this.scheduleLocks.get(scheduleId) ?? Promise.resolve();
+    // Chain onto the previous holder; swallow its rejection so one failure does
+    // not poison every later caller's lock.
+    const run = inFlight.catch(() => undefined).then(fn);
+    const gate = run.then(
+      () => undefined,
+      () => undefined,
+    );
+    this.scheduleLocks.set(scheduleId, gate);
+    try {
+      return await run;
+    } finally {
+      // Last one out clears the slot so the map does not grow without bound.
+      if (this.scheduleLocks.get(scheduleId) === gate) {
+        this.scheduleLocks.delete(scheduleId);
       }
     }
   }
@@ -1626,11 +1839,9 @@ export class BookingBatchService implements OnModuleInit {
   /** Allocate paid reservations, expire the rest, then top up. */
   async settleBatch(scheduleId: string): Promise<void> {
     this.removeTimeout(scheduleId);
-    await this.settleReserved(scheduleId, true);
-    const topUpReserved = await this.topUpFill(scheduleId);
-    if (topUpReserved > 0) {
-      await this.extendPaymentPhaseForTopUp(scheduleId);
-    }
+    await this.withScheduleLock(scheduleId, () =>
+      this.settleAndTopUp(scheduleId, true),
+    );
     void this.triggerWagonAllocation(scheduleId);
   }
 
@@ -1665,7 +1876,7 @@ export class BookingBatchService implements OnModuleInit {
     const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(
       booking.trainScheduleId,
     );
-    if (schedule && (await this.remainingWagons(schedule)) <= 0) {
+    if (schedule && (await this.isTrainFull(schedule))) {
       await this.setWindow(booking.trainScheduleId, "FULL");
     }
     void this.triggerWagonAllocation(booking.trainScheduleId!);
@@ -1839,8 +2050,9 @@ export class BookingBatchService implements OnModuleInit {
       "PREPAID",
     );
     await this.notifier.payNow(booking, deadline);
+    const reservedWagons = this.wagonsFor(booking, await this.loadWagonDims());
     this.logger.log(
-      `[BATCH] RESERVED ${booking.reference} (${this.wagonsFor(booking)}w, ` +
+      `[BATCH] RESERVED ${booking.reference} (${reservedWagons}w, ` +
         `priority ${booking.priorityScore ?? 0}) on schedule ${scheduleId} — ` +
         `pay by ${deadline.toISOString()}`,
     );
@@ -2157,12 +2369,23 @@ export class BookingBatchService implements OnModuleInit {
     const containers = (b: Booking): number =>
       (b.bookingContainers ?? []).reduce((sum, c) => sum + Number(c.quantity ?? 0), 0);
     const totalContainers = containers(primary) + containers(partner);
-    const sharedWagons =
-      totalContainers > 0
-        ? Math.ceil(totalContainers / MAX_TEU_SLOTS_PER_WAGON)
-        : this.wagonsFor(primary) + this.wagonsFor(partner);
     const cargoTons =
       Number(primary.cargoTotalWeightVgm ?? 0) + Number(partner.cargoTotalWeightVgm ?? 0);
+
+    // Consolidation shares TEU slots, never rated payload: the pair still needs
+    // enough wagons to carry its combined cargo, so the weight axis bounds the
+    // shared count exactly as it bounds an individual booking's. A pair shares
+    // wagons, so the primary's wagon type stands for both partners.
+    const dims = this.dimsFor(primary, wagonDims);
+    const capacityTons = dims.capacityTons;
+    const byWeight =
+      cargoTons > 0 && capacityTons > 0 ? Math.ceil(cargoTons / capacityTons) : 0;
+    const byLength =
+      totalContainers > 0
+        ? Math.ceil(totalContainers / MAX_TEU_SLOTS_PER_WAGON)
+        : this.wagonsFor(primary, wagonDims) + this.wagonsFor(partner, wagonDims);
+    const sharedWagons = Math.max(byLength, byWeight);
+
     return {
       wagons: sharedWagons,
       // Consolidation saves tare as well as slots: the pair rides `sharedWagons`
@@ -2170,43 +2393,95 @@ export class BookingBatchService implements OnModuleInit {
       weightTons: bookingGrossWeightTons(
         cargoTons,
         sharedWagons,
-        this.tareFor(primary.freightType, wagonDims),
-      ),
-      lengthMeters: bookingTrainLengthMeters(
-        primary.freightType,
-        sharedWagons,
-        this.lengthsOf(wagonDims),
+        dims.tareWeightTons,
       ),
+      lengthMeters: sharedWagons * dims.lengthMeters,
     };
   }
 
-  /** Per-wagon tare for the wagon type this freight rides on. */
-  private tareFor(freightType: string | null | undefined, wagonDims: WagonDims): number {
-    return freightType === 'BULK'
-      ? wagonDims.bulk.tareWeightTons
-      : wagonDims.container.tareWeightTons;
-  }
-
-  private lengthsOf(wagonDims: WagonDims): { container: number; bulk: number } {
-    return {
-      container: wagonDims.container.lengthMeters,
-      bulk: wagonDims.bulk.lengthMeters,
-    };
-  }
-
-  private wagonsFor(booking: Booking): number {
-    if (booking.wagonsRequired && booking.wagonsRequired > 0) {
-      return Math.ceil(booking.wagonsRequired);
+  /**
+   * Stamp real priority scores on the pool's BULK bookings before the batch
+   * ranks it. Submit-time scoring runs with totalWagons = 0 for bulk (a bulk
+   * booking has no container lines to carry a wagon count), so every
+   * wagon-range priority config missed and bulk import bookings entered the
+   * batch at score 0 — they were never prioritized. Their wagon footprint is
+   * derivable from tonnage vs. live wagon capacity (wagonsFor), so the score
+   * is computed here — when doc review closes and the batch runs — and
+   * persisted so the priority board shows the same ranking. The pool arrives
+   * SQL-ordered by the old scores; the caller must re-sort after this.
+   */
+  private async recomputeBulkPriorities(
+    pool: Booking[],
+    wagonDims: WagonDims,
+  ): Promise<void> {
+    for (const booking of pool) {
+      if (booking.freightType !== 'BULK') continue;
+      try {
+        const wagons = this.wagonsFor(booking, wagonDims);
+        const score = await this.pricingService.computeSubmitPriorityScore(
+          booking,
+          wagons,
+        );
+        if (Number(booking.priorityScore ?? 0) === score) continue;
+        await this.dataSource
+          .getRepository(Booking)
+          .update(booking.id, { priorityScore: score });
+        booking.priorityScore = score;
+      } catch (err) {
+        // A failed recompute keeps the stored score — never blocks the batch.
+        this.logger.warn(
+          `Bulk priority recompute failed for ${booking.reference ?? booking.id}: ` +
+            `${(err as Error).message}`,
+        );
+      }
     }
-    // booking.wagonsRequired is NULL for most rows (only set on certain
-    // scheduling paths). Derive from the container lines, TEU-aware: two 20ft
-    // share one wagon (wagonsPerUnit = 0.5). The old fallback summed raw
-    // container QUANTITY, so 20×20ft counted as 20 wagons instead of 10 and
-    // wrongly filled the train.
-    const fromContainers = containerWagonsForLines(
-      booking.bookingContainers ?? [],
+  }
+
+  /** Restore the batch pool ordering (mirrors findBatchPool's ORDER BY) after scores changed. */
+  private resortPoolByPriority(pool: Booking[]): void {
+    pool.sort(
+      (a, b) =>
+        Number(b.isGovernment) - Number(a.isGovernment) ||
+        Number(b.priorityScore ?? 0) - Number(a.priorityScore ?? 0) ||
+        (a.fullyExecutedAt?.getTime() ?? Infinity) -
+          (b.fullyExecutedAt?.getTime() ?? Infinity) ||
+        a.createdAt.getTime() - b.createdAt.getTime(),
     );
-    return Math.max(DEFAULT_WAGONS_PER_BOOKING, fromContainers);
+  }
+
+  /**
+   * Wagons a booking occupies. Two axes bind independently and the booking needs
+   * enough wagons to satisfy BOTH, so the count is the larger of:
+   *
+   *   weight — ceil(cargoTons / wagonType.capacityTons), the rated payload
+   *   length — TEU geometry, two 20ft to a wagon (container bookings only)
+   *
+   * The weight axis was missing entirely. A BULK booking carries no container
+   * lines, so `containerWagonsForLines` returned 0 and every bulk booking
+   * collapsed to a single wagon no matter its tonnage — a 2590T fertilizer
+   * booking counted as 1 wagon, and `needFor` then charged 1 tare instead of 37.
+   * That under-reported the board and let the fill loop overbook the train.
+   */
+  private wagonsFor(booking: Booking, wagonDims: WagonDims): number {
+    // Stored wagonsRequired is a candidate, never an early return: rows written
+    // while sumWagonsRequired hardcoded BULK to 1 wagon are still in the DB, and
+    // trusting them charged one tare for a whole bulk consist (a 700T booking on
+    // 70T wagons read 700 + 1 tare instead of 700 + 10 tares).
+    const stored =
+      booking.wagonsRequired && booking.wagonsRequired > 0
+        ? Math.ceil(booking.wagonsRequired)
+        : 0;
+
+    // TEU-aware: two 20ft share one wagon (wagonsPerUnit = 0.5). The old fallback
+    // summed raw container QUANTITY, so 20×20ft counted as 20 wagons, not 10.
+    const byLength = containerWagonsForLines(booking.bookingContainers ?? []);
+
+    const capacityTons = this.dimsFor(booking, wagonDims).capacityTons;
+    const cargoTons = Number(booking.cargoTotalWeightVgm ?? 0);
+    const byWeight =
+      cargoTons > 0 && capacityTons > 0 ? Math.ceil(cargoTons / capacityTons) : 0;
+
+    return Math.max(DEFAULT_WAGONS_PER_BOOKING, stored, byLength, byWeight);
   }
 
   /**
@@ -2218,19 +2493,16 @@ export class BookingBatchService implements OnModuleInit {
    * 37-wagon box-wagon train read 2590T when it really weighed 3522T.
    */
   private needFor(booking: Booking, wagonDims: WagonDims): Capacity {
-    const wagons = this.wagonsFor(booking);
+    const wagons = this.wagonsFor(booking, wagonDims);
+    const dims = this.dimsFor(booking, wagonDims);
     return {
       wagons,
       weightTons: bookingGrossWeightTons(
         Number(booking.cargoTotalWeightVgm ?? 0),
         wagons,
-        this.tareFor(booking.freightType, wagonDims),
-      ),
-      lengthMeters: bookingTrainLengthMeters(
-        booking.freightType,
-        wagons,
-        this.lengthsOf(wagonDims),
+        dims.tareWeightTons,
       ),
+      lengthMeters: wagons * dims.lengthMeters,
     };
   }
 
@@ -2243,14 +2515,16 @@ export class BookingBatchService implements OnModuleInit {
   }
 
   /**
-   * Hard caps for a schedule's train: gross pull weight, train length, and the
+   * Caps for a schedule's train: gross pull weight, train length, and the
    * length-derived wagon slot count (never a fixed 53). Bookings spend against
-   * these via {@link needFor}, whose weight axis is gross.
+   * `base` via {@link needFor}, whose weight axis is gross. The locomotive's
+   * overage tolerance is returned separately — the corridor budget spends it
+   * only to admit a booking whole, never to size a split.
    */
   private async capacityLimits(
     locomotive: Locomotive,
     rules: TrainSchedulingGlobalRules | null,
-  ): Promise<Capacity> {
+  ): Promise<TrainLimits> {
     const wagonTypes = await this.loadWagonTypeDimensions();
     const derived = deriveTrainCapacityFromLocomotive(
       {
@@ -2270,9 +2544,15 @@ export class BookingBatchService implements OnModuleInit {
       },
     );
     return {
-      wagons: derived.maxWagonSlots,
-      weightTons: derived.maxWeightTons,
-      lengthMeters: derived.maxLengthMeters,
+      base: {
+        wagons: derived.maxWagonSlots,
+        weightTons: derived.baseWeightTons,
+        lengthMeters: derived.baseLengthMeters,
+      },
+      tolerance: {
+        weightTons: derived.toleranceTons,
+        lengthMeters: derived.toleranceMeters,
+      },
     };
   }
 
@@ -2283,11 +2563,11 @@ export class BookingBatchService implements OnModuleInit {
     rules: TrainSchedulingGlobalRules | null,
   ): Promise<void> {
     const limits = await this.capacityLimits(locomotive, rules);
-    if ((schedule.maxWagons ?? 0) !== limits.wagons) {
+    if ((schedule.maxWagons ?? 0) !== limits.base.wagons) {
       await this.dataSource
         .getRepository(TrainSchedule)
-        .update(schedule.id, { maxWagons: limits.wagons });
-      schedule.maxWagons = limits.wagons;
+        .update(schedule.id, { maxWagons: limits.base.wagons });
+      schedule.maxWagons = limits.base.wagons;
     }
   }
 
@@ -2314,25 +2594,64 @@ export class BookingBatchService implements OnModuleInit {
     ];
   }
 
-  /** Representative wagon per freight type: NW5 flat for containers, CW3 gondola for bulk. */
+  /**
+   * Every wagon type keyed by id (drives per-booking dims via the cargo/container
+   * type's wagon_type_id FK), plus representative fallbacks per freight type
+   * (NW5 flat for containers, CW3 gondola for bulk) for bookings whose type has
+   * no wagon type configured yet.
+   */
   private async loadWagonDims(): Promise<WagonDims> {
-    const types = await this.dataSource.getRepository(WagonType).find({
-      where: [{ code: "NW5" }, { code: "CW3" }],
-    });
+    const types = await this.dataSource.getRepository(WagonType).find();
     const byCode = new Map(
       types.map((t) => [t.code, wagonTypeDimensionsFromEntity(t)]),
     );
+    const byWagonTypeId = new Map(
+      types.map((t) => [t.id, wagonTypeDimensionsFromEntity(t)]),
+    );
     const nw5 = byCode.get("NW5");
     const cw3 = byCode.get("CW3");
+    // capacityTons divides a bulk booking's cargo, so a 0 or missing rated payload
+    // must fall back rather than yield an infinite wagon count.
+    const payload = (value: number | undefined, fallback: number): number =>
+      value && value > 0 ? value : fallback;
     return {
       container: {
         lengthMeters: nw5?.lengthMeters ?? DEFAULT_CONTAINER_WAGON_LENGTH_METERS,
         tareWeightTons: nw5?.tareWeightTons ?? DEFAULT_CONTAINER_WAGON_TARE_TONS,
+        capacityTons: payload(nw5?.capacityTons, DEFAULT_CONTAINER_WAGON_CAPACITY_TONS),
       },
       bulk: {
         lengthMeters: cw3?.lengthMeters ?? DEFAULT_BULK_WAGON_LENGTH_METERS,
         tareWeightTons: cw3?.tareWeightTons ?? DEFAULT_BULK_WAGON_TARE_TONS,
+        capacityTons: payload(cw3?.capacityTons, DEFAULT_BULK_WAGON_CAPACITY_TONS),
       },
+      byWagonTypeId,
+    };
+  }
+
+  /**
+   * Dimensions of the wagon type THIS booking rides: bulk resolves through its
+   * cargo type's wagon_type_id, container through the first container line's
+   * type — the same FK resolution `resolveWagonType` applies when the paid
+   * booking is allocated. Board/fill math measured on a representative wagon
+   * while allocation validated the real one let a selected batch flunk the
+   * post-payment gross-weight check; sharing the resolution closes that gap.
+   * Falls back to the representative dims when the FK or relation is absent.
+   */
+  private dimsFor(booking: Booking, wagonDims: WagonDims): PerWagonDims {
+    const fallback =
+      booking.freightType === "BULK" ? wagonDims.bulk : wagonDims.container;
+    const wagonTypeId =
+      booking.freightType === "BULK"
+        ? booking.cargoType?.wagonTypeId
+        : (booking.bookingContainers ?? [])
+            .map((line) => line.containerType?.wagonTypeId)
+            .find((id): id is string => Boolean(id));
+    const dims = wagonTypeId ? wagonDims.byWagonTypeId.get(wagonTypeId) : undefined;
+    if (!dims) return fallback;
+    return {
+      ...dims,
+      capacityTons: dims.capacityTons > 0 ? dims.capacityTons : fallback.capacityTons,
     };
   }
 
@@ -2368,11 +2687,11 @@ export class BookingBatchService implements OnModuleInit {
    */
   private async remainingBudget(
     schedule: TrainSchedule,
-    limits: Capacity,
+    limits: TrainLimits,
     wagonDims: WagonDims,
   ): Promise<CorridorBudget> {
     const stops = await this.stopsForSchedule(schedule);
-    const budget = new CorridorBudget(stops, limits);
+    const budget = new CorridorBudget(stops, limits.base, limits.tolerance);
     const allocated = (schedule.scheduleBookings ?? [])
       .map((sb) => sb.booking)
       .filter((b): b is Booking => Boolean(b));
@@ -2390,16 +2709,21 @@ export class BookingBatchService implements OnModuleInit {
 
   /**
    * Wagon slots still boardable somewhere on the corridor (most-open edge).
-   * ≤ 0 means no leg can take another booking — the train-wide FULL signal.
+   * ≤ 0 means no leg can take another booking. Slot axis ONLY — the train-wide
+   * FULL signal is {@link isTrainFull}, which also closes weight/length-bound
+   * trains that still show free slots.
    */
   private async remainingWagons(schedule: TrainSchedule): Promise<number> {
     const wagonDims = await this.loadWagonDims();
     const budget = await this.remainingBudget(
       schedule,
       {
-        wagons: schedule.maxWagons ?? 0,
-        weightTons: Number.POSITIVE_INFINITY,
-        lengthMeters: Number.POSITIVE_INFINITY,
+        base: {
+          wagons: schedule.maxWagons ?? 0,
+          weightTons: Number.POSITIVE_INFINITY,
+          lengthMeters: Number.POSITIVE_INFINITY,
+        },
+        tolerance: { weightTons: 0, lengthMeters: 0 },
       },
       wagonDims,
     );
@@ -2426,12 +2750,78 @@ export class BookingBatchService implements OnModuleInit {
     }
   }
 
-  /** No wagon slots left for allocated + reserved bookings. */
+  /**
+   * A reservation on this schedule still has time left to pay.
+   *
+   * The PAYMENT phase ends a hair BEFORE its own reservations do: `paymentPhaseEndsAt`
+   * is stamped when the phase starts, then `reserve()` gives each booking
+   * `now + paymentWindow` a few hundred milliseconds later, one booking at a time. So
+   * the first settle after the phase deadline finds every reservation still in date,
+   * expires nothing, reports `anySettled = false`, runs no top-up — and the caller
+   * concludes the cycle out from under customers who still had time to pay. The next
+   * tick then expires them with no cycle left to promote the waiting list into.
+   *
+   * Callers must not conclude the cycle while this returns true.
+   */
+  async hasLiveReservations(scheduleId: string): Promise<boolean> {
+    const reserved =
+      await this.bookingsRepository.findReservedForSchedule(scheduleId);
+    const now = Date.now();
+    return reserved.some(
+      (b) =>
+        b.paymentStatus !== "PAID" &&
+        b.status !== "PAID" &&
+        b.paymentDeadline != null &&
+        b.paymentDeadline.getTime() > now,
+    );
+  }
+
+  /**
+   * FULL on ANY capacity axis: out of wagon slots, or out of pull weight /
+   * train length for even one more loaded wagon. The old slot-only check let
+   * a weight-bound train (PW2: weight binds at 37 wagons = 3522.4T of
+   * 3500+90T, slots bind at 44) cycle its booking window forever instead of
+   * finalizing — 7 phantom slots kept it "not full" while nothing could board.
+   */
   async isScheduleFull(scheduleId: string): Promise<boolean> {
     const schedule =
       await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
     if (!schedule) return false;
-    return (await this.remainingWagons(schedule)) <= 0;
+    return this.isTrainFull(schedule);
+  }
+
+  /** See {@link isScheduleFull} — same check for callers that already hold the full graph. */
+  private async isTrainFull(schedule: TrainSchedule): Promise<boolean> {
+    if ((await this.remainingWagons(schedule)) <= 0) return true;
+    const locomotive = schedule.trainSet?.locomotive;
+    if (!locomotive) return false; // no weight/length limits to bind against
+    const rules = await this.loadGlobalRules();
+    const wagonDims = await this.loadWagonDims();
+    const limits = await this.capacityLimits(locomotive, rules);
+    const budget = await this.remainingBudget(schedule, limits, wagonDims);
+    return budget.isExhausted(this.minPerWagonNeed(wagonDims));
+  }
+
+  /**
+   * Smallest gross weight / shortest length one more wagon could add: the
+   * lightest wagon type at its rated payload. Feeds CorridorBudget.isExhausted,
+   * so FULL is only declared when not even this wagon fits anywhere.
+   */
+  private minPerWagonNeed(wagonDims: WagonDims): {
+    grossWeightTons: number;
+    lengthMeters: number;
+  } {
+    const all = [
+      wagonDims.container,
+      wagonDims.bulk,
+      ...wagonDims.byWagonTypeId.values(),
+    ];
+    return {
+      grossWeightTons: Math.min(
+        ...all.map((d) => d.tareWeightTons + d.capacityTons),
+      ),
+      lengthMeters: Math.min(...all.map((d) => d.lengthMeters)),
+    };
   }
 
   /**
@@ -2452,7 +2842,10 @@ export class BookingBatchService implements OnModuleInit {
     const schedule =
       await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
     if (!schedule || schedule.bookingWindowStatus !== "FULL") return;
-    if ((await this.remainingWagons(schedule)) <= 0) return;
+    // Symmetric with isScheduleFull: a weight/length-bound FULL is not stale
+    // just because slots remain — clearing it here would reopen a train
+    // nothing can board.
+    if (await this.isTrainFull(schedule)) return;
 
     const customerWindowOpen =
       schedule.windowPhase == null || schedule.windowPhase === "OPEN";
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-journey.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-journey.service.ts
index cdc58083c..2df741bd3 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-journey.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-journey.service.ts
@@ -28,6 +28,9 @@ import { TrainCheckpointEvent } from './entities/train-checkpoint-event.entity';
  * unload at its destination yard (IN_TRANSIT → ARRIVED for import/export,
  * → COMPLETED for intercity), possibly long before the train's final arrival.
  * Both are gated on the train's latest recorded checkpoint being at that yard.
+ * Unload also fires automatically: recording a checkpoint at a yard auto-
+ * unloads every booking destined there (autoUnloadAtYard), so the manual
+ * unload endpoint remains only a fallback.
  *
  * Unloading also settles the physical wagons: each wagon that alights with the
  * booking is released at that yard and the move is written to the
@@ -198,6 +201,47 @@ export class BookingJourneyService {
     };
   }
 
+  /**
+   * Auto-unload on checkpoint: every IN_TRANSIT booking on this schedule whose
+   * destination is the yard the train just reached alights automatically, so
+   * the customer's booking flips to ARRIVED (COMPLETED for intercity) the
+   * moment the train is recorded at their yard — no separate operator unload.
+   * Runs through the same per-booking unload path (wagon settle + ledger +
+   * milestones); one booking's failure is logged and never blocks the
+   * checkpoint or the other bookings. Returns the unloaded booking ids.
+   */
+  async autoUnloadAtYard(
+    scheduleId: string,
+    yardId: string,
+    userId?: string | null,
+  ): Promise<string[]> {
+    const bookings = await this.dataSource
+      .getRepository(Booking)
+      .createQueryBuilder('booking')
+      .innerJoin(
+        'freight.train_schedule_bookings',
+        'tsb',
+        'tsb.booking_id = booking.id AND tsb.train_schedule_id = :scheduleId AND tsb.deleted_at IS NULL',
+        { scheduleId },
+      )
+      .where('booking.destination_yard_id = :yardId', { yardId })
+      .andWhere(`booking.status = 'IN_TRANSIT'`)
+      .getMany();
+
+    const unloaded: string[] = [];
+    for (const booking of bookings) {
+      try {
+        await this.unloadBooking(scheduleId, booking.id, userId);
+        unloaded.push(booking.id);
+      } catch (err) {
+        this.logger.warn(
+          `Auto-unload failed for booking ${booking.id} at yard ${yardId}: ${(err as Error).message}`,
+        );
+      }
+    }
+    return unloaded;
+  }
+
   /**
    * Bulk fallback at the train's FINAL arrival: any booking destined for the
    * final yard that operators didn't unload individually gets its per-booking
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-split.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-split.service.ts
index 44886f116..ad0967cf0 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-split.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-split.service.ts
@@ -36,6 +36,9 @@ export interface SizedOffer {
  * rows, so reducing the lines releases it automatically) and can be rebooked in
  * any later window within contract validity. A ONE_TIME contract is promoted to
  * GENERAL on split (see applySplit) so its remainder is actually rebookable.
+ * Once the remainder is rebooked and the cap hits zero, ContractBookingService
+ * completes the contract (CONTRACT_CLOSED): no further bookings or shipment
+ * requests, even while validity and a booking window are still open.
  */
 @Injectable()
 export class BookingSplitService {
@@ -55,12 +58,17 @@ export class BookingSplitService {
    * Size the largest part of the booking that fits `freeWagons`, priced via an
    * in-memory clone. Returns null when nothing meaningful fits (no whole
    * container unit / no bulk tonnage, or pricing failed).
+   *
+   * `maxOfferedWeightTons` caps the offered CARGO tonnage (bulk only) — on a
+   * weight-limited train the wagons' own tare eats into the locomotive's
+   * remaining pull weight, so the caller passes the room left after tare.
    */
   async sizeOffer(
     booking: Booking,
     freeWagons: number,
     totalWagons: number,
     bulkWagonCapacityTons: number,
+    maxOfferedWeightTons?: number,
   ): Promise<SizedOffer | null> {
     if (freeWagons < 1 || freeWagons >= totalWagons) return null;
 
@@ -110,10 +118,15 @@ export class BookingSplitService {
       if (!offeredLines.length || offeredWagons <= 0) return null;
       clone.bookingContainers = clonedContainers;
     } else {
-      // Bulk: split by weight — the offered part is what freeWagons can carry.
+      // Bulk: split by weight — the offered part is what freeWagons can carry,
+      // further capped by the caller's weight room when the pull limit binds.
       const totalWeight = Number(booking.cargoTotalWeightVgm ?? 0);
       if (totalWeight <= 0 || bulkWagonCapacityTons <= 0) return null;
-      offeredWeightTons = Math.min(totalWeight, freeWagons * bulkWagonCapacityTons);
+      offeredWeightTons = Math.min(
+        totalWeight,
+        freeWagons * bulkWagonCapacityTons,
+        maxOfferedWeightTons ?? Number.POSITIVE_INFINITY,
+      );
       if (offeredWeightTons <= 0) return null;
       offeredWagons = Math.min(
         freeWagons,
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts
index f96c388f8..3286da0eb 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts
@@ -17,6 +17,8 @@ describe('BookingWindowService — window state machine', () => {
     expireUnacceptedForRouteDay: jest.Mock;
     settleDueReservations: jest.Mock;
     isScheduleFull: jest.Mock;
+    hasLiveReservations: jest.Mock;
+    refreshWindowStatus: jest.Mock;
   };
   let trainSchedulesRepository: { findById: jest.Mock; findAll: jest.Mock };
   let trainSchedulingService: { finalizeSchedule: jest.Mock; getWindowConfig: jest.Mock };
@@ -68,6 +70,9 @@ describe('BookingWindowService — window state machine', () => {
       expireUnacceptedForRouteDay: jest.fn().mockResolvedValue(undefined),
       settleDueReservations: jest.fn().mockResolvedValue(undefined),
       isScheduleFull: jest.fn().mockResolvedValue(false),
+      // No reservation is mid-pay-window by default, so the cycle concludes.
+      hasLiveReservations: jest.fn().mockResolvedValue(false),
+      refreshWindowStatus: jest.fn().mockResolvedValue(undefined),
     };
     trainSchedulesRepository = {
       findById: jest.fn().mockResolvedValue(null),
@@ -154,6 +159,26 @@ describe('BookingWindowService — window state machine', () => {
     expect(batch.settleDueReservations).toHaveBeenCalledWith(scheduleId);
   });
 
+  it('PAYMENT holds the cycle open while a reservation is still inside its pay window', async () => {
+    // `paymentPhaseEndsAt` is stamped when the phase starts; reserve() then sets each
+    // booking's own deadline milliseconds later. So the phase deadline always passes
+    // first, and concluding here would kill customers who still had time to pay — and
+    // leave no cycle for the waiting-list top-up to run in.
+    batch.hasLiveReservations.mockResolvedValue(true);
+    const s = baseSchedule({
+      windowPhase: 'PAYMENT',
+      paymentPhaseEndsAt: new Date('2026-07-01T02:30:00.000Z'),
+    });
+
+    const advanced = await advanceImport(s, new Date('2026-07-01T02:30:01.000Z'));
+
+    expect(advanced).toBe(true);
+    expect(batch.settleDueReservations).toHaveBeenCalledWith(scheduleId);
+    // Still PAYMENT — the cycle was NOT concluded and the window did not reopen.
+    expect(s.windowPhase).toBe('PAYMENT');
+    expect(batch.isScheduleFull).not.toHaveBeenCalled();
+  });
+
   it('conclude: train FULL → window FULL + phase DONE + auto-finalize', async () => {
     batch.isScheduleFull.mockResolvedValue(true);
     const s = baseSchedule({ windowPhase: 'PAYMENT' });
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts
index f1978b762..a730b6aa6 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts
@@ -304,6 +304,38 @@ export class BookingWindowService implements OnModuleInit {
           `(allocate paid / expire unpaid) then concluding the cycle`,
       );
       await this.bookingBatchService.settleDueReservations(schedule.id);
+
+      // The settle expires unpaid reservations and promotes the waiting list into
+      // the wagons they free. Those promoted customers get a fresh pay window, and
+      // `extendPaymentPhaseForTopUp` pushes `paymentPhaseEndsAt` past `now` to
+      // cover it. Concluding here on the STALE in-memory timestamp would end the
+      // cycle the top-up just extended and expire them before they could pay — so
+      // re-read, and stay in PAYMENT if the deadline moved.
+      const settled = await this.trainSchedulesRepository.findById(schedule.id);
+      if (settled?.paymentPhaseEndsAt && now < settled.paymentPhaseEndsAt) {
+        schedule.paymentPhaseEndsAt = settled.paymentPhaseEndsAt;
+        this.logger.log(
+          `[WINDOW] ${schedule.id} PAYMENT extended to ` +
+            `${settled.paymentPhaseEndsAt.toISOString()} — waiting-list bookings were ` +
+            `promoted into the freed wagons; not concluding this cycle yet`,
+        );
+        return true;
+      }
+
+      // `paymentPhaseEndsAt` is stamped when the phase starts; each reservation's own
+      // deadline is set milliseconds later, per booking, so the phase always expires
+      // a fraction before the reservations it opened. Concluding here would end the
+      // cycle while customers still had time to pay, and the settle that finally
+      // expires them (next tick) would have no cycle left to promote the waiting
+      // list into. Hold in PAYMENT until every reservation has actually resolved.
+      if (await this.bookingBatchService.hasLiveReservations(schedule.id)) {
+        this.logger.log(
+          `[WINDOW] ${schedule.id} PAYMENT phase past its deadline but reservations ` +
+            `are still within their pay windows — holding the cycle open`,
+        );
+        return true;
+      }
+
       await this.concludeCycle(schedule, cfg, now);
       return true;
     }
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/corridor-capacity.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/corridor-capacity.util.spec.ts
new file mode 100644
index 000000000..15d065d09
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/train-scheduling/corridor-capacity.util.spec.ts
@@ -0,0 +1,120 @@
+import { Capacity, CorridorBudget } from './corridor-capacity.util';
+import { sizePartialOfferWagons } from './train-capacity.util';
+
+describe('corridor-capacity.util — overage tolerance', () => {
+  const pw2 = { lengthMeters: 17.066, capacityTons: 70, tareWeightTons: 25.2 };
+  const stops = ['yard-a', 'yard-b'];
+  const base: Capacity = { wagons: 44, weightTons: 3500, lengthMeters: 760 };
+  const tolerance = { weightTons: 90, lengthMeters: 0 };
+
+  const need = (weightTons: number, wagons = 1, lengthMeters = 17): Capacity => ({
+    wagons,
+    weightTons,
+    lengthMeters,
+  });
+
+  const budgetAt = (usedWeightTons: number): CorridorBudget => {
+    const budget = new CorridorBudget(stops, base, tolerance);
+    budget.subtract(need(usedWeightTons, 10, 170), budget.fullLeg());
+    return budget;
+  };
+
+  it('admits a whole booking that overflows the base cap by less than the tolerance', () => {
+    // 3500T train, 90T tolerance, 3560T committed: a 25T booking still boards
+    // entire (3585 ≤ 3590).
+    const budget = budgetAt(3560);
+    expect(budget.fits(need(25), budget.fullLeg())).toBe(true);
+  });
+
+  it('rejects a whole booking that overflows past the tolerance — no partial admission', () => {
+    // Same train at 3560T: a 210T booking would need 3770 > 3590 — skipped.
+    const budget = budgetAt(3560);
+    expect(budget.fits(need(210), budget.fullLeg())).toBe(false);
+  });
+
+  it('caps stacked overage admissions at base + tolerance', () => {
+    // Small units may keep boarding inside the overage zone, but never past it.
+    const budget = budgetAt(3560);
+    budget.subtract(need(25), budget.fullLeg()); // now 3585 committed
+    expect(budget.fits(need(5), budget.fullLeg())).toBe(true); // 3590 exactly
+    expect(budget.fits(need(6), budget.fullLeg())).toBe(false); // 3591 > 3590
+  });
+
+  it('excludes the tolerance from remainingFor, so split room never reaches into it', () => {
+    const budget = budgetAt(3400);
+    expect(budget.remainingFor(budget.fullLeg()).weightTons).toBe(100);
+    // Once a whole-unit admission spends the tolerance, base room goes negative.
+    const over = budgetAt(3560);
+    expect(over.remainingFor(over.fullLeg()).weightTons).toBe(-60);
+  });
+
+  it('yields no split offer once the base cap is spent — tolerance is whole-bookings-only', () => {
+    // The batch engine sizes splits from remainingFor; at/over base capacity
+    // that room cannot carry even one part-loaded wagon, so no offer opens.
+    const over = budgetAt(3560);
+    const room = over.remainingFor(over.fullLeg());
+    expect(sizePartialOfferWagons(room, 15, pw2)).toBeNull();
+  });
+
+  it('still offers a split while committed weight is under the base cap', () => {
+    // 744T of base room left: the boundary booking is offered the part that
+    // fits up to 3500, not up to 3590.
+    const budget = budgetAt(2756);
+    const room = budget.remainingFor(budget.fullLeg());
+    expect(sizePartialOfferWagons(room, 15, pw2)).toEqual({
+      wagons: 8,
+      maxCargoTons: 542.4,
+    });
+  });
+
+  it('leaves fits() strict when no tolerance is configured', () => {
+    const strict = new CorridorBudget(stops, base);
+    strict.subtract(need(3500, 10, 170), strict.fullLeg());
+    expect(strict.fits(need(1), strict.fullLeg())).toBe(false);
+  });
+
+  describe('isExhausted — train-wide FULL across all axes', () => {
+    // Lightest wagon at rated payload: PW2 25.2T tare + 70T = 95.2T gross.
+    const perWagon = {
+      grossWeightTons: pw2.tareWeightTons + pw2.capacityTons,
+      lengthMeters: pw2.lengthMeters,
+    };
+
+    it('reports FULL when weight binds first, with wagon slots still free', () => {
+      // 37 loaded PW2 wagons = 3522.4T of 3500+90T. 7 length-derived slots
+      // remain, but wagon 38 would need 95.2T against 67.6T of room — the
+      // schedule must finalize and its window must disappear.
+      const budget = new CorridorBudget(stops, base, tolerance);
+      budget.subtract(need(3522.4, 37, 631.442), budget.fullLeg());
+      expect(budget.maxRemaining().wagons).toBeGreaterThan(0); // slot check alone says "not full"
+      expect(budget.isExhausted(perWagon)).toBe(true);
+    });
+
+    it('is not FULL while one more loaded wagon still fits within base + tolerance', () => {
+      const budget = budgetAt(3300); // 200T base room + 90T tolerance ≥ 95.2T
+      expect(budget.isExhausted(perWagon)).toBe(false);
+    });
+
+    it('reports FULL when wagon slots run out regardless of weight room', () => {
+      const budget = new CorridorBudget(stops, base, tolerance);
+      budget.subtract(need(1000, 44, 700), budget.fullLeg());
+      expect(budget.isExhausted(perWagon)).toBe(true);
+    });
+
+    it('reports FULL when length room cannot take one more wagon', () => {
+      const budget = new CorridorBudget(stops, base, tolerance);
+      budget.subtract(need(1000, 30, 750), budget.fullLeg()); // 10m left < 17.066m
+      expect(budget.isExhausted(perWagon)).toBe(true);
+    });
+
+    it('only counts an edge as open when EVERY axis has room on that same edge', () => {
+      // Three stops → two edges. Edge 0 has weight but no slots; edge 1 has
+      // slots but no weight. Neither can board a wagon, so the train is FULL
+      // even though the per-axis maxima both look open.
+      const budget = new CorridorBudget(['a', 'b', 'c'], base, tolerance);
+      budget.subtract(need(0, 44, 0), { fromEdge: 0, toEdge: 1 });
+      budget.subtract(need(3522.4, 0, 0), { fromEdge: 1, toEdge: 2 });
+      expect(budget.isExhausted(perWagon)).toBe(true);
+    });
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/corridor-capacity.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/corridor-capacity.util.ts
index b16b25179..f2602a157 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/corridor-capacity.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/corridor-capacity.util.ts
@@ -63,18 +63,40 @@ export function stopYardsFor(
   return [originStationId, destinationStationId];
 }
 
-/** Per-edge capacity budget along a schedule's stop list. */
+/** Overage a locomotive may absorb beyond its base caps. */
+export interface OverageTolerance {
+  weightTons: number;
+  lengthMeters: number;
+}
+
+/**
+ * Per-edge capacity budget along a schedule's stop list.
+ *
+ * `initial` must be the BASE caps (locomotive floored by rule caps, WITHOUT the
+ * overage tolerance). The tolerance is passed separately and is spendable only
+ * by admitting a unit WHOLE via {@link fits} — e.g. base 3500T + 90T tolerance,
+ * 3560T already committed: a 25T booking still boards entire (3585 ≤ 3590), a
+ * 210T booking does not. {@link remainingFor} deliberately excludes the
+ * tolerance (and goes negative once it is consumed), so split/partial offers
+ * sized from it can only fill up to the base cap and never spend the tolerance.
+ */
 export class CorridorBudget {
   private readonly edges: Capacity[];
   private readonly stopIndex: Map<string, number>;
+  private readonly tolerance: OverageTolerance;
 
   constructor(
     readonly stops: string[],
     initial: Capacity,
+    tolerance?: Partial<OverageTolerance> | null,
   ) {
     const edgeCount = Math.max(1, stops.length - 1);
     this.edges = Array.from({ length: edgeCount }, () => ({ ...initial }));
     this.stopIndex = new Map(stops.map((yardId, i) => [yardId, i]));
+    this.tolerance = {
+      weightTons: tolerance?.weightTons ?? 0,
+      lengthMeters: tolerance?.lengthMeters ?? 0,
+    };
   }
 
   /** The leg between two stops, or null when they aren't on this corridor in order. */
@@ -99,7 +121,12 @@ export class CorridorBudget {
     return this.legOf(originYardId, destinationYardId) ?? this.fullLeg();
   }
 
-  /** Remaining capacity usable by this leg = min across its edges. */
+  /**
+   * Remaining BASE capacity usable by this leg = min across its edges. Excludes
+   * the overage tolerance and goes negative once a whole-unit admission has
+   * spent it — sizing a split from this can therefore never reach into the
+   * tolerance, and yields nothing at all once the base cap is exhausted.
+   */
   remainingFor(leg: CorridorLeg): Capacity {
     let min = { ...this.edges[leg.fromEdge] };
     for (let i = leg.fromEdge + 1; i < leg.toEdge; i++) {
@@ -113,8 +140,20 @@ export class CorridorBudget {
     return min;
   }
 
+  /**
+   * Whether a unit fits WHOLE on this leg. This is the only place the overage
+   * tolerance may be spent: the unit boards entirely or not at all, so weight
+   * and length may dip into the tolerance. Admission keeps the invariant
+   * `remaining ≥ -tolerance` on every edge, i.e. the train never exceeds
+   * base + tolerance no matter how many small units board in the overage zone.
+   */
   fits(need: Capacity, leg: CorridorLeg): boolean {
-    return capacityFits(need, this.remainingFor(leg));
+    const remaining = this.remainingFor(leg);
+    return (
+      need.wagons <= remaining.wagons &&
+      need.weightTons <= remaining.weightTons + this.tolerance.weightTons &&
+      need.lengthMeters <= remaining.lengthMeters + this.tolerance.lengthMeters
+    );
   }
 
   subtract(need: Capacity, leg: CorridorLeg): void {
@@ -129,6 +168,25 @@ export class CorridorBudget {
     }
   }
 
+  /**
+   * Train-wide FULL across ALL capacity axes: true when no edge can board even
+   * one more loaded wagon. `perWagon` is the smallest gross weight and length
+   * a future wagon could add (lightest wagon type at rated payload); weight and
+   * length may dip into the overage tolerance, mirroring {@link fits}. Checked
+   * per edge — an edge with slots free but no pull weight is just as closed as
+   * one with no slots. A slot-only check misses weight-bound trains: PW2 at
+   * 37 × 95.2T = 3522.4T of 3500+90T has 7 length-derived slots free but no
+   * weight room for wagon 38, and its window must read FULL.
+   */
+  isExhausted(perWagon: { grossWeightTons: number; lengthMeters: number }): boolean {
+    return this.edges.every(
+      (e) =>
+        e.wagons <= 0 ||
+        e.weightTons + this.tolerance.weightTons < perWagon.grossWeightTons ||
+        e.lengthMeters + this.tolerance.lengthMeters < perWagon.lengthMeters,
+    );
+  }
+
   /**
    * The most open edge — when even this has no wagon slots left, nothing can
    * board anywhere and the schedule's window is genuinely FULL. (A train can be
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/dto/assign-bookings.dto.ts b/apps/edr-freight-api/src/modules/train-scheduling/dto/assign-bookings.dto.ts
index b5e93f5da..1fd1e9a08 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/dto/assign-bookings.dto.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/dto/assign-bookings.dto.ts
@@ -51,7 +51,7 @@ export class AssignBookingsDto {
   @IsUUID('4', { each: true })
   bookingIds!: string[];
 
-  @ApiPropertyOptional({ description: 'Bypass soft hold and overweight warnings' })
+  @ApiPropertyOptional({ description: 'Suppress soft hold and overweight warnings' })
   @IsOptional()
   @IsBoolean()
   forceAssign?: boolean;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/dto/batch-board-query.dto.ts b/apps/edr-freight-api/src/modules/train-scheduling/dto/batch-board-query.dto.ts
new file mode 100644
index 000000000..11bc8ceb5
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/train-scheduling/dto/batch-board-query.dto.ts
@@ -0,0 +1,99 @@
+import { ApiPropertyOptional } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import {
+  IsIn,
+  IsInt,
+  IsISO8601,
+  IsOptional,
+  IsString,
+  Max,
+  MaxLength,
+  Min,
+} from 'class-validator';
+
+export const BATCH_BOARD_STATUSES = [
+  'DRAFT',
+  'SCHEDULED',
+  'DISPATCHED',
+  'ARRIVED',
+  'CANCELLED',
+] as const;
+
+export const BATCH_BOARD_SORT_FIELDS = [
+  'createdAt',
+  'scheduledDepartureDate',
+  'trainNumber',
+  'status',
+] as const;
+export type BatchBoardSortField = (typeof BATCH_BOARD_SORT_FIELDS)[number];
+
+/** Filters for the batch monitoring board list (import schedules, all statuses). */
+export class BatchBoardQueryDto {
+  @ApiPropertyOptional({ default: 1, minimum: 1 })
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  page?: number;
+
+  @ApiPropertyOptional({ default: 12, minimum: 1, maximum: 100 })
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  @Max(100)
+  pageSize?: number;
+
+  @ApiPropertyOptional({
+    description:
+      'Comma-separated schedule statuses (DRAFT,SCHEDULED,DISPATCHED,ARRIVED,CANCELLED). Omit for all.',
+    example: 'DISPATCHED,ARRIVED',
+  })
+  @IsOptional()
+  @IsString()
+  statuses?: string;
+
+  @ApiPropertyOptional({ enum: ['OPEN', 'FULL', 'CLOSED'] })
+  @IsOptional()
+  @IsIn(['OPEN', 'FULL', 'CLOSED'])
+  bookingWindowStatus?: 'OPEN' | 'FULL' | 'CLOSED';
+
+  @ApiPropertyOptional({
+    description:
+      'Case-insensitive match on train number, route yards, stations, or locomotive code.',
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(120)
+  search?: string;
+
+  @ApiPropertyOptional({ description: 'Departure date lower bound (ISO 8601).' })
+  @IsOptional()
+  @IsISO8601()
+  departureFrom?: string;
+
+  @ApiPropertyOptional({ description: 'Departure date upper bound (ISO 8601).' })
+  @IsOptional()
+  @IsISO8601()
+  departureTo?: string;
+
+  @ApiPropertyOptional({ description: 'Created-at lower bound (ISO 8601).' })
+  @IsOptional()
+  @IsISO8601()
+  createdFrom?: string;
+
+  @ApiPropertyOptional({ description: 'Created-at upper bound (ISO 8601).' })
+  @IsOptional()
+  @IsISO8601()
+  createdTo?: string;
+
+  @ApiPropertyOptional({ enum: BATCH_BOARD_SORT_FIELDS, default: 'createdAt' })
+  @IsOptional()
+  @IsIn(BATCH_BOARD_SORT_FIELDS as unknown as string[])
+  sortBy?: BatchBoardSortField;
+
+  @ApiPropertyOptional({ enum: ['ASC', 'DESC'], default: 'DESC' })
+  @IsOptional()
+  @IsIn(['ASC', 'DESC'])
+  sortOrder?: 'ASC' | 'DESC';
+}
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/gatepass-payment-gate.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/gatepass-payment-gate.spec.ts
new file mode 100644
index 000000000..912f437f4
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/train-scheduling/gatepass-payment-gate.spec.ts
@@ -0,0 +1,118 @@
+import { TrainSchedulingService } from './train-scheduling.service';
+import { Booking } from '../bookings/entities/booking.entity';
+import { ClearanceMilestone } from '../contracts/entities/clearance-milestone.entity';
+
+type Row = Pick<ClearanceMilestone, 'bookingId' | 'milestoneCode' | 'status'> & {
+  metadata?: Record<string, unknown> | null;
+  triggeredAt?: Date | null;
+};
+
+/**
+ * The gate pass is secured once per train schedule, but each booking only earns
+ * its GATEPASS_GRANTED milestone after settling freight payment. An unpaid
+ * booking must not ride a paid neighbour's grant — the train proceeds, that
+ * booking stays pending.
+ */
+function makeService(bookings: Array<Partial<Booking>>, rows: Row[]) {
+  const milestoneRepo = {
+    find: jest.fn().mockResolvedValue(rows),
+    save: jest.fn((row: Row) => Promise.resolve(row)),
+  };
+  const bookingRepo = { find: jest.fn().mockResolvedValue(bookings) };
+  const dataSource = {
+    getRepository: (entity: unknown) =>
+      entity === Booking ? bookingRepo : milestoneRepo,
+  };
+
+  const service = Object.create(
+    TrainSchedulingService.prototype,
+  ) as TrainSchedulingService;
+  Object.assign(service, {
+    dataSource,
+    logger: { warn: jest.fn(), log: jest.fn() },
+  });
+  return { service, milestoneRepo };
+}
+
+/** Reach the private bridge write under test. */
+function grant(service: TrainSchedulingService, at: Date): Promise<void> {
+  return (
+    service as unknown as {
+      completeGatepassMilestoneForSchedule(id: string, at: Date): Promise<void>;
+    }
+  ).completeGatepassMilestoneForSchedule('sched-1', at);
+}
+
+const securedAt = new Date('2026-07-09T08:00:00.000Z');
+
+describe('gate pass is withheld from bookings that have not paid freight', () => {
+  it('grants the paid booking and leaves the unpaid one pending', async () => {
+    const rows: Row[] = [
+      { bookingId: 'paid', milestoneCode: 'FREIGHT_PAYMENT_SETTLED', status: 'COMPLETED' },
+      { bookingId: 'paid', milestoneCode: 'GATEPASS_GRANTED', status: 'PENDING' },
+      { bookingId: 'unpaid', milestoneCode: 'FREIGHT_PAYMENT_SETTLED', status: 'PENDING' },
+      { bookingId: 'unpaid', milestoneCode: 'GATEPASS_GRANTED', status: 'PENDING' },
+    ];
+    const { service, milestoneRepo } = makeService(
+      [
+        { id: 'paid', status: 'CONFIRMED', paymentStatus: 'PENDING' },
+        { id: 'unpaid', status: 'CONFIRMED', paymentStatus: 'PENDING' },
+      ],
+      rows,
+    );
+
+    await grant(service, securedAt);
+
+    const saved = milestoneRepo.save.mock.calls.map(([r]: [Row]) => r);
+    expect(saved).toHaveLength(1);
+    expect(saved[0]!.bookingId).toBe('paid');
+    expect(saved[0]!.status).toBe('COMPLETED');
+    expect(saved[0]!.triggeredAt).toBe(securedAt);
+
+    const unpaid = rows.find(
+      (r) => r.bookingId === 'unpaid' && r.milestoneCode === 'GATEPASS_GRANTED',
+    );
+    expect(unpaid!.status).toBe('PENDING');
+  });
+
+  it('treats a booking paid outside the milestone path as paid', async () => {
+    // Some payment paths settle the invoice without writing the milestone; the
+    // clearance views self-heal it on read, so the gate pass must not lag.
+    const rows: Row[] = [
+      { bookingId: 'b-1', milestoneCode: 'FREIGHT_PAYMENT_SETTLED', status: 'PENDING' },
+      { bookingId: 'b-1', milestoneCode: 'GATEPASS_GRANTED', status: 'PENDING' },
+    ];
+    const { service, milestoneRepo } = makeService(
+      [{ id: 'b-1', status: 'CONFIRMED', paymentStatus: 'PAID' }],
+      rows,
+    );
+
+    await grant(service, securedAt);
+
+    expect(milestoneRepo.save).toHaveBeenCalledTimes(1);
+    expect(milestoneRepo.save.mock.calls[0]![0].bookingId).toBe('b-1');
+  });
+
+  it('leaves an already-granted milestone untouched', async () => {
+    const rows: Row[] = [
+      { bookingId: 'b-1', milestoneCode: 'FREIGHT_PAYMENT_SETTLED', status: 'COMPLETED' },
+      { bookingId: 'b-1', milestoneCode: 'GATEPASS_GRANTED', status: 'COMPLETED' },
+    ];
+    const { service, milestoneRepo } = makeService(
+      [{ id: 'b-1', status: 'PAID', paymentStatus: 'PAID' }],
+      rows,
+    );
+
+    await grant(service, securedAt);
+
+    expect(milestoneRepo.save).not.toHaveBeenCalled();
+  });
+
+  it('does nothing when the schedule carries no customs bookings', async () => {
+    const { service, milestoneRepo } = makeService([], []);
+
+    await grant(service, securedAt);
+
+    expect(milestoneRepo.save).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts
index bce4207d3..d2f1dd7b1 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts
@@ -107,7 +107,13 @@ export class IntercityService {
     for (const bookingId of bookingIds) {
       const booking = await this.dataSource
         .getRepository(Booking)
-        .findOne({ where: { id: bookingId }, relations: { bookingContainers: true } });
+        .findOne({
+          where: { id: bookingId },
+          relations: {
+            bookingContainers: { containerType: true },
+            cargoType: true,
+          },
+        });
       if (!booking) {
         rejected.push({ bookingId, reason: 'Booking not found' });
         continue;
@@ -205,6 +211,8 @@ export class IntercityService {
       .createQueryBuilder('booking')
       .leftJoinAndSelect('booking.company', 'company')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
+      .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .leftJoinAndSelect('booking.originYard', 'originYard')
       .leftJoinAndSelect('booking.destinationYard', 'destinationYard')
       .where(`booking.trade_direction = 'DOMESTIC'`)
@@ -230,6 +238,8 @@ export class IntercityService {
       .createQueryBuilder('booking')
       .leftJoinAndSelect('booking.company', 'company')
       .leftJoinAndSelect('booking.bookingContainers', 'bookingContainer')
+      .leftJoinAndSelect('bookingContainer.containerType', 'containerType')
+      .leftJoinAndSelect('booking.cargoType', 'cargoType')
       .leftJoinAndSelect('booking.originYard', 'originYard')
       .leftJoinAndSelect('booking.destinationYard', 'destinationYard')
       .where(`booking.trade_direction = 'DOMESTIC'`)
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts
index e1b4064bb..dd9234bdb 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts
@@ -6,6 +6,7 @@ import {
   deriveTrainCapacityFromLocomotive,
   grossWagonWeightTons,
   minLocomotiveLimits,
+  sizePartialOfferWagons,
 } from './train-capacity.util';
 
 describe('train-capacity.util', () => {
@@ -73,6 +74,24 @@ describe('train-capacity.util', () => {
       expect(derived.maxWeightTons).toBe(3590);
     });
 
+    it('reports the base caps and tolerance separately so filling can budget on base', () => {
+      const derived = deriveTrainCapacityFromLocomotive(
+        {
+          maxPullWeightTons: 3500,
+          maxTrainLengthMeters: 760,
+          overageToleranceTons: 90,
+          overageToleranceMeters: 20,
+        },
+        [pw2],
+      );
+      expect(derived.baseWeightTons).toBe(3500);
+      expect(derived.baseLengthMeters).toBe(760);
+      expect(derived.toleranceTons).toBe(90);
+      expect(derived.toleranceMeters).toBe(20);
+      expect(derived.baseWeightTons + derived.toleranceTons).toBe(derived.maxWeightTons);
+      expect(derived.baseLengthMeters + derived.toleranceMeters).toBe(derived.maxLengthMeters);
+    });
+
     it('ignores overage tolerance when unset (strict cap)', () => {
       const derived = deriveTrainCapacityFromLocomotive(
         { maxPullWeightTons: 3500, maxTrainLengthMeters: 760 },
@@ -185,4 +204,96 @@ describe('train-capacity.util', () => {
     expect(limits?.maxPullWeightTons).toBe(3500);
     expect(limits?.overageToleranceTons).toBe(20);
   });
+
+  describe('sizePartialOfferWagons', () => {
+    it('sizes a bulk split by the WEIGHT axis when the pull limit binds, not wagon slots', () => {
+      // The 3500T-train scenario: two 1000T bookings boarded gross (each 15 PW2
+      // wagons: 1000 + 378 tare = 1378), leaving 744T of pull weight but plenty
+      // of slots/length. The boundary 1000T booking (15 wagons) must be offered
+      // the largest part 744T can carry: 8 wagons whose tare is 201.6T, hauling
+      // 542.4T of cargo — gross exactly 744.
+      const offer = sizePartialOfferWagons(
+        { wagons: 40, weightTons: 744, lengthMeters: 500 },
+        15,
+        pw2,
+      );
+      expect(offer).toEqual({ wagons: 8, maxCargoTons: 542.4 });
+    });
+
+    it('still sizes by wagon slots when they bind first (legacy behavior)', () => {
+      const offer = sizePartialOfferWagons(
+        { wagons: 3, weightTons: 100000, lengthMeters: 100000 },
+        15,
+        pw2,
+      );
+      expect(offer?.wagons).toBe(3);
+    });
+
+    it('sizes by the LENGTH axis when it binds first', () => {
+      // 60m of train left → 3 PW2 (17.066m) fit, the 4th does not.
+      const offer = sizePartialOfferWagons(
+        { wagons: 40, weightTons: 100000, lengthMeters: 60 },
+        15,
+        pw2,
+      );
+      expect(offer?.wagons).toBe(3);
+    });
+
+    it('never offers all of the booking — a split is a strict subset', () => {
+      const offer = sizePartialOfferWagons(
+        { wagons: 40, weightTons: 100000, lengthMeters: 100000 },
+        15,
+        pw2,
+      );
+      expect(offer?.wagons).toBe(14);
+    });
+
+    it('returns null when not even one part-loaded wagon fits the weight room', () => {
+      expect(
+        sizePartialOfferWagons({ wagons: 5, weightTons: 20, lengthMeters: 500 }, 15, pw2),
+      ).toBeNull();
+    });
+
+    describe('fullWagonsOnly (bulk)', () => {
+      it('offers only whole full wagons — each costs capacity + tare of gross room', () => {
+        // 704T of pull weight left. A full PW2 wagon is 70 + 25.2 = 95.2T gross,
+        // so 7 fit (666.4T) and the 8th (761.6T) does not. Cargo is exactly
+        // 7 × 70 = 490T — the last wagon is never part-loaded into the leftover.
+        const offer = sizePartialOfferWagons(
+          { wagons: 40, weightTons: 704, lengthMeters: 500 },
+          9,
+          pw2,
+          { fullWagonsOnly: true },
+        );
+        expect(offer).toEqual({ wagons: 7, maxCargoTons: 490 });
+      });
+
+      it('never squeezes a part-loaded wagon into leftover weight room', () => {
+        // Same 744T room as the part-load scenario above: the scan would pick
+        // 8 wagons hauling 542.4T (last wagon at 52.4/70). Full-wagon sizing
+        // stops at 7 fully loaded wagons.
+        const offer = sizePartialOfferWagons(
+          { wagons: 40, weightTons: 744, lengthMeters: 500 },
+          15,
+          pw2,
+          { fullWagonsOnly: true },
+        );
+        expect(offer).toEqual({ wagons: 7, maxCargoTons: 490 });
+      });
+
+      it('returns null when the room cannot take even one FULL wagon', () => {
+        // 67.6T left (3590 cap − 3522.4 boarded): a part-loaded wagon would fit
+        // (25.2 tare + 42.4 cargo) but a full one (95.2 gross) does not — the
+        // booking must be skipped entirely, not trimmed onto the train.
+        expect(
+          sizePartialOfferWagons(
+            { wagons: 40, weightTons: 67.6, lengthMeters: 500 },
+            3,
+            pw2,
+            { fullWagonsOnly: true },
+          ),
+        ).toBeNull();
+      });
+    });
+  });
 });
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts
index 79adf8d8f..463ae7ea8 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts
@@ -52,6 +52,12 @@ export type DerivedTrainCapacity = {
   maxLengthMeters: number;
   /** Length-derived slot count. Weight is enforced separately against real cargo. */
   maxWagonSlots: number;
+  /** Caps WITHOUT the overage tolerance — what batch filling budgets against. */
+  baseWeightTons: number;
+  baseLengthMeters: number;
+  /** Overage spendable only by admitting a booking whole, never by a split. */
+  toleranceTons: number;
+  toleranceMeters: number;
 };
 
 /** What a consist currently uses, and what is left on each axis. */
@@ -88,28 +94,48 @@ export function grossWagonWeightTons(slot: Pick<ConsistSlot, 'tareWeightTons' |
 /**
  * Hard caps for a train: the locomotive's own limits, floored by the global rule
  * caps, then widened by the locomotive's overage tolerance.
+ *
+ * `base*` are the caps BEFORE the tolerance is added. The tolerance is not
+ * general-purpose headroom: batch filling budgets against the base caps and may
+ * spend the tolerance only to admit a booking WHOLE (never to size a split), so
+ * both figures are returned. `base + tolerance === max` always holds, including
+ * the fallback path.
  */
 export function trainHardCaps(
   locomotive: LocomotiveLimits,
   ruleCaps?: { maxTrainWeightTons?: number; maxTrainLengthMeters?: number },
-): { maxWeightTons: number; maxLengthMeters: number } {
+): {
+  maxWeightTons: number;
+  maxLengthMeters: number;
+  baseWeightTons: number;
+  baseLengthMeters: number;
+  toleranceTons: number;
+  toleranceMeters: number;
+} {
   const overageTons = num(locomotive.overageToleranceTons);
   const overageMeters = num(locomotive.overageToleranceMeters);
 
-  const weight =
-    Math.min(
-      num(locomotive.maxPullWeightTons, Infinity) || Infinity,
-      ruleCaps?.maxTrainWeightTons ?? Infinity,
-    ) + overageTons;
-  const length =
-    Math.min(
-      num(locomotive.maxTrainLengthMeters, Infinity) || Infinity,
-      ruleCaps?.maxTrainLengthMeters ?? Infinity,
-    ) + overageMeters;
+  const baseWeight = Math.min(
+    num(locomotive.maxPullWeightTons, Infinity) || Infinity,
+    ruleCaps?.maxTrainWeightTons ?? Infinity,
+  );
+  const baseLength = Math.min(
+    num(locomotive.maxTrainLengthMeters, Infinity) || Infinity,
+    ruleCaps?.maxTrainLengthMeters ?? Infinity,
+  );
+
+  const baseWeightTons = Number.isFinite(baseWeight) ? baseWeight : MAX_FALLBACK_WEIGHT;
+  const baseLengthMeters = Number.isFinite(baseLength) ? baseLength : MAX_FALLBACK_LENGTH;
+  const toleranceTons = Number.isFinite(baseWeight) ? overageTons : 0;
+  const toleranceMeters = Number.isFinite(baseLength) ? overageMeters : 0;
 
   return {
-    maxWeightTons: Number.isFinite(weight) ? weight : MAX_FALLBACK_WEIGHT,
-    maxLengthMeters: Number.isFinite(length) ? length : MAX_FALLBACK_LENGTH,
+    maxWeightTons: baseWeightTons + toleranceTons,
+    maxLengthMeters: baseLengthMeters + toleranceMeters,
+    baseWeightTons,
+    baseLengthMeters,
+    toleranceTons,
+    toleranceMeters,
   };
 }
 
@@ -129,7 +155,7 @@ export function deriveTrainCapacityFromLocomotive(
   wagonTypes: WagonTypeDimensions[],
   ruleCaps?: { maxTrainWeightTons?: number; maxTrainLengthMeters?: number },
 ): DerivedTrainCapacity {
-  const { maxWeightTons, maxLengthMeters } = trainHardCaps(locomotive, ruleCaps);
+  const caps = trainHardCaps(locomotive, ruleCaps);
 
   const lengths = wagonTypes
     .map((w) => num(w.lengthMeters))
@@ -137,9 +163,9 @@ export function deriveTrainCapacityFromLocomotive(
   const minLength = lengths.length ? Math.min(...lengths) : DEFAULT_WAGON_LENGTH_M;
 
   const maxWagonSlots =
-    minLength > 0 ? Math.max(0, Math.floor(maxLengthMeters / minLength)) : 0;
+    minLength > 0 ? Math.max(0, Math.floor(caps.maxLengthMeters / minLength)) : 0;
 
-  return { maxWeightTons, maxLengthMeters, maxWagonSlots };
+  return { ...caps, maxWagonSlots };
 }
 
 /**
@@ -256,6 +282,58 @@ export function bookingGrossWeightTons(
   return round3(num(cargoTons) + wagonCount * num(tarePerWagonTons));
 }
 
+/**
+ * Size a partial (split-on-payment) offer against the room left on a train,
+ * across ALL THREE capacity axes — not just wagon slots. Each wagon adds
+ * `capacityTons` of payload headroom but its own tare spends the same weight
+ * room the cargo needs, so on a weight-limited train more wagons is not always
+ * more cargo. Scans wagon counts (the last wagon may run part-loaded) and
+ * returns the count that maximizes the cargo carried, with the cargo cap the
+ * caller should apply. Null when not even one part-loaded wagon fits. The
+ * offer is a strict subset of the booking: never all `bookingWagons`.
+ *
+ * `fullWagonsOnly` (bulk): every offered wagon rides at its full rated payload,
+ * so each wagon costs `capacityTons + tareWeightTons` of gross weight room and
+ * the offer is the largest whole-wagon count whose gross fits — never a
+ * part-loaded last wagon squeezed into leftover pull weight.
+ */
+export function sizePartialOfferWagons(
+  room: { wagons: number; weightTons: number; lengthMeters: number },
+  bookingWagons: number,
+  perWagon: { capacityTons: number; tareWeightTons: number; lengthMeters: number },
+  opts?: { fullWagonsOnly?: boolean },
+): { wagons: number; maxCargoTons: number } | null {
+  const maxByLength =
+    perWagon.lengthMeters > 0
+      ? Math.floor(room.lengthMeters / perWagon.lengthMeters)
+      : room.wagons;
+  const ceiling = Math.min(room.wagons, maxByLength, bookingWagons - 1);
+
+  if (opts?.fullWagonsOnly) {
+    const grossPerWagon = perWagon.capacityTons + perWagon.tareWeightTons;
+    const maxByWeight =
+      grossPerWagon > 0 ? Math.floor(room.weightTons / grossPerWagon) : 0;
+    const wagons = Math.min(ceiling, maxByWeight);
+    if (wagons < 1) return null;
+    return { wagons, maxCargoTons: round3(wagons * perWagon.capacityTons) };
+  }
+
+  let wagons = 0;
+  let bestCargoTons = 0;
+  for (let w = 1; w <= ceiling; w += 1) {
+    const cargoAt = Math.min(
+      w * perWagon.capacityTons,
+      room.weightTons - w * perWagon.tareWeightTons,
+    );
+    if (cargoAt > bestCargoTons) {
+      bestCargoTons = cargoAt;
+      wagons = w;
+    }
+  }
+  if (wagons < 1) return null;
+  return { wagons, maxCargoTons: round3(room.weightTons - wagons * perWagon.tareWeightTons) };
+}
+
 export function wagonTypeDimensionsFromEntity(wt: {
   lengthMeters?: number | string | null;
   capacityTons?: number | string | null;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
index 7dba44f83..fd41d4a29 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
@@ -39,6 +39,7 @@ import {
   UploadImportDjiboutiDocumentDto,
 } from "./dto/import-djibouti-operation.dto";
 import { AvailableLocomotivesQueryDto } from "./dto/available-locomotives-query.dto";
+import { BatchBoardQueryDto } from "./dto/batch-board-query.dto";
 import { BookableSchedulesQueryDto } from "./dto/bookable-schedules-query.dto";
 import { AvailableDaysQueryDto } from "./dto/available-days-query.dto";
 import { AvailableDaysForCargoQueryDto } from "./dto/available-days-for-cargo-query.dto";
@@ -124,10 +125,11 @@ export class TrainSchedulingController {
   @Get("batch-board")
   @TrainSchedulingView()
   @ApiOperation({
-    summary: "Batch monitoring board: schedules with bookings grouped by state",
+    summary:
+      "Batch monitoring board: paginated import schedules (all statuses) with bookings grouped by state",
   })
-  getBatchBoard() {
-    return this.bookingBatchService.getBatchBoard();
+  getBatchBoard(@Query() query: BatchBoardQueryDto) {
+    return this.bookingBatchService.getBatchBoard(query);
   }
 
   @Get("batch-board/:scheduleId")
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
index b7938857f..e97b3de56 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
@@ -72,7 +72,7 @@ const makeBooking = (
       wagonsRequired,
       vgmPerUnitTons: weight / quantity,
       isOverweight: false,
-      containerType: { code: containerCode, label: containerCode },
+      containerType: { code: containerCode, label: containerCode, wagonTypeId: nw5.id },
     },
   ],
   ...extra,
@@ -282,7 +282,7 @@ describe('TrainSchedulingService', () => {
     expect(result.warnings[0]).toContain('soft hold window');
   });
 
-  it('flags the overweight booking as invalid', async () => {
+  it('warns on the overweight booking but still allows scheduling', async () => {
     const bookings = [
       makeBooking('b6', 'BKG-CONT-006', 3600, 80, '40FT', 80, undefined, undefined, undefined, {
         bookingContainers: [
@@ -293,7 +293,7 @@ describe('TrainSchedulingService', () => {
             wagonsRequired: 80,
             vgmPerUnitTons: 45,
             isOverweight: true,
-            containerType: { code: '40FT', label: '40FT' },
+            containerType: { code: '40FT', label: '40FT', wagonTypeId: nw5.id },
           },
         ],
       }),
@@ -311,8 +311,8 @@ describe('TrainSchedulingService', () => {
       destinationStationId: 'yard-destination',
     });
 
-    expect(result.valid).toBe(false);
-    expect(result.violations.some((v) => v.includes('overweight'))).toBe(true);
+    expect(result.violations.some((v) => v.includes('overweight'))).toBe(false);
+    expect(result.warnings.some((w) => w.includes('overweight'))).toBe(true);
   });
 
   it('allows preview when bookings are already on the target schedule', async () => {
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
index 0c366ed05..f53af2a93 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
@@ -1073,12 +1073,17 @@ export class TrainSchedulingService {
         containerPlacements ?? [],
       );
 
+      // The link above puts these bookings on the train: they are SCHEDULED, not
+      // ELIGIBLE. Leaving them ELIGIBLE re-offers an allocated booking to the next
+      // batch fill, which unlinks it and frees its wagons on the next window cycle.
+      const scheduledAt = new Date();
       for (const booking of bookings) {
         await this.bookingsRepository.updateSchedulingFields(
           booking.id,
           {
-            schedulingStatus: SchedulingStatus.Eligible,
-            wagonsRequired: sumWagonsRequired(booking),
+            schedulingStatus: SchedulingStatus.Scheduled,
+            scheduledAt,
+            wagonsRequired: sumWagonsRequired(booking, wagonPlan),
           },
           manager,
         );
@@ -1655,6 +1660,13 @@ export class TrainSchedulingService {
    * clearance views still reading that milestone (older deployed builds) see
    * the gate pass as done. Drop once every clearance-api deployment reads
    * ImportDjiboutiOperation.gatepassGrantedAt directly.
+   *
+   * A booking only earns its gate pass once the customer has settled the freight
+   * charges (FREIGHT_PAYMENT_SETTLED). The gate pass itself is secured per train
+   * schedule, so an unpaid booking must not ride a paid neighbour's grant: it
+   * keeps GATEPASS_GRANTED pending — and therefore cannot upload T1 — while the
+   * train and its paid bookings proceed. Re-securing the gate pass after payment
+   * settles picks the booking up; so does any later call to this bridge.
    */
   private async completeGatepassMilestoneForSchedule(
     scheduleId: string,
@@ -1666,20 +1678,49 @@ export class TrainSchedulingService {
     if (bookings.length === 0) return;
 
     const milestoneRepo = this.dataSource.getRepository(ClearanceMilestone);
+    const bookingIds = bookings.map((b) => b.id);
     const rows = await milestoneRepo.find({
       where: {
-        bookingId: In(bookings.map((b) => b.id)),
-        milestoneCode: 'GATEPASS_GRANTED',
+        bookingId: In(bookingIds),
+        milestoneCode: In(['GATEPASS_GRANTED', 'FREIGHT_PAYMENT_SETTLED']),
       },
     });
 
+    const paidBookingIds = new Set(
+      rows
+        .filter(
+          (r) => r.milestoneCode === 'FREIGHT_PAYMENT_SETTLED' && r.status === 'COMPLETED',
+        )
+        .map((r) => r.bookingId),
+    );
+    // A booking whose payment settled through a path that never wrote the
+    // milestone still counts as paid — the clearance views self-heal the row on
+    // read, and the gate pass must not lag behind that.
+    for (const booking of bookings) {
+      if (booking.paymentStatus === 'PAID' || booking.status === 'PAID') {
+        paidBookingIds.add(booking.id);
+      }
+    }
+
+    const skipped: string[] = [];
     for (const row of rows) {
+      if (row.milestoneCode !== 'GATEPASS_GRANTED') continue;
       if (row.status === 'COMPLETED') continue;
+      if (!row.bookingId || !paidBookingIds.has(row.bookingId)) {
+        skipped.push(row.bookingId ?? '(unknown)');
+        continue;
+      }
       row.status = 'COMPLETED';
       row.triggeredAt = securedAt;
       row.metadata = { ...(row.metadata ?? {}), gatepassAt: securedAt.toISOString() };
       await milestoneRepo.save(row);
     }
+
+    if (skipped.length > 0) {
+      this.logger.warn(
+        `Gate pass secured for schedule ${scheduleId}, but ${skipped.length} booking(s) have not settled freight payment and stay pending: ${skipped.join(', ')}`,
+      );
+    }
   }
 
   async markImportReadyForLoading(scheduleId: string, dto: ImportDjiboutiActionDto = {}) {
@@ -1864,7 +1905,7 @@ export class TrainSchedulingService {
             <td>${esc(wagon.physicalWagon?.wagonNumber)}</td>
             <td>${esc(wagon.wagonType?.code ?? wagon.wagonType?.name)}</td>
             <td class="num">${esc(Number(wagon.lengthMeters || 0).toFixed(3))}</td>
-            <td class="num">${esc(Number(wagon.physicalWagon?.tareWeight ?? 0).toFixed(2))}</td>
+            <td class="num">${esc(Number(wagon.wagonType?.tareWeightTons ?? 0).toFixed(2))}</td>
             <td class="num">${esc(Number(wagon.capacityTons || 0).toFixed(3))}</td>
             <td>${esc(company?.name ?? company?.legalName ?? company?.tradeName ?? booking?.companyId)}</td>
             <td>${esc(booking?.companyId)}</td>
@@ -2473,6 +2514,12 @@ export class TrainSchedulingService {
 
     if (dto.sequenceNo === finalSeq) {
       await this.arriveSchedule(scheduleId);
+    } else {
+      // Mid-corridor auto-unload: bookings destined for this yard alight the
+      // moment the train is recorded here — the yard operator no longer has to
+      // unload each one by hand. The final station is covered by
+      // arriveSchedule's bulk fallback above.
+      await this.bookingJourneyService.autoUnloadAtYard(scheduleId, station.yardId);
     }
 
     return this.getScheduleCheckpoints(scheduleId);
@@ -2598,7 +2645,8 @@ export class TrainSchedulingService {
     const schedules = await this.trainSchedulesRepository.findAll({
       relations: {
         trainSet: { locomotive: true, locomotives: { locomotive: true } },
-        route: true,
+        // Yards carry the route's display name used by mapScheduleListItem.
+        route: { originYard: true, destinationYard: true },
         originStation: true,
         destinationStation: true,
         scheduleBookings: { booking: true },
@@ -2765,10 +2813,14 @@ export class TrainSchedulingService {
             `Booking ${booking.reference} is within the soft hold window (expires ${booking.holdExpiresAt?.toISOString()})`,
           );
         }
+        // Overweight is the soft threshold (maxVgmTons): the customer already
+        // paid the overweight surcharge at booking. The hard ceiling
+        // (maxCapacityTons) blocks booking creation, so anything reaching
+        // scheduling is shippable — warn the planner, never block allocation.
         const overweightLines = (booking.bookingContainers ?? []).filter((c) => c.isOverweight);
         if (overweightLines.length) {
-          violations.push(
-            `Booking ${booking.reference} has overweight container lines; use forceAssign to override`,
+          warnings.push(
+            `Booking ${booking.reference} has ${overweightLines.length} overweight container line(s); overweight surcharge applied`,
           );
         }
       }
@@ -4472,6 +4524,11 @@ export class TrainSchedulingService {
                 capacityTons: roundTons(Number(wagon.capacityTons)),
                 lengthMeters: roundTons(Number(wagon.lengthMeters)),
                 assignedWeightTons: roundTons(Number(wagon.assignedWeightTons)),
+                // Empty-wagon weight — the pull limit hauls tare + cargo, so the
+                // frontend needs it to show the gross train weight.
+                tareWeightTons: wagon.wagonType
+                  ? roundTons(Number(wagon.wagonType.tareWeightTons))
+                  : null,
                 status: wagon.status,
                 physicalWagonId: wagon.physicalWagonId ?? null,
                 physicalWagonNumber: wagon.physicalWagon?.wagonNumber ?? null,
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
index e180b482b..19e19dca3 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
@@ -82,6 +82,29 @@ describe('wagon-plan.util', () => {
     expect(plan).toHaveLength(2);
   });
 
+  it('counts a bulk booking\'s wagons from the plan, not a flat 1', () => {
+    // 700T of sugar on 60T CW3 gondolas = 12 wagons; the stored wagonsRequired
+    // must carry all of them so gross weight charges 12 tares downstream.
+    const booking = {
+      id: 'bulk-700',
+      reference: 'bulk-700',
+      freightType: 'BULK',
+      cargoTotalWeightVgm: 700,
+      bookingContainers: [],
+    } as unknown as Booking;
+    const plan = buildBulkWagonPlan([booking], cw3);
+    expect(plan).toHaveLength(12);
+    expect(sumWagonsRequired(booking, plan)).toBe(12);
+    // Without a plan the pre-plan fallback still applies.
+    expect(sumWagonsRequired(booking)).toBe(1);
+  });
+
+  it('counts container wagons from the plan TEU packing', () => {
+    const booking = makeContainerBooking('c-plan', [{ quantity: 6, wagonsRequired: 3 }]);
+    const plan = buildContainerWagonPlan([booking], nw5);
+    expect(sumWagonsRequired(booking, plan)).toBe(3);
+  });
+
   it('6×20ft containers = 3 wagon slots (2 per wagon)', () => {
     // 20ft containers have wagonsPerUnit = 0.5, so 6 * 0.5 = 3 wagons
     const booking = makeContainerBooking('b6x20', [{ quantity: 6, wagonsRequired: 3 }]);
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
index 30a46a099..2af606cdc 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
@@ -436,7 +436,21 @@ export function expandContainerItems(
   return items;
 }
 
-export function sumWagonsRequired(booking: Booking): number {
+/**
+ * Wagons a booking actually occupies. Prefer counting the built wagon plan's
+ * slots that carry one of the booking's allocations — for BULK that is its
+ * tonnage spread over real wagons (a 700T booking on 70T wagons rides 10
+ * wagons, and downstream gross-weight math charges 10 tares, not 1). Without
+ * a plan there is no capacity to divide by, so fall back to the pre-plan
+ * estimates: 1 for bulk, the lines' stored counts for containers.
+ */
+export function sumWagonsRequired(booking: Booking, wagonPlan?: WagonPlanSlot[]): number {
+  const occupiedSlots = (wagonPlan ?? []).filter((slot) =>
+    slot.allocations.some((allocation) => allocation.bookingId === booking.id),
+  ).length;
+  if (occupiedSlots > 0) {
+    return occupiedSlots;
+  }
   if (booking.freightType === 'BULK') {
     return 1;
   }
diff --git a/apps/edr-freight-api/src/modules/wagons/dto/create-wagon.dto.ts b/apps/edr-freight-api/src/modules/wagons/dto/create-wagon.dto.ts
index 03a930b11..d1939c9f5 100644
--- a/apps/edr-freight-api/src/modules/wagons/dto/create-wagon.dto.ts
+++ b/apps/edr-freight-api/src/modules/wagons/dto/create-wagon.dto.ts
@@ -1,5 +1,5 @@
 import { WagonStatus } from '@edr/types';
-import { IsString, IsUUID, IsOptional, IsInt, Min, IsNumber, IsEnum } from 'class-validator';
+import { IsString, IsUUID, IsOptional, IsInt, Min, IsEnum } from 'class-validator';
 
 export class CreateWagonDto {
   @IsString()
@@ -17,13 +17,8 @@ export class CreateWagonDto {
   @Min(1)
   sequenceNumber?: number;
 
-  @IsNumber()
-  @Min(0)
-  tareWeight!: number;
-
-  @IsNumber()
-  @Min(0)
-  maxPayloadWeight!: number;
+  // Tare weight and payload capacity are not accepted here: they belong to the
+  // wagon type and are resolved through wagonTypeId.
 
   @IsOptional()
   @IsEnum(WagonStatus)
diff --git a/apps/edr-freight-api/src/modules/wagons/entities/wagon.entity.ts b/apps/edr-freight-api/src/modules/wagons/entities/wagon.entity.ts
index 195b4932b..9f2d41416 100644
--- a/apps/edr-freight-api/src/modules/wagons/entities/wagon.entity.ts
+++ b/apps/edr-freight-api/src/modules/wagons/entities/wagon.entity.ts
@@ -7,6 +7,7 @@ import { TrainSchedule } from '../../train-schedules/entities/train-schedule.ent
 import { TrainSetWagon } from '../../train-sets/entities/train-set-wagon.entity';
 import { Container } from '../../container-management/entities/container.entity';
 import { Yard } from '../../rule-engine/entities/yard.entity';
+import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
 
 export const WAGON_STATUSES = [
   WagonStatus.Available,
@@ -28,17 +29,19 @@ export class Wagon extends BaseEntity {
   @Column({ name: 'wagon_type_id', type: 'uuid' })
   wagonTypeId!: string;
 
+  /** Owns this wagon's spec: tare weight, payload capacity, length. */
+  @ManyToOne(() => WagonType)
+  @JoinColumn({ name: 'wagon_type_id' })
+  wagonType?: WagonType;
+
   @Column({ name: 'train_id', type: 'uuid', nullable: true })
   trainId!: string | null;
 
   @Column({ name: 'sequence_number', type: 'int', nullable: true })
   sequenceNumber!: number | null;
 
-  @Column({ name: 'tare_weight', type: 'decimal', precision: 10, scale: 2 })
-  tareWeight!: number;
-
-  @Column({ name: 'max_payload_weight', type: 'decimal', precision: 10, scale: 2 })
-  maxPayloadWeight!: number;
+  // Tare weight and payload capacity are properties of the wagon TYPE — read them
+  // through `wagonType`, never off the individual wagon.
 
   @Column({ type: 'varchar', length: 20, default: WagonStatus.Available })
   status!: WagonStatusType;
diff --git a/apps/edr-freight-api/src/modules/wagons/wagons.service.ts b/apps/edr-freight-api/src/modules/wagons/wagons.service.ts
index 9d1f1b41f..b010c0351 100644
--- a/apps/edr-freight-api/src/modules/wagons/wagons.service.ts
+++ b/apps/edr-freight-api/src/modules/wagons/wagons.service.ts
@@ -52,14 +52,23 @@ export class WagonsService {
       });
     }
 
-    const sortBy = ['wagonNumber', 'tareWeight', 'maxPayloadWeight', 'status', 'currentYardId', 'sequenceNumber'].includes(query.sortBy ?? '')
+    // Spec columns (tare, payload) are no longer sortable here — they live on the
+    // wagon type, so sorting by them is sorting by wagonTypeId.
+    const sortable: Array<keyof Wagon> = [
+      'wagonNumber',
+      'status',
+      'currentYardId',
+      'sequenceNumber',
+      'wagonTypeId',
+    ];
+    const sortBy = sortable.includes((query.sortBy ?? '') as keyof Wagon)
       ? (query.sortBy as keyof Wagon)
       : 'wagonNumber';
     const sortOrder = query.sortOrder?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC';
 
     return this.wagonRepo.find({
       where: search ? where : filters,
-      relations: { currentYard: true },
+      relations: { currentYard: true, wagonType: true },
       order: { [sortBy]: sortOrder } as FindOptionsOrder<Wagon>,
       skip: query.page && query.limit ? (Number(query.page) - 1) * Number(query.limit) : undefined,
       take: query.limit ? Number(query.limit) : undefined,
@@ -69,7 +78,7 @@ export class WagonsService {
   async findById(id: string): Promise<Wagon> {
     const wagon = await this.wagonRepo.findOne({
       where: { id },
-      relations: { currentYard: true },
+      relations: { currentYard: true, wagonType: true },
     });
     if (!wagon) throw new NotFoundException(`Wagon ${id} not found`);
     return wagon;
diff --git a/apps/edr-freight-api/src/modules/warehouses/dto/release-order.dto.ts b/apps/edr-freight-api/src/modules/warehouses/dto/release-order.dto.ts
index 681b30284..17b75b424 100644
--- a/apps/edr-freight-api/src/modules/warehouses/dto/release-order.dto.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/dto/release-order.dto.ts
@@ -1,5 +1,5 @@
 import { ApiPropertyOptional } from '@nestjs/swagger';
-import { IsDateString, IsNumber, IsOptional, IsString, Min } from 'class-validator';
+import { IsBoolean, IsDateString, IsNumber, IsOptional, IsString, Min } from 'class-validator';
 
 /** Records a DO / release order being sent to the customer for import pickup. */
 export class ReleaseOrderDto {
@@ -90,4 +90,13 @@ export class ReleaseOrderDto {
   @IsOptional()
   @IsDateString()
   gateOutTime?: string;
+
+  @ApiPropertyOptional({
+    description:
+      'Container bookings only: the operator chose not to weigh this truck. ' +
+      'Tare/gross become optional and the container weight match is skipped. Bulk always weighs.',
+  })
+  @IsOptional()
+  @IsBoolean()
+  weighingSkipped?: boolean;
 }
diff --git a/apps/edr-freight-api/src/modules/warehouses/entities/warehouse-inventory.entity.ts b/apps/edr-freight-api/src/modules/warehouses/entities/warehouse-inventory.entity.ts
index a54f40973..b2c4ca3c4 100644
--- a/apps/edr-freight-api/src/modules/warehouses/entities/warehouse-inventory.entity.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/entities/warehouse-inventory.entity.ts
@@ -36,7 +36,9 @@ export const WAREHOUSE_INVENTORY_TRANSITIONS: Record<WarehouseInventoryStatus, W
   RECEIVED: ['STORED', 'READY_FOR_PICKUP'],
   // Reserve is retired from the operator flow — a stored export item advances
   // straight to loading prep. RESERVED kept for any in-flight/legacy items.
-  STORED: ['RESERVED', 'READY_FOR_LOADING'],
+  // READY_FOR_PICKUP is the way back out for an IMPORT item that was parked in
+  // storage from READY_FOR_PICKUP; without it, Store is a one-way door.
+  STORED: ['RESERVED', 'READY_FOR_LOADING', 'READY_FOR_PICKUP'],
   RESERVED: ['READY_FOR_LOADING'],
   READY_FOR_LOADING: ['LOADED'],
   LOADED: ['DISPATCHED'],
diff --git a/apps/edr-freight-api/src/modules/warehouses/handover.service.ts b/apps/edr-freight-api/src/modules/warehouses/handover.service.ts
index 5df15910e..48ab3ac48 100644
--- a/apps/edr-freight-api/src/modules/warehouses/handover.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/handover.service.ts
@@ -1,4 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common';
+import { Cron, CronExpression } from '@nestjs/schedule';
 import { NotificationAudience, NotificationType } from '@edr/types';
 import { DataSource, EntityManager, IsNull } from 'typeorm';
 
@@ -150,6 +151,37 @@ export class HandoverService {
     );
   }
 
+  /**
+   * Reminder loop: until a self-haul handover is signed, re-send the sign
+   * notification (in-app + SMS + email) every 5 minutes. One reminder per
+   * booking per tick, newest unsigned handover's reference. Stops the moment
+   * signForBooking() stamps signed_at.
+   *
+   * NB: runs in every API instance — keep a single instance in dev or the
+   * customer is reminded once per instance per tick.
+   */
+  @Cron(CronExpression.EVERY_5_MINUTES, { name: 'handover-sign-reminder' })
+  async remindUnsignedHandovers(): Promise<void> {
+    try {
+      const rows: Array<{ bookingId: string; reference: string }> = await this.dataSource.query(
+        `SELECT DISTINCT ON (booking_id)
+                booking_id AS "bookingId", reference
+           FROM freight.booking_handovers
+          WHERE signed_at IS NULL
+            AND deleted_at IS NULL
+            AND mile_type = 'SELF_HAUL'
+          ORDER BY booking_id, generated_at DESC`,
+      );
+      if (!rows.length) return;
+      this.logger.log(`Handover sign reminder: ${rows.length} booking(s) still unsigned`);
+      for (const row of rows) {
+        await this.notifySignNeeded(row.bookingId, row.reference);
+      }
+    } catch (err) {
+      this.logger.warn(`Handover sign reminder tick failed: ${(err as Error).message}`);
+    }
+  }
+
   /** Sign all unsigned handovers on a booking (self-haul: before the truck leaves). */
   async signForBooking(bookingId: string, userId?: string | null): Promise<void> {
     await this.dataSource
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
index 9b2f53a99..2b98856d0 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
@@ -860,6 +860,25 @@ export class WarehouseInventoryService {
   /** Bulk-receive eligible PAID bookings into a location. Skips duplicates / wrong direction. */
   async bulkReceive(dto: BulkReceiveDto): Promise<BulkReceiveResult> {
     const result: BulkReceiveResult = { receivedCount: 0, skippedCount: 0, results: [] };
+    /** Sent after the transaction commits so the gateway never blocks the receive. */
+    const pendingNotifications: Array<{
+      owner: {
+        phone?: string | null;
+        ownerName?: string | null;
+        bookingReference?: string | null;
+        grnNumber: string;
+        direction?: string | null;
+        warehouseId?: string | null;
+      };
+      booking: {
+        companyId?: string | null;
+        reference?: string | null;
+        hasFirstMile?: boolean;
+        hasLastMile?: boolean;
+        customerTruckAssignedAt?: string | null;
+      };
+      bookingId: string;
+    }> = [];
 
     await this.dataSource.transaction(async (manager) => {
       await this.validateLocation(manager, {
@@ -1032,21 +1051,33 @@ export class WarehouseInventoryService {
           manager,
         );
 
-        await this.notifyOwnerInventoryReceived({
-          phone: truckEntrance?.customerPhone ?? booking.customerPhone,
-          ownerName: truckEntrance?.ownerName ?? booking.customer,
-          bookingReference: truckEntrance?.edrDigitalBookingId ?? booking.reference,
-          grnNumber,
-          direction: dto.direction,
-          warehouseId: dto.warehouseId,
+        // Queued, not sent here: an SMS/email round-trip inside the transaction
+        // holds capacity/location locks open for the whole gateway latency.
+        pendingNotifications.push({
+          owner: {
+            phone: truckEntrance?.customerPhone ?? booking.customerPhone,
+            ownerName: truckEntrance?.ownerName ?? booking.customer,
+            bookingReference: truckEntrance?.edrDigitalBookingId ?? booking.reference,
+            grnNumber,
+            direction: dto.direction,
+            warehouseId: dto.warehouseId,
+          },
+          booking,
+          bookingId,
         });
 
         result.receivedCount += 1;
         result.results.push({ bookingId, status: 'RECEIVED', inventoryId: saved.id, grnNumber });
-        void this.notifyTruckAssignmentNeeded(booking, bookingId);
       }
     });
 
+    // Fan out after commit, un-awaited: the receive response must not wait on the
+    // SMS gateway. Both notifiers swallow their own errors.
+    for (const pending of pendingNotifications) {
+      void this.notifyOwnerInventoryReceived(pending.owner);
+      void this.notifyTruckAssignmentNeeded(pending.booking, pending.bookingId);
+    }
+
     return result;
   }
 
@@ -2326,6 +2357,27 @@ export class WarehouseInventoryService {
     });
   }
 
+  /**
+   * Self-haul = the customer's own truck collects the goods: either a truck
+   * assigned via the portal (customer_truck_assigned_at), or a walk-in truck
+   * registered at the gate on a booking with no EDR last-mile leg. EDR
+   * last-mile bookings are never self-haul.
+   */
+  private async isSelfHaulBooking(bookingId: string, manager?: EntityManager): Promise<boolean> {
+    const runner = manager ?? this.dataSource;
+    const [row]: Array<{ ok: number }> = await runner.query(
+      `SELECT 1 AS ok
+         FROM freight.bookings b
+         LEFT JOIN freight.service_types st ON st.id = b.service_type_id
+        WHERE b.id = $1 AND b.deleted_at IS NULL
+          AND (b.customer_truck_assigned_at IS NOT NULL
+               OR (NULLIF(TRIM(COALESCE(b.last_mile_delivery_address, '')), '') IS NULL
+                   AND COALESCE(st.includes_last_mile, false) = false))`,
+      [bookingId],
+    );
+    return Boolean(row);
+  }
+
   /** Record a DO / release order sent to the customer. Item stays READY_FOR_PICKUP. */
   async release(id: string, dto: ReleaseOrderDto): Promise<WarehouseInventory> {
     const item = await this.findById(id);
@@ -2335,19 +2387,17 @@ export class WarehouseInventoryService {
       );
     }
 
-    const isTruckLeaving = dto.grossWeight !== undefined && Boolean(dto.gateOutTime);
+    // Leaving = gate-out captured, with either a weighed gross or an explicit
+    // container weighing skip (bulk always weighs).
+    const isTruckLeaving =
+      Boolean(dto.gateOutTime) && (dto.grossWeight !== undefined || dto.weighingSkipped === true);
     if (isTruckLeaving) {
       await this.invoices.assertClearanceAllowed(id);
 
       if (item.bookingId) {
-        const [truckInfo]: Array<{ customerTruckAssignedAt: string | null }> =
-          await this.dataSource.query(
-            `SELECT customer_truck_assigned_at AS "customerTruckAssignedAt"
-               FROM freight.bookings
-              WHERE id = $1 AND deleted_at IS NULL`,
-            [item.bookingId],
-          );
-        const usesCustomerTruck = Boolean(truckInfo?.customerTruckAssignedAt);
+        // Self-haul = customer collects: a truck assigned via the portal, OR a
+        // walk-in truck registered at the gate on a booking with no EDR last mile.
+        const usesCustomerTruck = await this.isSelfHaulBooking(item.bookingId);
         // Self-haul: the handover must be signed before the exit paper is issued.
         // Prefer the structured handover record; fall back to the legacy note.
         const handoverSigned =
@@ -2361,7 +2411,8 @@ export class WarehouseInventoryService {
 
         // Authoritative weight match: the truck's net (gross − tare) must equal the
         // total VGM cargo weight of the containers selected as loaded on it.
-        if (dto.containerNumber && dto.grossWeight != null && dto.tareWeight != null) {
+        // Skipped when the operator chose not to weigh (containers only).
+        if (!dto.weighingSkipped && dto.containerNumber && dto.grossWeight != null && dto.tareWeight != null) {
           const selected = dto.containerNumber
             .split(/[,;\n]+/)
             .map((n) => n.trim())
@@ -2431,13 +2482,10 @@ export class WarehouseInventoryService {
           [item.bookingId],
         );
         // Self-haul: generate the per-booking handover on first truck arrival
-        // (idempotent). It must be signed before the truck leaves.
-        const [selfHaul]: Array<{ ok: number }> = await manager.query(
-          `SELECT 1 AS ok FROM freight.bookings
-            WHERE id = $1 AND customer_truck_assigned_at IS NOT NULL AND deleted_at IS NULL`,
-          [item.bookingId],
-        );
-        if (selfHaul) {
+        // (idempotent) and notify the customer to sign it. Covers BOTH portal-
+        // assigned trucks and walk-in trucks registered manually at the gate
+        // (no portal assignment, no EDR last mile). Must be signed before leaving.
+        if (await this.isSelfHaulBooking(item.bookingId, manager)) {
           await this.handover.ensureForArrivedTruck(item.bookingId, {}, manager);
         }
       }
@@ -4422,14 +4470,17 @@ export class WarehouseInventoryService {
     if (!dto.driverName?.trim()) {
       throw new BadRequestException('Driver name is required for exit inspection');
     }
-    if (dto.tareWeight === undefined) {
+    // Container bookings may skip the weighbridge entirely (weighingSkipped);
+    // bulk always weighs.
+    const weighingSkipped = dto.weighingSkipped === true;
+    if (dto.tareWeight === undefined && !weighingSkipped) {
       throw new BadRequestException('Tare weight is required for truck arrival');
     }
 
-    const tareWeight = Number(dto.tareWeight);
+    const tareWeight = dto.tareWeight === undefined ? null : Number(dto.tareWeight);
     const grossWeight = dto.grossWeight === undefined ? null : Number(dto.grossWeight);
     const computedNetWeight =
-      grossWeight == null ? null : Number((grossWeight - tareWeight).toFixed(3));
+      grossWeight == null || tareWeight == null ? null : Number((grossWeight - tareWeight).toFixed(3));
     const submittedNetWeight =
       dto.netWeight === undefined || computedNetWeight == null ? computedNetWeight : Number(dto.netWeight);
 
@@ -4441,7 +4492,11 @@ export class WarehouseInventoryService {
         throw new BadRequestException('Weight mismatch: net weight must equal gross weight minus tare weight.');
       }
     }
-    if ((dto.grossWeight !== undefined || dto.gateOutTime || dto.netWeight !== undefined) && grossWeight == null) {
+    if (
+      !weighingSkipped &&
+      (dto.grossWeight !== undefined || dto.gateOutTime || dto.netWeight !== undefined) &&
+      grossWeight == null
+    ) {
       throw new BadRequestException('Gross weight is required for truck exit');
     }
 
@@ -4457,7 +4512,8 @@ export class WarehouseInventoryService {
       dto.truckType?.trim() ? `Truck Type: ${dto.truckType.trim()}` : null,
       dto.containerNumber?.trim() ? `Container Number: ${dto.containerNumber.trim()}` : null,
       dto.gateInTime ? `Gate In Time: ${dto.gateInTime}` : null,
-      `Tare Weight: ${tareWeight} t`,
+      weighingSkipped ? 'Weighing: SKIPPED' : null,
+      tareWeight == null ? null : `Tare Weight: ${tareWeight} t`,
       grossWeight == null ? null : `Gross Weight: ${grossWeight} t`,
       computedNetWeight == null ? null : `Net Weight: ${computedNetWeight} t`,
       dto.gateOutTime ? `Gate Out Time: ${dto.gateOutTime}` : null,
@@ -4481,6 +4537,8 @@ export class WarehouseInventoryService {
       containerNumber: this.extractExitInspectionLine(inspection, 'Container Number') || dto.containerNumber,
       gateInTime: this.extractExitInspectionLine(inspection, 'Gate In Time') || dto.gateInTime,
       tareWeight: this.extractExitInspectionNumber(inspection, 'Tare Weight') ?? dto.tareWeight,
+      // The weigh/skip decision is made at arrival and sticks for the exit.
+      weighingSkipped: dto.weighingSkipped || /^Weighing:\s*SKIPPED/im.test(inspection) || undefined,
     };
   }
 
diff --git a/apps/edr-freight-api/src/scripts/seed-gate-pass-train-scenarios.ts b/apps/edr-freight-api/src/scripts/seed-gate-pass-train-scenarios.ts
index 4b3479327..a8abee67b 100644
--- a/apps/edr-freight-api/src/scripts/seed-gate-pass-train-scenarios.ts
+++ b/apps/edr-freight-api/src/scripts/seed-gate-pass-train-scenarios.ts
@@ -419,8 +419,6 @@ async function ensureWagon(manager: any, scenario: ScenarioTrain, sequenceNo: nu
     wagonTypeId,
     trainId: null,
     sequenceNumber: sequenceNo,
-    tareWeight: 20,
-    maxPayloadWeight: 70,
     status: WagonStatus.Assigned,
     currentYardId: yardId,
     currentTrainScheduleId: scheduleId,
diff --git a/apps/edr-freight-api/src/scripts/seed-negad-indode-arrived-train.ts b/apps/edr-freight-api/src/scripts/seed-negad-indode-arrived-train.ts
index 35e098f91..4f801330a 100644
--- a/apps/edr-freight-api/src/scripts/seed-negad-indode-arrived-train.ts
+++ b/apps/edr-freight-api/src/scripts/seed-negad-indode-arrived-train.ts
@@ -306,8 +306,6 @@ async function main() {
             wagonTypeId: wagonType.id,
             trainId: null,
             sequenceNumber: sequenceNo,
-            tareWeight: 20,
-            maxPayloadWeight: 70,
             status: WagonStatus.Assigned,
             currentYardId: indode.id,
             notes: 'Demo wagon for Negad to Indode marshalling',
diff --git a/apps/edr-freight-api/src/seed/batch5-test-data.seeder.ts b/apps/edr-freight-api/src/seed/batch5-test-data.seeder.ts
index c5a49e629..ebee2a547 100644
--- a/apps/edr-freight-api/src/seed/batch5-test-data.seeder.ts
+++ b/apps/edr-freight-api/src/seed/batch5-test-data.seeder.ts
@@ -2,6 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 
 import { Booking } from '../modules/bookings/entities/booking.entity';
+import { CompanyProfile } from '../modules/companies/entities/company-profile.entity';
 import { ServiceType } from '../modules/rule-engine/entities/service-type.entity';
 import { Yard } from '../modules/rule-engine/entities/yard.entity';
 import { Warehouse } from '../modules/warehouses/entities/warehouse.entity';
@@ -91,12 +92,26 @@ export class Batch5TestDataSeeder {
         return;
       }
 
+      // bookings.company_id AND bookings.company_profile_id are both NOT NULL, so a
+      // seed booking needs an owning company profile. Resolve the profile and take
+      // its company from it, so the two columns can never disagree. Without this the
+      // seeder aborted on its first insert.
+      const companyProfile = await this.dataSource
+        .getRepository(CompanyProfile)
+        .findOne({ where: {} });
+      if (!companyProfile) {
+        this.logger.warn('No company profile found; skipping Batch 5 seed');
+        return;
+      }
+
       const now = new Date();
 
       for (const seed of SEEDS) {
         const booking = await bookingRepo.save(
           bookingRepo.create({
             reference: seed.ref,
+            companyId: companyProfile.companyId,
+            companyProfileId: companyProfile.id,
             originYardId: originYard.id,
             destinationYardId: destYard.id,
             serviceTypeId: serviceType.id,
diff --git a/apps/edr-freight-api/src/seed/data/contract-template-defaults.ts b/apps/edr-freight-api/src/seed/data/contract-template-defaults.ts
new file mode 100644
index 000000000..6fba64010
--- /dev/null
+++ b/apps/edr-freight-api/src/seed/data/contract-template-defaults.ts
@@ -0,0 +1,873 @@
+import type {
+  ContractTemplateArticle,
+  ContractTemplateCode,
+} from "../../modules/contract-templates/entities/contract-template.entity";
+
+/**
+ * Default article packs for the six contract templates, transcribed from the
+ * signed EDR contract documents (test/contrat_docs). Article bodies use the
+ * dynamic-article text format: one clause per line, "- " prefix for bullets
+ * nested under the previous clause, single-line body = plain paragraph.
+ * Handlebars placeholders ({{client.companyName}}, {{contractDate}},
+ * {{contractYear}}, {{reference}}) interpolate at render time.
+ */
+export interface ContractTemplateSeed {
+  code: ContractTemplateCode;
+  name: string;
+  description: string;
+  documentTitle: string;
+  whereasClauses: string[];
+  articles: Array<Omit<ContractTemplateArticle, "order">>;
+}
+
+const a = (id: string, title: string, body: string): Omit<ContractTemplateArticle, "order"> => ({
+  id,
+  title,
+  body: body.trim(),
+});
+
+/* ────────────────────────────── IMPORT / BULK ────────────────────────────── */
+
+const IMPORT_BULK: ContractTemplateSeed = {
+  code: "IMPORT_BULK",
+  name: "Bulk Import Contract",
+  description:
+    "Import of bulk cargo (e.g. steel billets) from Djibouti (DMP/Nagad) to Galaan Multipurpose Port with customs clearance and optional last-mile delivery.",
+  documentTitle: "Bulk Cargo Transportation and Customs Clearance Services",
+  whereasClauses: [
+    "The Client has agreed to engage the Service Provider for transportation and customs clearance services for bulk cargo, including first-mile transport to the railway station at Djibouti, loading at either DMP or Nagad Railway Station (Djibouti), port/rail terminal handling, loading onto the train, railway transport to Galaan Multipurpose Port (GMP) in Ethiopia, unloading at the destination port from train to load directly on truck, onward transportation to the Client's site (excluding truck loading at Djibouti and truck unloading at the Client destination where last-mile service is undertaken by the Service Provider), and all related documentation.",
+    "The Service Provider has agreed to provide the requested services in accordance with the terms and conditions of this Agreement.",
+  ],
+  articles: [
+    a(
+      "objective",
+      "Objective of the Services",
+      `The objective of this contract is to provide the Client with integrated logistics services for the transportation of bulk cargo, including:
+- First-mile transportation in Djibouti from the Client's designated cargo location to the selected railway station (DMP or Nagad).
+- Port handling and loading onto railway wagons.
+- Railway transport from DMP and/or Nagad Railway freight station (Djibouti) to Galaan Multipurpose Port.
+- Customs clearance in Djibouti and Ethiopia.
+- Unloading from train at the destination port to load directly on truck.
+- Last-mile delivery by truck to the Client's delivery site where the last-mile service is undertaken by the Service Provider.
+The truck loading at Djibouti and the truck unloading at the Client's delivery site shall be the responsibility of the Client.`,
+    ),
+    a(
+      "client-obligations",
+      "Obligations of the Client",
+      `Provide written/email/electronic instructions specifying the cargo volume and the selected loading station (DMP or Nagad) for each shipment.
+Prepare and submit all necessary documents and permits to enable smooth service execution.
+Ensure cargo readiness in compliance with specifications (including weight, size, and contour restrictions).
+Handle truck loading at Djibouti Free Zone/Old Port/DMP and any other designated cargo location at Djibouti, and truck unloading at the delivery site.
+Ensure safety and proper securing of cargo during truck handling.
+Submit all required documents necessary for customs clearance and cargo release within one (1) calendar day from the date of request or notification by the Service Provider.
+Upon receipt of the wagon allocation list and train schedule from the Service Provider, ensure that the cargo is transferred to the designated loading freight station and made ready for loading within two (2) days prior to wagon arrival. Any delay beyond this period resulting from Client-related issues shall be subject to a charge of USD 56 per wagon per day, or part thereof, until the cargo is made available for loading.
+Upon arrival of the train at Galaan Multipurpose Port (GMP), offload cargo from wagons within twenty-four (24) hours of train arrival. Where the Client undertakes last-mile transportation, the Client may arrange sufficient trucks at the time of train arrival to enable direct loading of cargo from wagons to trucks.
+In the event the Client is unable to provide trucks for the collection of cargo within twenty-four (24) hours of train arrival, the Service Provider shall have the right to handle and reposition the cargo to any location it deems appropriate, and shall not be held responsible for any loss, shortage, or damage arising from such repositioning.
+Any additional handling, re-handling, or repeated loading operations performed by the Service Provider shall be charged as double handling fees at a rate of USD 4 per ton, payable by the Client.
+If stored, the full cargo must be collected from the Galaan Multipurpose Port compound within three (3) days from the time of train arrival at the port.
+If the Client fails to collect the cargo within the specified period, the Client shall be liable to pay demurrage charges of USD 2 per day per ton, calculated based on the Commercial Bank of Ethiopia's daily selling exchange rate on the date of payment.
+Where the last-mile service is provided by the Service Provider, unload the cargo from the truck at the delivery site within the agreed time frame.
+Designate authorized representatives (with valid power of attorney) for handover at origin and destination.
+Settle demurrage payments within ten (10) calendar days from the date the Service Provider issues a claim.
+Pay the Service Provider one hundred percent (100%) of the contract price in advance for each train set in accordance with the pricing article of this Agreement.
+Contact the Service Provider to obtain confirmation prior to booking and proceeding with payment.`,
+    ),
+    a(
+      "provider-obligations",
+      "Obligations of the Service Provider",
+      `Provide first-mile transportation in Djibouti from the Client's designated location to the selected railway station (DMP or Nagad).
+Carry out port handling and loading onto railway wagons.
+Provide railway transportation from DMP/Nagad (Djibouti) railway freight station to Galaan Multipurpose Port.
+Perform unloading at Galaan Multipurpose Port (GMP) to load directly on truck.
+Perform customs clearance in Djibouti and Ethiopia, including border station procedures.
+Prepare and submit all required transport documentation.
+Provide cargo insurance coverage for each supplied wagon.
+Notify the Client of train schedules, wagon numbers, and expected arrival times in advance.`,
+    ),
+    a(
+      "force-majeure",
+      "Force Majeure",
+      `Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.
+Force majeure shall be interpreted in accordance with the Ethiopian Civil Code.`,
+    ),
+    a(
+      "liability",
+      "Liabilities Related to Damages and Losses",
+      `The Service Provider shall be fully responsible for any loss, shortage, or damage to cargo that occurs after it has been taken over until delivery to the Client's delivery site.
+Compensation shall be based on the market value of the cargo, in accordance with applicable laws.`,
+    ),
+    a(
+      "pricing",
+      "Contract Price and Payment Terms",
+      `Rail transport to Galaan Multipurpose Port: USD 59.4 per metric ton.
+Djibouti handling (first-mile, port handling and loading, and documentation): USD 18 (eighteen) per metric ton for cargo from the Free Zone; USD 20 (twenty) per metric ton for cargo from the Old Port or DMP.
+Lashing materials shall be charged at USD 150 (one hundred fifty) per wagon and wood at USD 50 (fifty) per wagon when provided by the Service Provider; the provision continues until the cargo reaches and is fully unloaded at the designated destination station.
+Each wagon shall be loaded up to a maximum of seventy (70) metric tons; for billing purposes one full wagon shall be deemed equivalent to this volume.
+The price for last-mile delivery shall be determined once the cargo departs from the loading point and shall be communicated to the Client by official email upon the Client's request.
+Payments shall be made 100% in advance in USD.`,
+    ),
+    a(
+      "contract-documents",
+      "Contract Documents",
+      `The following documents form part of this contract:
+- This Contract Agreement.
+- Any amendments made to this Agreement.
+- Minutes of negotiation (if any).`,
+    ),
+    a(
+      "documentation",
+      "Documentation Requirements",
+      `The Service Provider shall deliver the following to the Client:
+- Freight Carriage Acceptance Sheet of the Addis Ababa–Djibouti Railway.
+- Notice of transportation and miscellaneous charges.
+- Summary of payment request as per the agreed tariff, if required.`,
+    ),
+    a(
+      "consignment-notes",
+      "Consignment Notes",
+      `The Service Provider shall certify the taking over of goods in the Freight Carriage Acceptance Sheet.
+This document shall serve as prima facie evidence of receipt of the cargo.
+Upon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.`,
+    ),
+    a(
+      "termination",
+      "Termination of Contract",
+      `This contract may be terminated:
+- By mutual consent.
+- Upon completion of the agreed contract period or cargo volume.
+- For breach of fundamental provisions, with one-week prior written notice.`,
+    ),
+    a(
+      "effectiveness",
+      "Contract Effectiveness",
+      `This Agreement becomes effective on the date it is signed by both parties.`,
+    ),
+    a(
+      "duration",
+      "Duration",
+      `The contract is valid until August 31, {{contractYear}} from the date of effectiveness, extendable by mutual agreement.`,
+    ),
+    a(
+      "disputes",
+      "Settlement of Disputes",
+      `Disputes shall first be settled amicably.
+If unresolved, disputes shall be referred to the competent Federal Court of Ethiopia in Addis Ababa.
+The governing law shall be the laws of the Federal Democratic Republic of Ethiopia.`,
+    ),
+  ],
+};
+
+/* ────────────────────────────── EXPORT / BULK ────────────────────────────── */
+
+const EXPORT_BULK: ContractTemplateSeed = {
+  code: "EXPORT_BULK",
+  name: "Bulk Export Contract",
+  description:
+    "Export of bulk cargo (e.g. livestock) by railway from Ethiopian loading stations to Nagad railway freight yard, Djibouti.",
+  documentTitle: "Bulk Cargo Transportation Service by Railway",
+  whereasClauses: [
+    "The Client has agreed to deliver bulk cargo to the Service Provider for transport from the agreed Ethiopian loading station to Nagad railway freight yard using the Addis Ababa–Djibouti railway line.",
+    "The Service Provider has agreed to provide the service to transport the bulk cargo from the agreed loading station to Nagad railway freight yard.",
+  ],
+  articles: [
+    a(
+      "objective",
+      "Objective of the Service",
+      `To undertake the railway transportation of bulk cargo from the agreed Ethiopian loading station to Nagad railway freight yard.`,
+    ),
+    a(
+      "client-obligations",
+      "Obligations of the Client",
+      `Give written instruction to the Service Provider to transport a minimum of one wagon of cargo; the wagon request shall be made at least five (5) days in advance for each wagon.
+Maintain detailed information incorporating type, weight, and destination of the cargo ready for shipment, and notify the Service Provider or its nominated agent by notice, email, or fax.
+Prepare the necessary documents and facilities to make the cargo ready for transport.
+Note the allowable transport period of the cargo: the maximum time range during which the goods maintain their condition without any problem. The allowable transport period must be at least two (2) days longer than the delivery period.
+Ensure cargo is properly loaded and fastened in the wagons, provide the necessary lashing and barriers for loading as per the instruction of the departure station, and bear responsibility for the condition of the cargo during the transport period.
+Supply the necessary provisions for the cargo for each wagon and assign a responsible person to travel with the train to check the status of the cargo during transport, where the nature of the cargo so requires.
+Supply the minimum amount of cargo available for at least one wagon.
+Execute loading, lashing, and preparing barriers on wagons at the loading station and provide the complete documents/bill to the Service Provider within one (1) calendar day.
+For each extra calendar day used for loading cargo and completing documents at the loading station, pay the wagon-occupied fee per the pricing article; the fee shall be paid within ten (10) calendar days from the date the Service Provider claims it, failing which compensation is payable calculated on the basis of the Commercial Bank of Ethiopia interest rate for the delay period.
+Be responsible for safety matters, and indemnify and hold the Service Provider harmless against all consequences resulting from accidents arising from or associated with the loading and unloading process.
+Execute and cover the cost of loading and unloading of cargo at both the loading station and Nagad railway freight yard.
+Follow up that the cargo is loaded and unloaded on time.
+Delegate representatives at both ends to consign and receive cargo with signature and stamp. Representatives shall hold a duly signed and stamped power of attorney and shall produce their ID or passport when consigning or receiving the cargo.
+Prepare the necessary facilities to take over the transported cargo at Nagad freight yard upon arrival by issuing handover documents.
+Take the transported cargo out of the wagons at Nagad freight yard within one (1) calendar day starting from the day following the notice of arrival.
+Pay the wagon-occupied fee per the pricing article for delays of more than one (1) calendar day at Nagad railway freight yard due to the fault of the Client in resolving customs or third-party claims or any other causes.
+After the wagon list is submitted to the Client, if a wagon is not loaded due to the fault of the Client, pay 100% of the transportation price per wagon for each unloaded wagon.
+Pay the Service Provider 100% of the contract price in advance for each wagon.`,
+    ),
+    a(
+      "provider-obligations",
+      "Obligations of the Service Provider",
+      `Provide the list and identification numbers of wagons with sequence and locomotives at least twenty-four (24) hours in advance to the Client, with any correction at least twelve (12) hours before arrival at destination.
+Transport the cargo from the loading station to Nagad railway freight yard.
+Provide safe transportation of the cargo throughout the transit.
+Present customs clearance documents and mobilize the rolling stock as needed.
+Provide the wagons assigned for the freight at the agreed place and time, and follow up that the cargo is loaded on time.
+Transport and deliver the cargo taken over, in the condition received, within two (2) calendar days to Nagad railway freight yard.
+Where a wagon carrying cargo stops due to accident or mechanical problem, promptly notify the nearby customs station, police office, and the Client. A wagon stopped in Ethiopia due to mechanical defect shall be maintained within four (4) calendar days; within Nagad (Djibouti) territory within twelve (12) calendar days. In case of accident where the problem cannot be solved within one (1) calendar day and the wagon is not operational, the Service Provider shall have the cargo carried and delivered by another wagon, and shall provide an accident or defect report issued by the local police office regarding the sustained damage.
+Buy a cargo liability insurance policy for each supplied wagon.
+Provide wagon cleaning service and charge the cleaning fee based on actual expenditure.
+If the Client fails or refuses to receive the cargo beyond the allowable transport period, the Service Provider has the right to handle the cargo.
+Neither party shall be liable for any indirect or consequential loss sustained by the other in connection with this Agreement.`,
+    ),
+    a(
+      "force-majeure",
+      "Force Majeure",
+      `The parties have no obligation to pay demurrage or any other compensation if they have failed to discharge their obligations due to force majeure.
+Force majeure shall be deemed to exist when the contract is not performed due to any event beyond the reasonable control of a party which prevents that party from complying with its obligations under this Agreement, including but not limited to:
+- Acts of God (such as, but not limited to, fires, explosions, earthquakes, drought, tidal waves, and floods).
+- War, hostilities (whether war is declared or not), invasion, acts of foreign enemies, mobilization, requisition, or embargo.
+- Rebellion, revolution, insurrection, military or usurped power, or civil war.
+- Contamination by radioactivity from any nuclear fuel or nuclear waste.
+- Riot, commotion, strikes, go-slows, lockouts, or disorder.
+- Acts of terrorism.
+A party wishing to claim protection in respect of a force majeure event shall, as soon as possible following the occurrence or commencement of the event, notify the other party of its nature and expected duration, and shall thereafter keep the other party informed until it is able to perform its obligations under this Agreement.`,
+    ),
+    a(
+      "pricing",
+      "Contract Price and Terms of Payment",
+      `The price of bulk cargo transportation from the loading station to Nagad shall be USD 696 (six hundred ninety-six) per wagon.
+Payment for transport services shall be made in Birr based on the selling price of USD to Birr on the date of payment set by the Commercial Bank of Ethiopia.
+If there is an increment or decrement of the USD exchange rate to Birr between the date of payment and the date the wagon/train number is provided to the Client, either the Client shall make the additional payment to the Service Provider or the Service Provider shall refund the difference from the initial payment to the Client.
+The cost of loading at the loading station and unloading at Nagad shall be covered by the Client and is not part of this contract agreement.
+The Client shall pay 100% of the contract price in advance.
+The Client shall pay a demurrage fee for occupied wagons as follows:
+- Wagons occupied between 1 and 3 days: USD 193 per wagon per day.
+- Wagons occupied between 4 and 7 days: USD 290 per wagon per day.
+- Wagons occupied 8 days and above: USD 590 per wagon per day.
+Demurrage payment shall be made in Birr based on the selling price of USD to Birr set by the Commercial Bank of Ethiopia on the date of the demurrage occurrence.`,
+    ),
+    a(
+      "contract-documents",
+      "Contract Documents",
+      `The following documents shall constitute the contract between the Client and the Service Provider:
+- Amendments made to this contract (if any).
+- This Contract Agreement.
+- Final minutes of negotiation (if any).
+If there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.`,
+    ),
+    a(
+      "documentation",
+      "Documentation Requirements",
+      `The following documents shall be delivered to the Client upon request for settlement:
+- Consignment Note (cargo handover document to the Client).
+- Summary of payment request of the Service Provider prepared as per the agreed tariff.`,
+    ),
+    a(
+      "consignment-notes",
+      "Consignment Notes",
+      `The Service Provider must certify the taking over of the goods on the duplicates of the consignment note in an appropriate manner and return the duplicate to the Client.
+A consignment note shall be prima facie evidence of the receipt of the goods by the Service Provider and of the kind, number, and weight of the goods.`,
+    ),
+    a(
+      "termination",
+      "Termination of Contract",
+      `The contract may be terminated:
+- Upon mutual consent of the parties.
+- Upon completion of the contract period.
+- If either or both parties breach a fundamental provision of the contract, upon prior legal notice delivered by either party.`,
+    ),
+    a(
+      "effectiveness",
+      "Contract Effectiveness",
+      `The contract shall come into full force and effect on the date when all of the following are accomplished:
+- The contract is signed by the Client and the Service Provider.
+- The Service Provider has received the advance payment of 100% of the contract price for each train set of cargo.`,
+    ),
+    a(
+      "cargo-amount",
+      "Cargo Amount",
+      `The minimum cargo to be transported shall be one wagon.`,
+    ),
+    a(
+      "duration",
+      "Duration of Contract",
+      `The contract shall last for three (3) months starting from the date of contract signing, with possible extension upon mutual agreement.`,
+    ),
+    a(
+      "disputes",
+      "Settlement of Disputes",
+      `If a dispute arises between the parties, they shall exert efforts to settle their differences amicably.
+If the parties fail to settle their disputes amicably, the case shall be taken to the competent Federal Court of law presiding in Addis Ababa.
+The governing law shall be the laws of the Federal Democratic Republic of Ethiopia.`,
+    ),
+  ],
+};
+
+/* ──────────────────────────── INTERCITY / BULK ───────────────────────────── */
+
+const INTERCITY_BULK: ContractTemplateSeed = {
+  code: "INTERCITY_BULK",
+  name: "Bulk Intercity Contract",
+  description:
+    "Domestic (intercity) bulk cargo transportation by railway between Ethiopian freight yards, e.g. Dire Dawa to Sebeta.",
+  documentTitle: "Bulk Cargo Transportation Service by Railway (Intercity)",
+  whereasClauses: [
+    "The Client has requested the Service Provider to transport bulk cargo between the agreed Ethiopian railway freight yards using the Ethio–Djibouti Railway.",
+    "The Service Provider has accepted the Client's request to render the said transportation service.",
+  ],
+  articles: [
+    a(
+      "objective",
+      "Objective of the Contract",
+      `The Service Provider shall undertake the railway transportation of bulk cargo from the agreed origin railway freight yard to the agreed destination railway freight yard.`,
+    ),
+    a(
+      "client-obligations",
+      "Obligations of the Client",
+      `Provide written instructions to the Service Provider to transport a minimum of sixteen (16) wagons of cargo per consignment.
+Prepare all necessary documents, including laboratory tests from the pertinent organ and off-taking contract where applicable, and the facilities required to sign the contract and make the cargo ready for transport.
+Assign representatives at the origin yard and other stations, as required, to hand over the cargo to the Service Provider and handle transit clearance if required.
+Transport the cargo to the designated loading points at the origin yard.
+Be responsible for cargo handling: loading at the origin yard and unloading at the destination yard, in accordance with the standards set by the EDR operations and technical terms.
+Make advance payment to the Service Provider for services in accordance with the payment terms and conditions of this contract.
+Follow up to ensure that the cargo is loaded and unloaded on time.
+Delegate representatives at the cargo destination to immediately receive the transported cargo.
+Ensure representatives are duly authorized with a power of attorney, signed and stamped by the Client, and present valid identification (ID or passport) when consigning or receiving cargo.
+Maintain detailed information including item, weight, and destination of the cargo, and communicate the same to the Service Provider or its nominated agent via written notice, email, or fax.
+Prepare the necessary facilities to immediately take over the transported cargo at the destination upon arrival and provide sufficient trucks at the destination freight yard for unloading from railway wagons.
+Upon arrival of the train/wagon at the unloading site, sign the train arrival confirmation sheet to acknowledge the arrival time.
+Inspect the loaded wagons jointly with the Service Provider and EDR at the loading yard, and again with the customs agent (if required) and the Service Provider at the destination yard.
+After receiving the cargo, sign the Freight Carriage Acceptance Sheet (copies II, III, and IV) immediately to confirm delivery.
+Compensate the Service Provider or any third party for actual loss or damage caused to persons, property, or wagons during unloading where such damage is attributable to the Client's fault.
+Each consignment (train) shall be granted three (3) hours of free time at the loading station and one (1) day at the unloading station. For each additional 3 hours of loading or parking the Client shall pay ETB 5,000 (five thousand) per wagon, and for each additional day of unloading ETB 5,000 (five thousand) per wagon per day.
+Bear demurrage charges of ETB 5,000 (five thousand) per wagon per 3 hours for delays exceeding three (3) hours at any station resulting from the Client's failure to resolve customs or third-party claims.
+Pay 100% of the transport price in advance. Any additional charges or fees shall be paid within ten (10) calendar days after submission of the Service Provider's payment request.`,
+    ),
+    a(
+      "provider-obligations",
+      "Obligations of the Service Provider",
+      `Provide the necessary train(s) to execute the transportation service under this contract, and furnish the Client with the list and identification numbers of wagons and locomotives at least 24 hours in advance, with corrections (if any) communicated at least 12 hours before the expected time of arrival at destination.
+Provide pre-arrival notification including the train number to the discharging terminal and customs at least 24/12 hours before train arrival.
+Transport the cargo from origin to destination within two (2) days from completion of loading (time counting starts upon completion of documentation and loading).
+Provide safe transportation of the cargo throughout transit.
+Deliver the cargo to the Client at the destination railway freight yard in the same condition as received.
+Purchase a cargo liability insurance policy for each wagon transported.`,
+    ),
+    a(
+      "force-majeure",
+      "Force Majeure",
+      `Neither party shall be liable due to a force majeure event.
+For the purposes of this contract, force majeure shall mean any unforeseeable event or circumstance beyond the reasonable control of the affected party which absolutely prevents the performance of the contract, including but not limited to natural disasters, war, civil commotion, strikes, government actions, epidemics, or interruption of railway operations due to accidents or infrastructure failure.
+The affected party shall notify the other party in writing within a reasonable period not exceeding two (2) hours after the occurrence of the force majeure event, providing evidence and details of the impact on performance and the mitigating steps taken.`,
+    ),
+    a(
+      "liability",
+      "Liabilities Related to Damages and Losses",
+      `The Service Provider will be responsible for any loss, shortage, or damage occurring to the cargo it has received.`,
+    ),
+    a(
+      "pricing",
+      "Contract Price",
+      `The price for transporting cargo from the origin freight yard to the destination freight yard shall be USD 400 (four hundred) per wagon.
+Each wagon shall be loaded with a maximum of 70 (seventy) metric tons.
+Payment for transport services may be made in Ethiopian Birr, based on the Commercial Bank of Ethiopia's official selling exchange rate of USD to Birr on the date of payment.
+If the exchange rate changes between the payment and the wagon assignment date, payment adjustments will be made accordingly.
+The contract price shall include the cost of railway transportation from the origin freight yard to the destination freight yard.
+Excluded cost: cargo handling (loading and unloading) is not included in the contract price and shall remain the sole responsibility of the Client.`,
+    ),
+    a(
+      "contract-documents",
+      "Contract Documents",
+      `The following documents shall constitute the contract between the Client and the Service Provider:
+- Amendments made to this contract (if any).
+- This Contract Agreement.
+- Final minutes of negotiation (if any).
+If there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.`,
+    ),
+    a(
+      "documentation",
+      "Documentation Requirements",
+      `The following documents shall be delivered to the Client by the Service Provider to collect and settle payment:
+- Freight Carriage Acceptance Sheet of the Ethio-Djibouti Railway.
+- Notice of collecting transportation and miscellaneous charges of the Ethio-Djibouti Railway (if any).
+- Summary of payment request of the Service Provider prepared as per the agreed tariff.
+- Railway Waybill.`,
+    ),
+    a(
+      "consignment-notes",
+      "Consignment Notes",
+      `The Service Provider must certify the taking over of the goods on copy III (kept by the consignee for future reference) of the Freight Carriage Acceptance Sheet of the Ethio-Djibouti Railway in an appropriate manner and provide it to the Client.
+The Freight Carriage Acceptance Sheet shall be prima facie evidence of the receipt of the goods by the Service Provider and of the kind, number, and weight of the goods.`,
+    ),
+    a(
+      "termination",
+      "Termination of Contract",
+      `The contract may be terminated:
+- Upon mutual consent of the parties.
+- Upon completion of the contract period or amount of cargo, whichever comes first.
+- If either or both parties breach a fundamental provision of the contract, upon one-week prior legal notice delivered by either party.`,
+    ),
+    a(
+      "duration",
+      "Duration of Contract",
+      `The contract duration shall be three (3) months from the date of effectiveness of the contract, with possible extension upon mutual agreement of the parties.`,
+    ),
+    a(
+      "disputes",
+      "Settlement of Disputes",
+      `If a dispute arises between the parties, they shall exert efforts to settle their differences amicably.
+If the parties fail to settle their dispute amicably, the case shall be taken to the competent Federal Court of law presiding in Addis Ababa.
+The governing law shall be the laws of the Federal Democratic Republic of Ethiopia.`,
+    ),
+    a(
+      "effectiveness",
+      "Contract Effectiveness",
+      `The contract shall come into full force and effect on the date when the contract is signed by the parties and witnesses.`,
+    ),
+  ],
+};
+
+/* ──────────────────────────── IMPORT / CONTAINER ─────────────────────────── */
+
+const IMPORT_CONTAINER: ContractTemplateSeed = {
+  code: "IMPORT_CONTAINER",
+  name: "Container Import Contract",
+  description:
+    "Import container transport by railway from SGTD (Djibouti) to Dire Dawa, Modjo dry port, or Galaan Multipurpose Port, with empty-container return.",
+  documentTitle: "Import Container Transport Service by Railway",
+  whereasClauses: [
+    "The Client has requested and agreed to the transportation of container cargo from SGTD railway freight station at Djibouti to Dire Dawa, Modjo dry port, and Galaan Multipurpose Port (GMP), and the return of empty containers from Dire Dawa, Modjo dry port, and Galaan Multipurpose Port (GMP) to SGTD railway freight station using the Addis Ababa–Djibouti railway line.",
+    "The Service Provider has agreed to transport the container cargo as per the terms of this contract.",
+  ],
+  articles: [
+    a(
+      "objective",
+      "Objective and Scope of the Services",
+      `To provide railway transportation services for 40ft and/or 20ft full containers from SGTD to Dire Dawa, Modjo dry port, and/or Galaan Multipurpose Port (GMP), and empty container return from Dire Dawa, Modjo dry port, and Galaan Multipurpose Port (GMP) to SGTD.
+The scope of the services comprises:
+- Railway transport service.
+- Cargo handling at Galaan Multipurpose Port (GMP).`,
+    ),
+    a(
+      "client-obligations",
+      "Obligations of the Client",
+      `Give written/email/electronic shipment instructions to the Service Provider for transportation of container cargo from SGTD to Dire Dawa, Modjo dry port, and/or Galaan Multipurpose Port (GMP).
+Prepare all necessary documents and facilities for shipment.
+Ensure the following minimum supply of containers per shipment based on the loading terminal and destination:
+- Minimum of twenty-five (25) 40ft containers or fifty (50) 20ft containers to Modjo dry port.
+- Minimum of ten (10) 40ft containers or twenty (20) 20ft containers to Dire Dawa dry port.
+- Minimum of one (1) 40ft container or two (2) TEU to Galaan Multipurpose Port (GMP).
+One flat wagon must carry either one 40ft container or two 20ft containers.
+If two 20ft containers are loaded on one flat wagon, their weight difference must not exceed 10 tons.
+Ensure timely loading and unloading of cargo.
+Assign representatives at both ends to oversee container handover and ensure the necessary arrangements for cargo reception at the destination upon arrival.
+Maintain and provide detailed cargo information (type, weight, destination, etc.).
+Be responsible for cargo handling, loading, and unloading of both empty and full containers at Modjo, Dire Dawa dry port, and SGTD.
+Book wagons at least five (5) days in advance.
+Ensure containers are ready one day before the planned loading date.
+Submit all required documents to the Djibouti Nagad station at least 24 hours in advance before starting to load. Failure to submit the documents within the stipulated time shall result in the following demurrage charges, calculated as a percentage of the booked wagon price:
+- Delay of up to twelve (12) hours: 20% of the booked wagon price.
+- Delay exceeding twelve (12) hours but not more than one (1) day: 50% of the booked wagon price.
+- Delay of more than one (1) day: 100% of the booked wagon price.
+Collect the full container from Galaan Multipurpose Port (GMP) within three (3) calendar days from the day following the arrival notice.
+If the Client fails to collect the container within the specified period, the Service Provider shall have the right to reposition the container to any location it deems appropriate; in such case, the Service Provider shall not be held responsible for any damage or loss arising from such repositioning.
+If the Client fails to collect the container from Galaan Multipurpose Port within the specified period, the Client shall be liable to pay demurrage charges of 15 USD per day per 20ft container and 27 USD per day per 40ft container, calculated based on the Commercial Bank of Ethiopia's daily selling exchange rate on the date of payment.
+In the event the Client fails to collect the container(s) within the specified period, the Client shall be liable to pay double handling charges of 27 USD per 20ft container per handling or 40 USD per 40ft container per handling, calculated based on the Commercial Bank of Ethiopia's daily selling exchange rate on the date of payment.
+If empty containers cannot be offloaded from the train upon arrival at SGTD due to any Client-related issue, the Client shall be liable for the applicable penalty charges.
+Penalty charges for delay at SGTD/Nagad upon train arrival: 20 USD per day per 20ft container; 33 USD per day per 40ft container.
+Collect the containers within one day at Dire Dawa and Modjo dry port, or make the necessary payment to the dry port as per the standard of the dry port.
+For returning empty containers, deliver to Dire Dawa dry port, Modjo dry port, or Galaan Multipurpose Port.
+Once the empty containers are returned from the Client's premises and stored at Dire Dawa/Modjo dry port while awaiting train allocation for return to SGTD, any demurrage and/or storage charges incurred from the dry port thereafter shall not be the responsibility or liability of the Service Provider; the Client shall be solely responsible for settling such charges.
+Provide clean empty containers that meet SGTD standards. If the port refuses to take over an empty container because of inside cleanliness problems, additional cleaning costs incurred due to non-compliance will be borne by the Client.
+Ensure containers are structurally intact and meet weight distribution requirements.
+Prohibited cargo: cargo covered with tarpaulin is not allowed due to safety risks.
+Notify the Service Provider forty-eight (48) hours in advance before wagon booking if transporting hazardous or valuable goods.
+If a booked wagon is not loaded due to Client-related issues, including but not limited to a damaged container, missing lock, unpaid demurrage, port system errors, or incomplete documentation and submission, the Client shall be charged 100% of the total price of the reserved wagon.
+Refund requests before wagon booking require an official request, with a 3% administrative fee deducted. If the refund is due to the Service Provider, the Client shall receive a full refund. Refunds not requested and completed within six months shall be considered waived.
+Pay 100% of the transportation fee in advance for each train set.
+Settle additional penalties due to non-compliance within ten (10) days of invoice issuance.
+Late payment incurs a penalty of an additional 10%.`,
+    ),
+    a(
+      "provider-obligations",
+      "Obligations of the Service Provider",
+      `Assign the necessary voyage based on the operational schedule and cargo demand, and notify the train schedule 48 hours in advance.
+Provide a list of wagons/voyage or train number 24 hours in advance and update corrections 12 hours before arrival.
+Provide safe transportation of the containers.
+Deliver the cargo within two (2) days after train departure, provided that all required documents are submitted on time and no unforeseen circumstances or events occur.
+Return empty containers from Dire Dawa, Modjo, and Galaan Multipurpose Port to SGTD within seven (7) calendar days of receipt.
+In the event of export cargo operations, the Service Provider may prioritize the loading of export containers during the loading of empty containers and the unloading of import containers from the train at Galaan Multipurpose Port.
+The Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous goods.
+If any operational, technical, or mechanical problem occurs throughout the transit, notify customs and arrange cargo transfer within 4 days if the incident occurs in Ethiopia, or within 6 days if it occurs in Djibouti.
+Provide accident or defect reports if needed.
+Buy cargo liability insurance for each wagon.`,
+    ),
+    a(
+      "force-majeure",
+      "Force Majeure",
+      `Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.
+Force majeure shall be interpreted in accordance with the Ethiopian Civil Code.`,
+    ),
+    a(
+      "pricing",
+      "Contract Price and Terms of Payment",
+      `From SGTD to Dire Dawa dry port, the rate is USD 919 per one 40ft or USD 942 per two 20ft containers with empty return; USD 762 per one 40ft or USD 780 per two 20ft containers without empty return.
+From SGTD to Modjo, the rate is USD 1,781 per one 40ft or USD 1,808 per two 20ft containers with empty return, and USD 1,507 per one 40ft or two 20ft containers without empty return.
+From SGTD to Galaan Multipurpose Port, the rate is USD 1,916 per one 40ft or USD 1,944 per two 20ft containers with empty return, and USD 1,676 per one 40ft or USD 1,690 per two 20ft containers without empty return.
+If cargo exceeds 40 tons per two 20ft containers of gross weight, additional charges apply proportionally.
+Gross weight shall be the total sum of cargo, packing, and container tare weight.
+Payment for any additional tonnage shall be made in advance before the container is loaded onto the wagon.
+The price of loading and unloading and container handling at Modjo, Dire Dawa dry port, and SGTD container railway freight yard is not part of this contract; it is the Client's responsibility.
+Additional costs (if applicable):
+- Last-mile delivery service by truck from Galaan Multipurpose Port or Modjo to Addis Ababa or Modjo and surrounding areas shall incur an additional cost, fully covered by the Client.
+- For clients utilizing EDR's last-mile logistics services, the applicable charges shall vary based on the cargo movement route.
+- The charge for last-mile delivery from Galaan Multipurpose Port and Modjo dry port shall be communicated to the Client by the Service Provider after receiving the necessary details regarding the cargo destination, type, and weight.
+All payments shall be made one hundred percent (100%) in advance in United States Dollars (USD).`,
+    ),
+    a(
+      "contract-documents",
+      "Contract Documents",
+      `The following documents constitute this contract:
+- Amendments (if any).
+- This Contract Agreement.
+- Final minutes of negotiation (if any).
+If there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.`,
+    ),
+    a(
+      "documentation",
+      "Documentation Requirements",
+      `Equipment Interchange Receipt of SGTD, Railway Waybill, Container Carriage Acceptance Sheet, and incidental charges (if any).
+Payment summary as per the agreed contract price (if required).`,
+    ),
+    a(
+      "consignment-notes",
+      "Consignment Notes",
+      `The Service Provider must certify the taking over and handing over of the container cargo on the Freight Carriage Acceptance Sheet of EDR in an appropriate manner and provide it to the Client.
+The Freight Carriage Acceptance Sheet shall be prima facie evidence of the receipt of the container cargo by the Service Provider and of the kind, number, and weight of the goods.
+Upon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.`,
+    ),
+    a(
+      "amendment",
+      "Amendment",
+      `This contract can be amended by mutual agreement.
+Notwithstanding the above, the Service Provider may revise transport tariffs due to operational and regulatory changes by providing at least five (5) working days' prior written notice to the Client.`,
+    ),
+    a(
+      "termination",
+      "Termination of Contract",
+      `The contract may be terminated:
+- By mutual agreement.
+- Upon completion of the contract period or agreed cargo shipments.
+- If either party breaches fundamental terms.`,
+    ),
+    a(
+      "effectiveness",
+      "Contract Effectiveness",
+      `The contract is valid once signed by both parties and witnesses.`,
+    ),
+    a(
+      "duration",
+      "Contract Period",
+      `Valid until August 31, {{contractYear}}, with a possible extension upon mutual agreement.`,
+    ),
+    a(
+      "disputes",
+      "Settlement of Disputes",
+      `Disputes shall be settled amicably.
+If unresolved, disputes shall be taken to the Federal Court in Addis Ababa.`,
+    ),
+  ],
+};
+
+/* ──────────────────────────── EXPORT / CONTAINER ─────────────────────────── */
+
+const EXPORT_CONTAINER: ContractTemplateSeed = {
+  code: "EXPORT_CONTAINER",
+  name: "Container Export Contract",
+  description:
+    "Export container transport, freight forwarding, and customs clearing from Galaan Multipurpose Port or Modjo dry port to SGTD container freight station (Djibouti).",
+  documentTitle: "Export Container Transport, Freight Forwarding and Customs Clearing Service",
+  whereasClauses: [
+    "The parties have agreed on the following services: rail transport, customs clearance, transit work, freight forwarding, and handling of container cargo.",
+  ],
+  articles: [
+    a(
+      "objective",
+      "Objective and Scope of the Services",
+      `Customs clearance (Ethiopia side):
+- Processing of export declarations.
+- Coordination with the Ethiopian Customs Authority for clearance.
+- Ensuring compliance with all export regulations.
+Rail transport:
+- Transportation of containers from Galaan Multipurpose Port (GMP) or Modjo dry port to SGTD container freight station.
+Djibouti transit and handling:
+- Customs clearance in Djibouti.
+- Coordination with Djibouti port and transit authorities.
+- Freight forwarding and last-mile facilitation as required.
+Excluded costs:
+- Shore handling.
+- Shifting of containers from SGTD to DMP or DMP to SGTD port.`,
+    ),
+    a(
+      "client-obligations",
+      "Obligations of the Client",
+      `Give written/email instructions to the Service Provider for transportation of containers from Galaan Multipurpose Port (GMP) and/or Modjo to Djibouti.
+Supply a minimum of two (2) 20ft containers (or an equivalent load to fill one flat wagon).
+Submit all forwarding service booking requests at least seventy-two (72) hours prior to the scheduled train departure and no later than 7 days before the vessel cut-off time, whichever is applicable.
+For clients requiring first-mile service, submit a first-mile service request notice no less than seventy-two (72) hours in advance.
+Complete and submit accurate export documents as per the request of the Service Provider; payment must be submitted at least 36 hours before train departure.
+Deliver all cargo to the designated loading port or freight station at least three (3) hours prior to the scheduled train loading time.
+Failure to meet the stated deadlines may result in cancellation of the booking and transfer arrangements; any resulting delays, penalties, or additional costs shall be the sole responsibility of the Client.
+If the Client fails to deliver the container, fails to provide the requested documents for completing export documents as instructed above, or cancels after wagon reservation, the Client shall pay USD 150.00 per wagon as a penalty, after notification.
+Containers must have four (4) undamaged corners.
+One flat wagon must carry either one 40ft container or two 20ft containers.
+If two 20ft containers are loaded on one flat wagon, their weight difference must not exceed 10 tons.
+The gross weight of the container must not exceed the standard loading capacity indicated on the container; the Client is responsible for ensuring full compliance with the maximum allowable load.
+Prohibited cargo: cargo covered with tarpaulin is not allowed due to safety risks.
+If the cargo to be transported is dangerous and/or valuable goods, notify the Service Provider 48 (forty-eight) hours before the wagon booking for further discussion and decision.
+Refund requests before wagon booking require an official request, with a 3% administrative fee deducted. If the refund is due to the Service Provider, the Client shall receive a full refund. Refunds not requested and completed within six months shall be considered waived.
+Any delay caused by missing or incorrect documents shall be the Client's responsibility.
+100% of the transportation and customs clearance fee must be paid in advance.`,
+    ),
+    a(
+      "provider-obligations",
+      "Obligations of the Service Provider",
+      `Complete gate pass processing and submit to Nagad Station for each shipment within eighteen (18) hours after train departure.
+The Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous goods.
+Maintain cargo liability insurance for railway transport; additional insurance for port handling or last-mile transport shall be the Client's responsibility.
+The Service Provider is not liable for customs penalties or demurrage due to delays beyond its control.
+Notify the Client immediately, in writing, of any delays, port issues, or customs holds.
+The Service Provider shall not be liable for:
+- Inherent defects of the cargo.
+- Improper packing or loading conducted by the Client.
+- Customs-related delays.
+- Delays caused by force majeure events.`,
+    ),
+    a(
+      "force-majeure",
+      "Force Majeure",
+      `Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.
+Force majeure shall be interpreted in accordance with the Ethiopian Civil Code.`,
+    ),
+    a(
+      "pricing",
+      "Pricing and Payment Terms",
+      `Railway transportation charges from GMP to SGTD: USD 819 (eight hundred nineteen) per 40ft container; USD 834 (eight hundred thirty-four) per two (2) 20ft containers.
+Railway transportation charges from Modjo to SGTD: USD 725 (seven hundred twenty-five) per 40ft container; USD 725 (seven hundred twenty-five) per two (2) 20ft containers.
+Where the total cargo weight exceeds fifty (50) metric tons per two (2) 20ft containers, an additional charge of USD 10 (ten) shall apply for each excess metric ton.
+Freight forwarding and customs clearance charges from GMP to SGTD: USD 540 (five hundred forty) per 40ft container; USD 349 (three hundred forty-nine) per 20ft container.
+Freight forwarding and customs clearance charges from Modjo to SGTD: USD 569 (five hundred sixty-nine) per 40ft container; USD 389 (three hundred eighty-nine) per 20ft container.
+For consolidated containers containing more than one (1) shipping document, the first document shall be included under the agreed contract rate; any additional document within the same container shall be subject to an extra charge of USD 50 per document.
+Payment must be supported by an official receipt before cargo departs from Galaan Multipurpose Port/Modjo.
+If the Client uses PIL Shipping Line, any local charge incurred will be covered by the Client as per the invoice issued by the shipping line.
+If storage or demurrage occurs due to Client-related issues (delay in document submission, payment delay, or any other Client-related reason), the Client shall pay the corresponding charges; charges apply per day after the free storage period, based on the invoice and SGTD tariff.
+During export season, EDR may provide seasonal export support through the facilitation of empty containers.
+Additional costs (if applicable):
+- First-mile delivery service by truck within Addis Ababa or Modjo and surrounding areas, originating from warehouses or any other places designated by the Client, shall incur an additional cost fully covered by the Client.
+- For clients utilizing EDR's first- or last-mile logistics services, the applicable charges shall vary based on the cargo movement route.
+- The charge for first-mile delivery to Galaan Multipurpose Port and Modjo dry port shall be communicated to the Client by the Service Provider after receiving the necessary details regarding the cargo origin, type, and weight.
+- For any vessel outbound charges, IMO charges, or other fees not included in the port handling payment, the Service Provider shall request the Client to settle the required amount based on the official receipt issued by the port or the shipping line.
+Payment terms:
+- All charges, including rail transport and customs clearance charges, remain 100% payable in advance.
+- Payments shall be calculated based on the Commercial Bank of Ethiopia's daily selling exchange rate on the date the wagon or train number is provided.
+- If the exchange rate changes between the payment and the wagon assignment date, adjustments will be made accordingly.
+- Any additional costs incurred due to customs issues or port delays shall be borne by the Client and paid based on actual costs, supported by official receipts, within 10 days.
+- Late payment incurs a penalty of 10%.`,
+    ),
+    a(
+      "contract-documents",
+      "Contract Documents",
+      `The following documents shall constitute the contract between the Client and the Service Provider:
+- Any amendments made to this contract (if applicable).
+- This Contract Agreement.
+- Final minutes of negotiation (if applicable).
+In the event of any discrepancy between these documents, they shall be interpreted with priority in the order listed above.`,
+    ),
+    a(
+      "documentation",
+      "Documentation Requirements",
+      `Consignment Note (cargo handover document).
+Payment summary prepared as per the agreed tariff, if required.`,
+    ),
+    a(
+      "consignment-notes",
+      "Consignment Notes",
+      `The Service Provider must certify the taking over and handing over of the container cargo on the Freight Carriage Acceptance Sheet of EDR in an appropriate manner and provide it to the Client.
+The Freight Carriage Acceptance Sheet shall be prima facie evidence of the receipt of the container cargo by the Service Provider and of the kind, number, and weight of the goods.
+Upon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.`,
+    ),
+    a(
+      "amendment",
+      "Amendment",
+      `This contract can be amended by mutual agreement.
+Notwithstanding the above, the Service Provider may revise transport tariffs due to operational and regulatory changes by providing at least five (5) working days' prior written notice to the Client.`,
+    ),
+    a(
+      "termination",
+      "Termination of Contract",
+      `The contract may be terminated:
+- By mutual agreement.
+- Upon completion of the contract period or agreed cargo shipments.
+- If either party breaches fundamental terms.
+If terminated for cause, the terminating party must issue a 15-day written notice specifying the breach and allow an opportunity to cure, if applicable.`,
+    ),
+    a(
+      "effectiveness",
+      "Contract Effectiveness",
+      `The contract is valid once signed by both parties and witnesses.`,
+    ),
+    a(
+      "duration",
+      "Contract Period",
+      `Valid until August 31, {{contractYear}}, with a possible extension upon mutual agreement.`,
+    ),
+    a(
+      "disputes",
+      "Settlement of Disputes",
+      `Disputes shall be settled amicably.
+If amicable settlement fails, disputes shall be submitted to the Federal Court located in Addis Ababa.
+The signatories confirm that they are fully authorized to sign and execute this Contract Agreement; the power of attorney of the signatories for the parties is enclosed with this contract agreement.`,
+    ),
+  ],
+};
+
+/* ─────────────────────────── INTERCITY / CONTAINER ───────────────────────── */
+
+const INTERCITY_CONTAINER: ContractTemplateSeed = {
+  code: "INTERCITY_CONTAINER",
+  name: "Container Intercity Contract",
+  description:
+    "Domestic (intercity) container transport by railway between Ethiopian terminals — Galaan Multipurpose Port, Modjo dry port, and Dire Dawa — including empty repositioning.",
+  documentTitle: "Intercity Container Transport Service by Railway",
+  whereasClauses: [
+    "The Client has requested and agreed to the transportation of container cargo between the agreed Ethiopian railway terminals (Galaan Multipurpose Port (GMP), Modjo dry port, and Dire Dawa), including the repositioning of empty containers between those terminals, using the Addis Ababa–Djibouti railway line within Ethiopia.",
+    "The Service Provider has agreed to transport the container cargo as per the terms of this contract.",
+  ],
+  articles: [
+    a(
+      "objective",
+      "Objective and Scope of the Services",
+      `To provide domestic railway transportation services for 40ft and/or 20ft full containers between the agreed Ethiopian terminals (Galaan Multipurpose Port (GMP), Modjo dry port, and Dire Dawa), and the repositioning of empty containers between those terminals.
+The scope of the services comprises:
+- Railway transport service between the agreed origin and destination terminals.
+- Cargo handling at Galaan Multipurpose Port (GMP).`,
+    ),
+    a(
+      "client-obligations",
+      "Obligations of the Client",
+      `Give written/email/electronic shipment instructions to the Service Provider for transportation of container cargo between the agreed terminals.
+Prepare all necessary documents and facilities for shipment.
+Ensure the minimum supply of containers per shipment agreed with the Service Provider for the selected loading terminal and destination.
+One flat wagon must carry either one 40ft container or two 20ft containers.
+If two 20ft containers are loaded on one flat wagon, their weight difference must not exceed 10 tons.
+Ensure timely loading and unloading of cargo.
+Assign representatives at both ends to oversee container handover and ensure the necessary arrangements for cargo reception at the destination upon arrival.
+Maintain and provide detailed cargo information (type, weight, destination, etc.).
+Be responsible for cargo handling, loading, and unloading of both empty and full containers at Modjo and Dire Dawa dry port.
+Book wagons at least five (5) days in advance.
+Ensure containers are ready one day before the planned loading date.
+Collect the full container from Galaan Multipurpose Port (GMP) within three (3) calendar days from the day following the arrival notice.
+If the Client fails to collect the container within the specified period, the Service Provider shall have the right to reposition the container to any location it deems appropriate; in such case, the Service Provider shall not be held responsible for any damage or loss arising from such repositioning.
+If the Client fails to collect the container from Galaan Multipurpose Port within the specified period, the Client shall be liable to pay demurrage charges of 15 USD per day per 20ft container and 27 USD per day per 40ft container, calculated based on the Commercial Bank of Ethiopia's daily selling exchange rate on the date of payment.
+In the event the Client fails to collect the container(s) within the specified period, the Client shall be liable to pay double handling charges of 27 USD per 20ft container per handling or 40 USD per 40ft container per handling.
+Collect the containers within one day at Dire Dawa and Modjo dry port, or make the necessary payment to the dry port as per the standard of the dry port.
+Once empty containers are returned from the Client's premises and stored at a dry port while awaiting train allocation, any demurrage and/or storage charges incurred from the dry port thereafter shall be the sole responsibility of the Client.
+Provide clean empty containers that meet the receiving terminal's standards; additional cleaning costs incurred due to non-compliance will be borne by the Client.
+Ensure containers are structurally intact and meet weight distribution requirements.
+Prohibited cargo: cargo covered with tarpaulin is not allowed due to safety risks.
+Notify the Service Provider forty-eight (48) hours in advance before wagon booking if transporting hazardous or valuable goods.
+If a booked wagon is not loaded due to Client-related issues, including but not limited to a damaged container, missing lock, unpaid demurrage, port system errors, or incomplete documentation and submission, the Client shall be charged 100% of the total price of the reserved wagon.
+Refund requests before wagon booking require an official request, with a 3% administrative fee deducted. If the refund is due to the Service Provider, the Client shall receive a full refund. Refunds not requested and completed within six months shall be considered waived.
+Pay 100% of the transportation fee in advance for each train set.
+Settle additional penalties due to non-compliance within ten (10) days of invoice issuance.
+Late payment incurs a penalty of an additional 10%.`,
+    ),
+    a(
+      "provider-obligations",
+      "Obligations of the Service Provider",
+      `Assign the necessary voyage based on the operational schedule and cargo demand, and notify the train schedule 48 hours in advance.
+Provide a list of wagons/voyage or train number 24 hours in advance and update corrections 12 hours before arrival.
+Provide safe transportation of the containers.
+Deliver the cargo within two (2) days after train departure, provided that all required documents are submitted on time and no unforeseen circumstances or events occur.
+In the event of export cargo operations, the Service Provider may prioritize the loading of export containers during the loading of empty containers and the unloading of containers from the train at Galaan Multipurpose Port.
+The Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous goods.
+If any operational, technical, or mechanical problem occurs throughout the transit, notify the Client and the relevant authorities and arrange cargo transfer within four (4) days.
+Provide accident or defect reports if needed.
+Buy cargo liability insurance for each wagon.`,
+    ),
+    a(
+      "force-majeure",
+      "Force Majeure",
+      `Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.
+Force majeure shall be interpreted in accordance with the Ethiopian Civil Code.`,
+    ),
+    a(
+      "pricing",
+      "Contract Price and Terms of Payment",
+      `The applicable rate per 40ft container or per two (2) 20ft containers for the agreed route shall be as per the prevailing EDR domestic container tariff, as set out in the commercial schedule of this contract.
+If cargo exceeds 40 tons per two 20ft containers of gross weight, additional charges apply proportionally.
+Gross weight shall be the total sum of cargo, packing, and container tare weight.
+Payment for any additional tonnage shall be made in advance before the container is loaded onto the wagon.
+The price of loading and unloading and container handling at Modjo and Dire Dawa dry port is not part of this contract; it is the Client's responsibility.
+Additional costs (if applicable):
+- Last-mile delivery service by truck from the destination terminal to the Client's premises shall incur an additional cost, fully covered by the Client.
+- For clients utilizing EDR's last-mile logistics services, the applicable charges shall vary based on the cargo movement route and shall be communicated to the Client by the Service Provider after receiving the necessary details regarding the cargo destination, type, and weight.
+All payments shall be made one hundred percent (100%) in advance.
+Payment may be made in Ethiopian Birr based on the Commercial Bank of Ethiopia's daily selling exchange rate on the date the wagon or train number is provided; if the exchange rate changes between the payment and the wagon assignment date, adjustments will be made accordingly.`,
+    ),
+    a(
+      "contract-documents",
+      "Contract Documents",
+      `The following documents constitute this contract:
+- Amendments (if any).
+- This Contract Agreement.
+- Final minutes of negotiation (if any).
+If there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.`,
+    ),
+    a(
+      "documentation",
+      "Documentation Requirements",
+      `Equipment Interchange Receipt, Railway Waybill, Container Carriage Acceptance Sheet, and incidental charges (if any).
+Payment summary as per the agreed contract price (if required).`,
+    ),
+    a(
+      "consignment-notes",
+      "Consignment Notes",
+      `The Service Provider must certify the taking over and handing over of the container cargo on the Freight Carriage Acceptance Sheet of EDR in an appropriate manner and provide it to the Client.
+The Freight Carriage Acceptance Sheet shall be prima facie evidence of the receipt of the container cargo by the Service Provider and of the kind, number, and weight of the goods.
+Upon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.`,
+    ),
+    a(
+      "amendment",
+      "Amendment",
+      `This contract can be amended by mutual agreement.
+Notwithstanding the above, the Service Provider may revise transport tariffs due to operational and regulatory changes by providing at least five (5) working days' prior written notice to the Client.`,
+    ),
+    a(
+      "termination",
+      "Termination of Contract",
+      `The contract may be terminated:
+- By mutual agreement.
+- Upon completion of the contract period or agreed cargo shipments.
+- If either party breaches fundamental terms.`,
+    ),
+    a(
+      "effectiveness",
+      "Contract Effectiveness",
+      `The contract is valid once signed by both parties and witnesses.`,
+    ),
+    a(
+      "duration",
+      "Contract Period",
+      `Valid until August 31, {{contractYear}}, with a possible extension upon mutual agreement.`,
+    ),
+    a(
+      "disputes",
+      "Settlement of Disputes",
+      `Disputes shall be settled amicably.
+If unresolved, disputes shall be taken to the Federal Court in Addis Ababa.`,
+    ),
+  ],
+};
+
+export const CONTRACT_TEMPLATE_DEFAULTS: ContractTemplateSeed[] = [
+  IMPORT_BULK,
+  EXPORT_BULK,
+  INTERCITY_BULK,
+  IMPORT_CONTAINER,
+  EXPORT_CONTAINER,
+  INTERCITY_CONTAINER,
+];
diff --git a/apps/edr-freight-api/src/seed/demo-bookings.seeder.ts b/apps/edr-freight-api/src/seed/demo-bookings.seeder.ts
index 570036f24..3720c0e2a 100644
--- a/apps/edr-freight-api/src/seed/demo-bookings.seeder.ts
+++ b/apps/edr-freight-api/src/seed/demo-bookings.seeder.ts
@@ -504,8 +504,6 @@ export class DemoBookingsSeeder {
             wagonTypeId: nw5.id,
             trainId: null,
             sequenceNumber: null,
-            tareWeight: 20,
-            maxPayloadWeight: 70,
             status: WagonStatus.Available,
             currentYardId: index % 2 === 0 ? djibouti.id : addis.id,
             notes: "Demo wagon for train scheduling",
diff --git a/apps/edr-freight-api/src/seed/demo-freight-data.seeder.ts b/apps/edr-freight-api/src/seed/demo-freight-data.seeder.ts
index da2da818f..45c374332 100644
--- a/apps/edr-freight-api/src/seed/demo-freight-data.seeder.ts
+++ b/apps/edr-freight-api/src/seed/demo-freight-data.seeder.ts
@@ -76,15 +76,11 @@ export class DemoFreightDataSeeder {
       }
 
       const toCreate = MIN_WAGONS_PER_TYPE - existing;
-      const tare = Number(type.tareWeightTons ?? 20);
-      const maxPayload = Number(type.capacityTons ?? 60);
       const rows = Array.from({ length: toCreate }, (_, i) => {
         const seq = existing + i + 1;
         return wagonRepo.create({
           wagonNumber: `${type.code}-${String(seq).padStart(4, '0')}`,
           wagonTypeId: type.id,
-          tareWeight: tare,
-          maxPayloadWeight: maxPayload,
           status: WagonStatus.Available,
         });
       });
diff --git a/apps/edr-freight-api/src/seed/file-upload-settings.seeder.ts b/apps/edr-freight-api/src/seed/file-upload-settings.seeder.ts
index 1aef33801..99dae5974 100644
--- a/apps/edr-freight-api/src/seed/file-upload-settings.seeder.ts
+++ b/apps/edr-freight-api/src/seed/file-upload-settings.seeder.ts
@@ -33,8 +33,9 @@ const ETHIOPIAN_ONBOARDING_FIELDS: OnboardingField[] = [
   },
   {
     fileKey: "commercial_license",
-    fileLabel: "Commercial License",
-    helpText: "Verified against the government trade system during registration.",
+    fileLabel: "Commercial Registration",
+    helpText:
+      "Verified against the government trade system during registration.",
     isRequired: true,
     isMultiple: false,
     maxFiles: 1,
@@ -108,7 +109,8 @@ const LEGACY_ONBOARDING_FIELDS: OnboardingField[] = [
   {
     fileKey: "business_license",
     fileLabel: "Business License / Trade License",
-    helpText: "Verified against the government trade system during registration.",
+    helpText:
+      "Verified against the government trade system during registration.",
     isRequired: true,
     isMultiple: false,
     maxFiles: 1,
@@ -489,9 +491,14 @@ const SELF_CLEARANCE_SETTINGS: OnboardingDocumentSetting[] = [
 const CONTRACT_INTAKE_ENTITY = "contract_intake";
 
 const CONTRACT_INTAKE_FIELDS: OnboardingField[] = [
-  clearanceField("commercial_framework", "Commercial Framework / Agreement", 1, {
-    required: false,
-  }),
+  clearanceField(
+    "commercial_framework",
+    "Commercial Framework / Agreement",
+    1,
+    {
+      required: false,
+    },
+  ),
   clearanceField("onboarding_attachment", "Onboarding Attachment", 2, {
     required: false,
   }),
@@ -542,7 +549,7 @@ const DRIVER_DOCUMENT_SETTINGS: OnboardingDocumentSetting[] = [
 export class FileUploadSettingsSeeder {
   private readonly logger = new Logger(FileUploadSettingsSeeder.name);
 
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(private readonly dataSource: DataSource) { }
 
   async run() {
     await this.dataSource.transaction(async (manager) => {
@@ -552,35 +559,35 @@ export class FileUploadSettingsSeeder {
       const allSettings: Array<
         OnboardingDocumentSetting & { description: string }
       > = [
-        ...COMPANY_ONBOARDING_DOCUMENTS.map((s) => ({
-          ...s,
-          description: COMPANY_ONBOARDING_DESCRIPTION,
-        })),
-        ...CLEARANCE_DOCUMENT_SETTINGS.map((s) => ({
-          ...s,
-          description: CLEARANCE_DESCRIPTION,
-        })),
-        ...CONTRACT_CLEARANCE_SETTINGS.map((s) => ({
-          ...s,
-          description:
-            "Pre-booking clearance documents collected on the contract (Path B), by operation and freight type.",
-        })),
-        ...SELF_CLEARANCE_SETTINGS.map((s) => ({
-          ...s,
-          description:
-            "Customer self-clearance documents (Path A, no EDR customs service), reviewed by Operations.",
-        })),
-        ...CONTRACT_INTAKE_SETTINGS.map((s) => ({
-          ...s,
-          description:
-            "Commercial/framework documents attached at contract submission.",
-        })),
-        ...DRIVER_DOCUMENT_SETTINGS.map((s) => ({
-          ...s,
-          description:
-            "Documents uploaded against a driver profile (license, ID, contracts, etc.).",
-        })),
-      ];
+          ...COMPANY_ONBOARDING_DOCUMENTS.map((s) => ({
+            ...s,
+            description: COMPANY_ONBOARDING_DESCRIPTION,
+          })),
+          ...CLEARANCE_DOCUMENT_SETTINGS.map((s) => ({
+            ...s,
+            description: CLEARANCE_DESCRIPTION,
+          })),
+          ...CONTRACT_CLEARANCE_SETTINGS.map((s) => ({
+            ...s,
+            description:
+              "Pre-booking clearance documents collected on the contract (Path B), by operation and freight type.",
+          })),
+          ...SELF_CLEARANCE_SETTINGS.map((s) => ({
+            ...s,
+            description:
+              "Customer self-clearance documents (Path A, no EDR customs service), reviewed by Operations.",
+          })),
+          ...CONTRACT_INTAKE_SETTINGS.map((s) => ({
+            ...s,
+            description:
+              "Commercial/framework documents attached at contract submission.",
+          })),
+          ...DRIVER_DOCUMENT_SETTINGS.map((s) => ({
+            ...s,
+            description:
+              "Documents uploaded against a driver profile (license, ID, contracts, etc.).",
+          })),
+        ];
 
       for (const documentSetting of allSettings) {
         await settingRepository.upsert(
@@ -601,7 +608,9 @@ export class FileUploadSettingsSeeder {
         });
 
         if (!setting) {
-          throw new Error(`file_upload_setting_seed_failed:${documentSetting.code}`);
+          throw new Error(
+            `file_upload_setting_seed_failed:${documentSetting.code}`,
+          );
         }
 
         await fieldRepository.delete({ settingId: setting.id });
diff --git a/apps/edr-freight-api/src/seed/freight-permissions.registry.ts b/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
index 8d70bc61c..e281e6464 100644
--- a/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
+++ b/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
@@ -131,6 +131,7 @@ export const CUSTOMER_PERMISSIONS: FreightPermissionSeed[] = [
   perm('d1a00001-0001-4000-8000-000000000003', 'edr_freight_app:customers:update', 'Update customer'),
   perm('d1a00001-0001-4000-8000-000000000004', 'edr_freight_app:customers:deactivate', 'Deactivate customer'),
   perm('d1a00001-0001-4000-8000-000000000005', 'edr_freight_app:customers:verify', 'Verify customer (KYC/Fayda)'),
+  perm('d1a00001-0001-4000-8000-000000000006', 'edr_freight_app:customers:reset-password', 'Trigger customer password reset'),
 ];
 
 // D. Finance — payments + invoices
@@ -395,6 +396,7 @@ export const FREIGHT_PERMS = {
     update: 'edr_freight_app:customers:update',
     deactivate: 'edr_freight_app:customers:deactivate',
     verify: 'edr_freight_app:customers:verify',
+    resetPassword: 'edr_freight_app:customers:reset-password',
   },
   payments: {
     view: 'edr_freight_app:payments:view',
@@ -662,9 +664,13 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.fleet.view,
     FREIGHT_PERMS.fleet.manage,
     // Path A (no customs): Operations reviews the customer's self-clearance docs
-    // on the contract before the customer may create a shipment booking.
+    // — on the contract for ONE_TIME contracts, and PER BOOKING for GENERAL
+    // contracts (booking-level document review → finalize → CLEARANCE_READY).
     FREIGHT_PERMS.contracts.view,
     FREIGHT_PERMS.contracts.opsClearanceReview,
+    FREIGHT_PERMS.bookings.clearanceView,
+    FREIGHT_PERMS.bookings.reviewDocuments,
+    FREIGHT_PERMS.bookings.finalizeClearance,
     ...allRuleEngineViewKeys(),
   ],
   director: [
diff --git a/apps/edr-freight-api/src/seed/marshalling-demo-trains.seeder.ts b/apps/edr-freight-api/src/seed/marshalling-demo-trains.seeder.ts
index 53d6c9eec..eec158856 100644
--- a/apps/edr-freight-api/src/seed/marshalling-demo-trains.seeder.ts
+++ b/apps/edr-freight-api/src/seed/marshalling-demo-trains.seeder.ts
@@ -203,7 +203,6 @@ export class MarshallingDemoTrainsSeeder {
     const totalWeight = bookingWeights.reduce((sum, weight) => sum + weight, 0);
     const wagonCapacity = Number(refs.wagonType.capacityTons) || 70;
     const wagonLength = Number(refs.wagonType.lengthMeters) || 14;
-    const tareWeight = Number(refs.wagonType.tareWeightTons) || 14;
 
     const trainSet = await trainSetRepo.save(
       trainSetRepo.create({
@@ -275,8 +274,6 @@ export class MarshallingDemoTrainsSeeder {
         wagonTypeId: refs.wagonType.id,
         yardId: originYard.id,
         trainScheduleId: schedule.id,
-        tareWeight,
-        capacityTons: wagonCapacity,
         dispatched: hasDeparted,
       });
 
@@ -420,8 +417,6 @@ export class MarshallingDemoTrainsSeeder {
     wagonTypeId: string;
     yardId: string;
     trainScheduleId: string;
-    tareWeight: number;
-    capacityTons: number;
     dispatched: boolean;
   }): Promise<Wagon> {
     const repo = this.dataSource.getRepository(Wagon);
@@ -433,8 +428,6 @@ export class MarshallingDemoTrainsSeeder {
         wagonTypeId: input.wagonTypeId,
         currentYardId: input.yardId,
         currentTrainScheduleId: input.trainScheduleId,
-        tareWeight: input.tareWeight,
-        maxPayloadWeight: input.capacityTons,
         status: WagonStatus.Assigned,
         notes: 'Marshalling demo seed wagon',
       }),
diff --git a/apps/edr-freight-api/src/seed/warehouse-demo.seeder.ts b/apps/edr-freight-api/src/seed/warehouse-demo.seeder.ts
index fbc19100a..d8e585a35 100644
--- a/apps/edr-freight-api/src/seed/warehouse-demo.seeder.ts
+++ b/apps/edr-freight-api/src/seed/warehouse-demo.seeder.ts
@@ -3,6 +3,7 @@ import { DataSource } from 'typeorm';
 
 import { Booking } from '../modules/bookings/entities/booking.entity';
 import { CargoType } from '../modules/rule-engine/entities/cargo-type.entity';
+import { CompanyProfile } from '../modules/companies/entities/company-profile.entity';
 import { Locomotive } from '../modules/locomotives/entities/locomotive.entity';
 import { ServiceType } from '../modules/rule-engine/entities/service-type.entity';
 import { Yard } from '../modules/rule-engine/entities/yard.entity';
@@ -60,10 +61,16 @@ export class WarehouseDemoSeeder {
         (await serviceTypeRepo.findOne({ where: { code: 'RAIL_CONTAINER' } })) ??
         (await serviceTypeRepo.findOne({ where: { isActive: true } }));
       const cargoType = await cargoTypeRepo.findOne({ where: { isActive: true } });
+      // bookings.company_id AND company_profile_id are both NOT NULL — a demo booking
+      // still needs an owner. Take the company from the profile so they always agree.
+      const companyProfile = await this.dataSource
+        .getRepository(CompanyProfile)
+        .findOne({ where: {} });
 
-      if (!djibYard || !ethYard || !serviceType) {
+      if (!djibYard || !ethYard || !serviceType || !companyProfile) {
         this.logger.warn(
-          `Missing yards/service type (djib=${djibYard?.code}, eth=${ethYard?.code}, svc=${serviceType?.code}); skipping`,
+          `Missing yards/service type/company profile (djib=${djibYard?.code}, eth=${ethYard?.code}, ` +
+            `svc=${serviceType?.code}, companyProfile=${companyProfile?.id ?? 'none'}); skipping`,
         );
         return;
       }
@@ -89,7 +96,7 @@ export class WarehouseDemoSeeder {
       ): Promise<Booking> =>
         bookingRepo.save(
           bookingRepo.create({
-            ...this.demoBookingDefaults(),
+            ...this.demoBookingDefaults(companyProfile),
             reference,
             originYardId: direction === 'EXPORT' ? ethYard.id : djibYard.id,
             destinationYardId: direction === 'EXPORT' ? djibYard.id : ethYard.id,
@@ -182,7 +189,15 @@ export class WarehouseDemoSeeder {
       }
 
       // 6) Import Arrive Queue — an ARRIVED import train with IN_TRANSIT bookings, no inventory yet.
-      await this.seedArrivedImportTrain(djibYard, ethYard, serviceType, cargoType, ago(60), ago(360));
+      await this.seedArrivedImportTrain(
+        djibYard,
+        ethYard,
+        serviceType,
+        cargoType,
+        companyProfile,
+        ago(60),
+        ago(360),
+      );
       created += 1;
 
       this.logger.log(`✅ Warehouse demo seeded: ${created} buckets populated across every queue`);
@@ -199,6 +214,7 @@ export class WarehouseDemoSeeder {
     ethYard: Yard,
     serviceType: ServiceType,
     cargoType: CargoType | null,
+    owner: CompanyProfile,
     arrival: Date,
     departure: Date,
   ): Promise<void> {
@@ -238,7 +254,7 @@ export class WarehouseDemoSeeder {
     for (let i = 1; i <= 3; i++) {
       const b = await bookingRepo.save(
         bookingRepo.create({
-          ...this.demoBookingDefaults(),
+          ...this.demoBookingDefaults(owner),
           reference: `WH-DEMO-ARR-${i}`,
           originYardId: djibYard.id,
           destinationYardId: ethYard.id,
@@ -258,8 +274,10 @@ export class WarehouseDemoSeeder {
     }
   }
 
-  private demoBookingDefaults(): Partial<Booking> {
+  private demoBookingDefaults(owner: CompanyProfile): Partial<Booking> {
     return {
+      companyId: owner.companyId,
+      companyProfileId: owner.id,
       scheduledDate: new Date(),
       contractType: 'SPOT',
       equipmentReturn: 'TERMINAL',
diff --git a/apps/edr-freight-web/backoffice/package.json b/apps/edr-freight-web/backoffice/package.json
index b89807b72..140bc1d01 100644
--- a/apps/edr-freight-web/backoffice/package.json
+++ b/apps/edr-freight-web/backoffice/package.json
@@ -39,6 +39,7 @@
     "stream-browserify": "^3.0.0",
     "tailwind-merge": "^3.6.0",
     "tinymce": "^8.6.0",
+    "xlsx": "^0.18.5",
     "zustand": "^5.0.0"
   },
   "devDependencies": {
diff --git a/apps/edr-freight-web/backoffice/src/App.tsx b/apps/edr-freight-web/backoffice/src/App.tsx
index df8db49d4..15c8cf19c 100644
--- a/apps/edr-freight-web/backoffice/src/App.tsx
+++ b/apps/edr-freight-web/backoffice/src/App.tsx
@@ -13,6 +13,7 @@ import {
   PackageOpen,
   Paperclip,
   Receipt,
+  ScrollText,
   Send,
   Settings,
   ShieldCheck,
@@ -53,11 +54,11 @@ import ContractClearanceListPage from "./pages/contracts/ContractClearanceListPa
 import ContractClearanceDetailPage from "./pages/contracts/ContractClearanceDetailPage";
 import GlDjiboutiClearanceListPage from "./pages/contracts/GlDjiboutiClearanceListPage";
 import GlClearanceDetailPage from "./pages/contracts/GlClearanceDetailPage";
-// Hidden for now — Shipment Requests pages disabled (imports kept commented).
-// import ShipmentRequestsPage from "./pages/contracts/ShipmentRequestsPage";
-// import ShipmentRequestDetailPage from "./pages/contracts/ShipmentRequestDetailPage";
+import ShipmentRequestsPage from "./pages/contracts/ShipmentRequestsPage";
+import ShipmentRequestDetailPage from "./pages/contracts/ShipmentRequestDetailPage";
 import GlCreateBookingForm from "./components/contracts/GlCreateBookingForm";
 import DocumentClearanceDetailPage from "./pages/bookings/DocumentClearanceDetailPage";
+import DocumentClearanceListPage from "./pages/bookings/DocumentClearanceListPage";
 import CustomerDetailPage from "./pages/customers/CustomerDetailPage";
 import CustomersPage from "./pages/customers/CustomersPage";
 import InvoiceDetailPage from "./pages/invoices/InvoiceDetailPage";
@@ -84,6 +85,8 @@ import UserManagementPage from "./pages/dashboard/user-management/UserManagement
 import UsersPage from "./pages/dashboard/user-management/UsersPage";
 import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
 import DropdownSettingsPage from "./pages/dropdown_settings/DropdownSettingsPage";
+import ContractTemplatesPage from "./pages/contract_templates/ContractTemplatesPage";
+import ContractTemplateEditorPage from "./pages/contract_templates/ContractTemplateEditorPage";
 import FleetResourcePage from "./pages/fleet/FleetResourcePage";
 import VehicleDetailPage from "./pages/fleet/VehicleDetailPage";
 import DriverDetailPage from "./pages/fleet/DriverDetailPage";
@@ -187,13 +190,18 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
           FREIGHT_PERMS.contracts.clearanceEtActions,
         ],
       },
-      // Hidden for now — Shipment Requests nav item disabled.
-      // {
-      //   label: "Shipment Requests",
-      //   href: "/dashboard/shipment-requests",
-      //   icon: <Send />,
-      //   permission: FREIGHT_PERMS.contracts.createBooking,
-      // },
+      {
+        label: "Shipment Requests",
+        href: "/dashboard/shipment-requests",
+        icon: <Send />,
+        permission: FREIGHT_PERMS.contracts.createBooking,
+      },
+      {
+        label: "Self-Clearance Review",
+        href: "/dashboard/contracts/ops-clearance",
+        icon: <ShieldCheck />,
+        permission: FREIGHT_PERMS.contracts.opsClearanceReview,
+      },
       {
         label: "GL Djibouti Clearance",
         href: "/dashboard/gl-djibouti/clearance",
@@ -456,6 +464,12 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         icon: <Settings />,
         permission: FREIGHT_PERMS.admin,
       },
+      {
+        label: "Contract templates",
+        href: "/dashboard/contract-templates",
+        icon: <ScrollText />,
+        permission: FREIGHT_PERMS.admin,
+      },
     ],
   },
   {
@@ -752,7 +766,6 @@ const App = () => {
             </RequirePermission>
           }
         />
-        {/* Hidden for now — Shipment Requests pages disabled.
         <Route
           path="shipment-requests"
           element={
@@ -773,7 +786,6 @@ const App = () => {
             </RequirePermission>
           }
         />
-        */}
         {/* GL (Path B) contract clearance review hub */}
         <Route
           path="contracts/clearance"
@@ -829,10 +841,17 @@ const App = () => {
             </RequirePermission>
           }
         />
-        {/* Path A ops queue out of scope for now → fold into the GL hub. */}
+        {/* Path A — Operations reviews per-booking self-clearance documents
+            (GENERAL contracts without customs). */}
         <Route
           path="contracts/ops-clearance"
-          element={<Navigate to="/dashboard/contracts/clearance" replace />}
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.contracts.opsClearanceReview}
+            >
+              <DocumentClearanceListPage opsMode />
+            </RequirePermission>
+          }
         />
         <Route
           path="contracts/:id/create-booking"
@@ -1242,6 +1261,22 @@ const App = () => {
             </RequirePermission>
           }
         />
+        <Route
+          path="contract-templates"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.admin}>
+              <ContractTemplatesPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="contract-templates/:code"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.admin}>
+              <ContractTemplateEditorPage />
+            </RequirePermission>
+          }
+        />
 
         <Route
           path="configuration"
diff --git a/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx b/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx
index 78cc5efd6..74f9cdb03 100644
--- a/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx
@@ -47,6 +47,12 @@ export interface ClearanceReviewSectionProps {
   queriesLocked?: boolean;
   /** Read-only audit view — no approve/query actions. */
   readOnly?: boolean;
+  /**
+   * GENERAL customs bookings use the phased milestone workflow (same as
+   * ONE_TIME contracts): hide the legacy output-documents upload block and the
+   * finalize button — declaration/duty/transit run in the phased action panel.
+   */
+  phasedCustoms?: boolean;
 }
 
 const STATUS_META: Record<
@@ -73,6 +79,7 @@ export function ClearanceReviewSection({
   approvalsLocked = false,
   queriesLocked = false,
   readOnly = false,
+  phasedCustoms = false,
 }: ClearanceReviewSectionProps) {
   const qc = useQueryClient();
   const [queryNotes, setQueryNotes] = useState<Record<string, string>>({});
@@ -240,7 +247,7 @@ export function ClearanceReviewSection({
         </Stack>
       </SectionCard>
 
-      {clearance.outputCode && (
+      {clearance.outputCode && !phasedCustoms && (
         <SectionCard
           icon={Upload}
           title="Customs output documents"
@@ -341,7 +348,7 @@ export function ClearanceReviewSection({
         </SectionCard>
       )}
 
-      {finalizeMutation.isError && (
+      {!phasedCustoms && finalizeMutation.isError && (
         <Alert color="red" radius="md" icon={<AlertCircle size={16} />}>
           {finalizeMutation.error instanceof Error
             ? finalizeMutation.error.message
@@ -349,8 +356,10 @@ export function ClearanceReviewSection({
         </Alert>
       )}
 
-      <Paper withBorder radius="md" p="md">
-        <Group justify="space-between" wrap="nowrap">
+      {phasedCustoms ? (
+        // Phased (GENERAL customs) — no legacy finalize; the milestone steps in
+        // the action panel drive the workflow, same as ONE_TIME contracts.
+        <Paper withBorder radius="md" p="md">
           <Group gap={8} wrap="nowrap" style={{ minWidth: 0 }}>
             <ThemeIcon
               variant="light"
@@ -358,26 +367,50 @@ export function ClearanceReviewSection({
               radius="md"
               size={28}
             >
-              <FileCheck2 size={15} />
+              {clearance.allApproved ? (
+                <CheckCircle2 size={15} />
+              ) : (
+                <FileCheck2 size={15} />
+              )}
             </ThemeIcon>
             <Text fz="12.5px" c="dimmed">
               {clearance.allApproved
-                ? "All required documents are approved — you can finalize."
-                : "Approve every required document to unlock finalization."}
+                ? "All required documents are approved. Continue declaration, duty, and transit in the action panel."
+                : "Approve every required document to unlock the customs milestone steps."}
             </Text>
           </Group>
-          <Button
-            color="edr-green"
-            radius="md"
-            leftSection={<CheckCircle2 size={16} />}
-            disabled={!clearance.allApproved}
-            loading={finalizeMutation.isPending}
-            onClick={() => finalizeMutation.mutate()}
-          >
-            Finalize clearance
-          </Button>
-        </Group>
-      </Paper>
+        </Paper>
+      ) : (
+        <Paper withBorder radius="md" p="md">
+          <Group justify="space-between" wrap="nowrap">
+            <Group gap={8} wrap="nowrap" style={{ minWidth: 0 }}>
+              <ThemeIcon
+                variant="light"
+                color={clearance.allApproved ? "edr-green" : "gray"}
+                radius="md"
+                size={28}
+              >
+                <FileCheck2 size={15} />
+              </ThemeIcon>
+              <Text fz="12.5px" c="dimmed">
+                {clearance.allApproved
+                  ? "All required documents are approved — you can finalize."
+                  : "Approve every required document to unlock finalization."}
+              </Text>
+            </Group>
+            <Button
+              color="edr-green"
+              radius="md"
+              leftSection={<CheckCircle2 size={16} />}
+              disabled={!clearance.allApproved}
+              loading={finalizeMutation.isPending}
+              onClick={() => finalizeMutation.mutate()}
+            >
+              Finalize clearance
+            </Button>
+          </Group>
+        </Paper>
+      )}
       {viewer}
     </Stack>
   );
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
index 547e9ce9f..33254d3ce 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
@@ -12,6 +12,7 @@ import {
   Button,
   Center,
   Divider,
+  FileButton,
   Group,
   Loader,
   Modal,
@@ -31,7 +32,9 @@ import {
   CalendarDays,
   CheckCircle2,
   ChevronLeft,
+  FileDown,
   FileText,
+  FileUp,
   MapPin,
   Package,
   Receipt,
@@ -54,6 +57,10 @@ import {
   type GlShipmentQuantities,
 } from "./gl-booking-form/total";
 import { ContractCapacityNotice } from "./gl-booking-form/ContractCapacityNotice";
+import {
+  downloadContainerImportTemplate,
+  parseContainerExcel,
+} from "./gl-booking-form/container-excel";
 import {
   fieldStyles,
   StepCard,
@@ -64,6 +71,21 @@ import {
 /** All booking-window times are communicated in East Africa Time. */
 const EAT_TZ = "Africa/Addis_Ababa";
 
+// ISO 6346: 4-letter owner/category code + 6-digit serial + check digit.
+// Same rule the customer portal shipment form enforces.
+const ISO_CONTAINER_NUMBER_REGEX = /^[A-Z]{4}\d{7}$/;
+
+interface UnitErrors {
+  containerNumber?: string;
+  vgmTons?: string;
+}
+
+interface BulkErrors {
+  quantity?: string;
+  hazardous?: string;
+  reefer?: string;
+}
+
 function fmtWindowOpensAt(iso: string): string {
   const date = new Date(iso).toLocaleDateString("en-GB", {
     weekday: "short",
@@ -372,6 +394,123 @@ export default function GlCreateBookingForm() {
       prev.map((l, i) => (i === idx ? { ...l, ...patch } : l)),
     );
 
+  // Same client-side validation as the customer portal shipment form: ISO
+  // container numbers (unique within the shipment) and a positive VGM per unit;
+  // bulk needs a positive quantity with hazardous/reefer portions bounded by it.
+  const [showErrors, setShowErrors] = useState(false);
+
+  // Excel import: one row per container. All-or-nothing — a file with any bad
+  // row is rejected with row-numbered errors so nothing is silently dropped.
+  const [importErrors, setImportErrors] = useState<string[]>([]);
+  const [importSummary, setImportSummary] = useState<string | null>(null);
+  const importResetRef = useRef<(() => void) | null>(null);
+  const excelOpts = {
+    allowedSizes: containerSizes,
+    includeHazardous: contract?.isHazardous ?? false,
+    includeReefer: contract?.isReefer ?? false,
+  };
+
+  const handleImportFile = async (file: File | null) => {
+    // Reset the hidden input so re-picking the same (fixed) file re-fires.
+    importResetRef.current?.();
+    if (!file) return;
+    const { rows, errors } = await parseContainerExcel(file, excelOpts);
+    if (errors.length > 0) {
+      setImportSummary(null);
+      setImportErrors(errors);
+      return;
+    }
+    // Replace only the lines for sizes present in the file; a contracted size
+    // the file omits keeps whatever was already entered for it.
+    setContainerLines((prev) =>
+      containerSizes.map((size) => {
+        const imported = rows.filter((r) => r.containerSize === size);
+        if (imported.length === 0) {
+          return (
+            prev.find((l) => l.containerSize === size) ?? {
+              containerSize: size,
+              units: [emptyUnit()],
+            }
+          );
+        }
+        return {
+          containerSize: size,
+          units: imported.map((r) => ({
+            containerNumber: r.containerNumber,
+            sealNumber: r.sealNumber,
+            vgmTons: r.vgmTons,
+            hazardous: r.hazardous,
+            reefer: r.reefer,
+          })),
+        };
+      }),
+    );
+    setImportErrors([]);
+    setShowErrors(false);
+    setImportSummary(`Imported ${rows.length} container(s) from ${file.name}.`);
+  };
+
+  const unitErrors = useMemo<UnitErrors[][]>(() => {
+    if (!isContainer) return [];
+    const numberCounts = new Map<string, number>();
+    containerLines.forEach((line) =>
+      line.units.forEach((u) => {
+        const key = u.containerNumber.trim().toUpperCase();
+        if (!key) return;
+        numberCounts.set(key, (numberCounts.get(key) ?? 0) + 1);
+      }),
+    );
+    return containerLines.map((line) =>
+      line.units.map((u) => {
+        const errs: UnitErrors = {};
+        const key = u.containerNumber.trim().toUpperCase();
+        if (!key) {
+          errs.containerNumber = "Container number is required.";
+        } else if (!ISO_CONTAINER_NUMBER_REGEX.test(key)) {
+          errs.containerNumber =
+            "Enter a valid ISO container number (e.g. ABCD1234567).";
+        } else if ((numberCounts.get(key) ?? 0) > 1) {
+          errs.containerNumber = "Duplicate container number in this shipment.";
+        }
+        const vgm = Number(u.vgmTons);
+        if (String(u.vgmTons).trim() === "" || Number.isNaN(vgm) || vgm <= 0) {
+          errs.vgmTons = "Enter a valid VGM.";
+        }
+        return errs;
+      }),
+    );
+  }, [isContainer, containerLines]);
+
+  const bulkErrors = useMemo<BulkErrors[]>(() => {
+    if (isContainer) return [];
+    return bulkLines.map((line) => {
+      const errs: BulkErrors = {};
+      const qty = Number(line.cargoWeightTons || line.itemCount || 0);
+      if (Number.isNaN(qty) || qty <= 0) {
+        errs.quantity = "Enter a quantity greater than 0.";
+      }
+      const h = Number(line.hazardousQuantity || 0);
+      if (Number.isNaN(h) || h < 0) {
+        errs.hazardous = "Enter a valid hazardous quantity.";
+      } else if (qty > 0 && h > qty) {
+        errs.hazardous = `Can't exceed the cargo quantity (${qty}).`;
+      }
+      const r = Number(line.reeferQuantity || 0);
+      if (Number.isNaN(r) || r < 0) {
+        errs.reefer = "Enter a valid refrigerated quantity.";
+      } else if (qty > 0 && r > qty) {
+        errs.reefer = `Can't exceed the cargo quantity (${qty}).`;
+      }
+      return errs;
+    });
+  }, [isContainer, bulkLines]);
+
+  const cargoValid = isContainer
+    ? unitErrors.every((line) =>
+        line.every((e) => !e.containerNumber && !e.vgmTons),
+      )
+    : bulkErrors.every((e) => !e.quantity && !e.hazardous && !e.reefer);
+
   const canSubmit =
     windowOpen &&
     Boolean(scheduledDate) &&
@@ -401,7 +540,7 @@ export default function GlCreateBookingForm() {
           hazardousQuantity: l.units.filter((u) => u.hazardous).length,
           reeferQuantity: l.units.filter((u) => u.reefer).length,
           units: l.units.map((u) => ({
-            containerNumber: u.containerNumber,
+            containerNumber: u.containerNumber.trim().toUpperCase(),
             ...(u.sealNumber ? { sealNumber: u.sealNumber } : {}),
             vgmTons: Number(u.vgmTons) || 0,
           })),
@@ -458,6 +597,13 @@ export default function GlCreateBookingForm() {
   const overweightLines = validation?.overweightLines ?? [];
 
   const openPriceModal = () => {
+    // Surface the per-field errors (portal-parity validation) instead of
+    // sending an invalid payload to the price preview.
+    if (!cargoValid) {
+      setShowErrors(true);
+      return;
+    }
+    setShowErrors(false);
     setPriceOpen(true);
     const payload = buildPayload();
     if (payload) {
@@ -467,7 +613,7 @@ export default function GlCreateBookingForm() {
   };
 
   const handleSubmit = () => {
-    if (!contract || !windowOpen) return;
+    if (!contract || !windowOpen || !cargoValid) return;
     // Never book past unresolved 20ft pairing hard-blocks.
     if (pairingErrors.length > 0) return;
     // A line above the container type's max capacity can never book.
@@ -483,8 +629,13 @@ export default function GlCreateBookingForm() {
           } catch {
             // Non-fatal
           }
-          navigate(`/dashboard/bookings/${booking.id}/clearance`);
+        }
+        if (contract.contractKind === "GENERAL") {
+          // GENERAL per-booking clearance: land on the booking's clearance
+          // detail — the same page the Shipments tab on the hub opens.
+          navigate(`/dashboard/clearance/${booking.id}`);
         } else {
+          // ONE_TIME customs keeps its clearance on the contract.
           navigate(`/dashboard/contracts/clearance/${contract.id}`);
         }
       },
@@ -647,6 +798,83 @@ export default function GlCreateBookingForm() {
               description="Enter the quantity and per-container details for each size in the contract scope."
             />
             <Stack gap={18}>
+              {containerSizes.length > 0 && (
+                <Paper withBorder radius="md" p="md" style={{ borderColor: "#E6ECF2" }}>
+                  <Group justify="space-between" wrap="wrap" gap="sm">
+                    <Box>
+                      <Text fz={13} fw={600}>
+                        Import containers from Excel
+                      </Text>
+                      <Text fz={12} c="dimmed">
+                        One row per container. Importing fills the lines below
+                        for the sizes in the file.
+                      </Text>
+                    </Box>
+                    <Group gap="sm">
+                      <Button
+                        variant="default"
+                        size="xs"
+                        radius="md"
+                        leftSection={<FileDown size={14} />}
+                        onClick={() => downloadContainerImportTemplate(excelOpts)}
+                      >
+                        Download template
+                      </Button>
+                      <FileButton
+                        resetRef={importResetRef}
+                        accept=".xlsx,.xls"
+                        onChange={handleImportFile}
+                      >
+                        {(props) => (
+                          <Button
+                            {...props}
+                            size="xs"
+                            radius="md"
+                            color="edr-green"
+                            leftSection={<FileUp size={14} />}
+                          >
+                            Import Excel
+                          </Button>
+                        )}
+                      </FileButton>
+                    </Group>
+                  </Group>
+                  {importErrors.length > 0 && (
+                    <Alert
+                      color="red"
+                      variant="light"
+                      radius="md"
+                      icon={<AlertCircle size={16} />}
+                      title="Import failed — fix the file and try again"
+                      mt="sm"
+                    >
+                      <Stack gap={4}>
+                        {importErrors.slice(0, 8).map((msg, i) => (
+                          <Text key={i} fz="xs">
+                            {msg}
+                          </Text>
+                        ))}
+                        {importErrors.length > 8 && (
+                          <Text fz="xs" c="dimmed">
+                            …and {importErrors.length - 8} more.
+                          </Text>
+                        )}
+                      </Stack>
+                    </Alert>
+                  )}
+                  {importSummary && (
+                    <Alert
+                      color="edr-green"
+                      variant="light"
+                      radius="md"
+                      icon={<CheckCircle2 size={16} />}
+                      mt="sm"
+                    >
+                      <Text fz="xs">{importSummary}</Text>
+                    </Alert>
+                  )}
+                </Paper>
+              )}
               <ContractCapacityNotice contractId={contract.id} isContainer />
               {containerLines.length === 0 ? (
                 <Text fz="sm" c="dimmed">
@@ -692,6 +920,11 @@ export default function GlCreateBookingForm() {
                             label={unitIdx === 0 ? "Container number *" : undefined}
                             placeholder="e.g. MSCU1234567"
                             value={unit.containerNumber}
+                            error={
+                              showErrors
+                                ? unitErrors[lineIdx]?.[unitIdx]?.containerNumber
+                                : undefined
+                            }
                             onChange={(e) =>
                               patchUnit(lineIdx, unitIdx, {
                                 containerNumber: e.currentTarget.value,
@@ -720,6 +953,11 @@ export default function GlCreateBookingForm() {
                             min={0}
                             decimalScale={2}
                             value={unit.vgmTons}
+                            error={
+                              showErrors
+                                ? unitErrors[lineIdx]?.[unitIdx]?.vgmTons
+                                : undefined
+                            }
                             onChange={(v) =>
                               patchUnit(lineIdx, unitIdx, { vgmTons: v })
                             }
@@ -808,6 +1046,7 @@ export default function GlCreateBookingForm() {
                       min={0}
                       decimalScale={2}
                       value={line.cargoWeightTons}
+                      error={showErrors ? bulkErrors[idx]?.quantity : undefined}
                       onChange={(v) => patchBulk(idx, { cargoWeightTons: v })}
                       radius={10}
                       styles={fieldStyles}
@@ -818,6 +1057,7 @@ export default function GlCreateBookingForm() {
                       placeholder="e.g. 500"
                       min={0}
                       value={line.itemCount}
+                      error={showErrors ? bulkErrors[idx]?.quantity : undefined}
                       onChange={(v) => patchBulk(idx, { itemCount: v })}
                       radius={10}
                       styles={fieldStyles}
@@ -828,6 +1068,7 @@ export default function GlCreateBookingForm() {
                       label="Hazardous quantity"
                       min={0}
                       value={line.hazardousQuantity}
+                      error={showErrors ? bulkErrors[idx]?.hazardous : undefined}
                       onChange={(v) => patchBulk(idx, { hazardousQuantity: v })}
                       radius={10}
                       styles={fieldStyles}
@@ -838,6 +1079,7 @@ export default function GlCreateBookingForm() {
                       label="Refrigerated quantity"
                       min={0}
                       value={line.reeferQuantity}
+                      error={showErrors ? bulkErrors[idx]?.reefer : undefined}
                       onChange={(v) => patchBulk(idx, { reeferQuantity: v })}
                       radius={10}
                       styles={fieldStyles}
@@ -905,26 +1147,39 @@ export default function GlCreateBookingForm() {
           marginTop: 24,
         }}
       >
-        <Group justify="flex-end" maw={896} mx="auto">
-          <Button
-            variant="default"
-            radius="md"
-            onClick={() =>
-              navigate(`/dashboard/contracts/clearance/${contract.id}`)
-            }
-          >
-            Cancel
-          </Button>
-          <Button
-            color="edr-green"
-            radius="md"
-            leftSection={<Receipt size={16} />}
-            disabled={!canSubmit}
-            onClick={openPriceModal}
-          >
-            Review price &amp; book
-          </Button>
-        </Group>
+        <Box maw={896} mx="auto">
+          {showErrors && !cargoValid ? (
+            <Alert
+              color="red"
+              variant="light"
+              radius="md"
+              icon={<AlertCircle size={16} />}
+              mb="sm"
+            >
+              Fix the highlighted cargo fields before reviewing the price.
+            </Alert>
+          ) : null}
+          <Group justify="flex-end">
+            <Button
+              variant="default"
+              radius="md"
+              onClick={() =>
+                navigate(`/dashboard/contracts/clearance/${contract.id}`)
+              }
+            >
+              Cancel
+            </Button>
+            <Button
+              color="edr-green"
+              radius="md"
+              leftSection={<Receipt size={16} />}
+              disabled={!canSubmit}
+              onClick={openPriceModal}
+            >
+              Review price &amp; book
+            </Button>
+          </Group>
+        </Box>
       </Box>
 
       <Modal
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx
index 6256bd9cc..699706654 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx
@@ -99,6 +99,7 @@ function computeImportActiveStep(
   bookingCreated: boolean,
   bookingMilestones: MilestoneRow[],
   t1Uploaded: boolean,
+  freightPaid: boolean,
 ): number {
   if (!isMilestoneDone(clearance.milestones, "DOCUMENTS_APPROVED")) return 0;
   if (!isMilestoneDone(clearance.milestones, "DECLARED")) return 1;
@@ -119,9 +120,12 @@ function computeImportActiveStep(
   if (!clearance.preClearanceFinalized) return 5;
   if (!isMilestoneDone(clearance.milestones, "DO_COLLECTED")) return 6;
   if (!bookingCreated) return 7;
-  if (!clearance.gatepassGranted) return 8;
-  if (!t1Uploaded && !clearance.t1?.closed) return 9;
-  if (!clearance.t1?.closed) return 10;
+  // The customer pays the train/freight charges on the booking. Until that
+  // settles the gate pass is not granted for this booking, so the flow stops here.
+  if (!freightPaid) return 8;
+  if (!clearance.gatepassGranted) return 9;
+  if (!t1Uploaded && !clearance.t1?.closed) return 10;
+  if (!clearance.t1?.closed) return 11;
   // Risk is "assigned" when the booking milestone says so OR the clearance view
   // already carries a riskLevel. The ET page derives its bookingMilestones from a
   // separately-fetched booking id that can lag or mismatch the booking carrying
@@ -129,15 +133,15 @@ function computeImportActiveStep(
   const riskAssigned =
     Boolean(clearance.riskLevel) ||
     isBookingMilestoneDone(bookingMilestones, "RISK_ASSIGNED");
-  if (!riskAssigned) return 11;
+  if (!riskAssigned) return 12;
   // Additional duty round is optional — resolved once skipped or paid.
   const secondDutyResolved =
     clearance.secondDuty?.skipped ||
     clearance.secondDuty?.paid ||
     isBookingMilestoneDone(bookingMilestones, "SECOND_DUTY_PAID");
-  if (!secondDutyResolved) return 12;
-  if (!clearance.importReleaseGranted) return 13;
-  return 14;
+  if (!secondDutyResolved) return 13;
+  if (!clearance.importReleaseGranted) return 14;
+  return 15;
 }
 
 function t1FilesFromWorkflow(
@@ -243,6 +247,13 @@ export function PhasedClearanceActionPanel({
   const riskAssigned =
     Boolean(clearance.riskLevel) ||
     isBookingMilestoneDone(bookingMilestones, "RISK_ASSIGNED");
+  // Freight (train + service) charges settled on the booking. The gate pass is
+  // only granted to a booking that has paid, so a granted gate pass is server
+  // proof of payment — it keeps the stepper moving on a page whose
+  // bookingMilestones have not loaded yet or point at a different booking.
+  const freightPaid =
+    isBookingMilestoneDone(bookingMilestones, "FREIGHT_PAYMENT_SETTLED") ||
+    Boolean(clearance.gatepassGranted);
   const activeStep = useMemo(
     () =>
       isImport
@@ -251,9 +262,17 @@ export function PhasedClearanceActionPanel({
             effectiveBookingCreated,
             bookingMilestones,
             t1Uploaded,
+            freightPaid,
           )
         : 0,
-    [clearance, isImport, effectiveBookingCreated, bookingMilestones, t1Uploaded],
+    [
+      clearance,
+      isImport,
+      effectiveBookingCreated,
+      bookingMilestones,
+      t1Uploaded,
+      freightPaid,
+    ],
   );
 
   if (isImport) {
@@ -554,14 +573,26 @@ export function PhasedClearanceActionPanel({
               )}
             </Stepper.Step>
 
+            <Stepper.Step
+              label="Freight payment"
+              description="Customer pays the train and service charges"
+              icon={freightPaid ? <CheckCircle2 size={14} /> : <Receipt size={14} />}
+            >
+              <StepStatus
+                done={freightPaid}
+                pendingLabel="Waiting for the customer to pay the train and service charges. The gate pass is not granted until this settles."
+                doneLabel="Train and service charges settled."
+              />
+            </Stepper.Step>
+
             <Stepper.Step
               label="Gate pass"
-              description="Secured on the train schedule after wagon allocation"
+              description="Secured on the train schedule after payment and wagon allocation"
               icon={
                 clearance.gatepassGranted ? <CheckCircle2 size={14} /> : <Truck size={14} />
               }
             >
-              <ImportGatepassStep clearance={clearance} />
+              <ImportGatepassStep clearance={clearance} freightPaid={freightPaid} />
             </Stepper.Step>
 
             <Stepper.Step
@@ -927,8 +958,16 @@ function ImportT1CloseStep({
 /**
  * Gate pass status, read-only. Secured on the train schedule's "Save as
  * Secured" action (train-scheduling-v2) — clearance no longer grants it directly.
+ * The train may be secured while this booking still owes freight charges; the
+ * booking only picks the gate pass up once its payment settles.
  */
-function ImportGatepassStep({ clearance }: { clearance: ClearanceViewLike }) {
+function ImportGatepassStep({
+  clearance,
+  freightPaid,
+}: {
+  clearance: ClearanceViewLike;
+  freightPaid: boolean;
+}) {
   const scheduleId = clearance.train?.scheduleId ?? null;
 
   if (clearance.gatepassGranted) {
@@ -943,6 +982,16 @@ function ImportGatepassStep({ clearance }: { clearance: ClearanceViewLike }) {
     );
   }
 
+  if (!freightPaid) {
+    return (
+      <StepStatus
+        done={false}
+        pendingLabel="Blocked — the customer must pay the train and service charges before the gate pass is granted for this shipment."
+        doneLabel=""
+      />
+    );
+  }
+
   const wagonAllocated = Boolean(clearance.train?.wagonAllocated);
 
   return (
@@ -1015,6 +1064,18 @@ function RiskStep({
     );
   }
 
+  // Customs cannot rate cargo still under transit — the server rejects the
+  // assignment until the T1 is closed, so do not offer the control yet.
+  if (!clearance.t1?.closed) {
+    return (
+      <StepStatus
+        done={false}
+        pendingLabel="Available once the T1 is closed."
+        doneLabel=""
+      />
+    );
+  }
+
   if (!canAct || !bookingId) {
     return (
       <StepStatus
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/container-excel.ts b/apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/container-excel.ts
new file mode 100644
index 000000000..bbd3acf90
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/container-excel.ts
@@ -0,0 +1,200 @@
+import * as XLSX from "xlsx";
+
+// Excel import for container shipments: one spreadsheet row per physical
+// container, mirroring the manual per-unit fields (number, seal, VGM) plus the
+// hazardous/reefer flags when the contract allows them. The parser is
+// all-or-nothing — any bad row rejects the file with row-numbered errors so a
+// partial import can never silently drop containers.
+
+// ISO 6346: 3-letter owner code + category id (U/J/Z) + 6-digit serial + check digit.
+const ISO_CONTAINER_NUMBER_REGEX = /^[A-Z]{4}\d{7}$/;
+
+export interface ContainerExcelOptions {
+  /** Container sizes the contract scope allows (e.g. ["20ft", "40ft"]). */
+  allowedSizes: string[];
+  includeHazardous: boolean;
+  includeReefer: boolean;
+}
+
+export interface ImportedContainerRow {
+  containerSize: string;
+  containerNumber: string;
+  sealNumber: string;
+  vgmTons: string;
+  hazardous: boolean;
+  reefer: boolean;
+}
+
+export interface ContainerExcelResult {
+  rows: ImportedContainerRow[];
+  errors: string[];
+}
+
+type ColumnKey =
+  | "containerSize"
+  | "containerNumber"
+  | "sealNumber"
+  | "vgmTons"
+  | "hazardous"
+  | "reefer";
+
+/** Match a header cell to a known column, tolerant of casing/spacing/units. */
+function headerKey(raw: string): ColumnKey | null {
+  const h = raw.toLowerCase().replace(/[^a-z]/g, "");
+  if (!h) return null;
+  if (h.includes("size")) return "containerSize";
+  if (h.includes("seal")) return "sealNumber";
+  if (h.includes("vgm") || h.includes("weight")) return "vgmTons";
+  if (h.includes("hazard")) return "hazardous";
+  if (h.includes("reefer") || h.includes("refrigerat")) return "reefer";
+  // After the more specific matches: "Container Number", "Container No", …
+  if (h.includes("container") || h.includes("number")) return "containerNumber";
+  return null;
+}
+
+/** "20", "20ft", "20 FT" … → the matching contracted size, or null. */
+function normalizeSize(raw: string, allowed: string[]): string | null {
+  const digits = raw.replace(/[^0-9]/g, "");
+  if (!digits) return null;
+  return allowed.find((s) => s.replace(/[^0-9]/g, "") === digits) ?? null;
+}
+
+function parseFlag(raw: string): boolean {
+  const v = raw.trim().toLowerCase();
+  return v === "yes" || v === "y" || v === "true" || v === "1" || v === "x";
+}
+
+/**
+ * Parse an uploaded workbook into one row per container. Returns either the
+ * full row set or the list of row-numbered problems (never both).
+ */
+export async function parseContainerExcel(
+  file: File,
+  opts: ContainerExcelOptions,
+): Promise<ContainerExcelResult> {
+  let sheet: XLSX.WorkSheet | undefined;
+  try {
+    const workbook = XLSX.read(await file.arrayBuffer(), { type: "array" });
+    sheet = workbook.Sheets[workbook.SheetNames[0]];
+  } catch {
+    return { rows: [], errors: ["Could not read the file — is it a valid Excel file?"] };
+  }
+  if (!sheet) {
+    return { rows: [], errors: ["The file has no sheets."] };
+  }
+
+  const grid = XLSX.utils.sheet_to_json<string[]>(sheet, {
+    header: 1,
+    raw: false,
+    defval: "",
+  });
+
+  // First row with a recognizable column is the header; everything above
+  // (titles, blank rows) is ignored.
+  let headerRowIdx = -1;
+  let columns: Array<ColumnKey | null> = [];
+  for (let i = 0; i < grid.length; i++) {
+    const mapped = (grid[i] ?? []).map((c) => headerKey(String(c ?? "")));
+    if (mapped.includes("containerNumber") && mapped.includes("containerSize")) {
+      headerRowIdx = i;
+      columns = mapped;
+      break;
+    }
+  }
+  if (headerRowIdx < 0) {
+    return {
+      rows: [],
+      errors: [
+        'Could not find the expected columns. The sheet needs at least "Container Size" and "Container Number" headers — download the template to see the format.',
+      ],
+    };
+  }
+  if (!columns.includes("vgmTons")) {
+    return {
+      rows: [],
+      errors: ['Missing a "VGM (Tons)" column — download the template to see the format.'],
+    };
+  }
+
+  const rows: ImportedContainerRow[] = [];
+  const errors: string[] = [];
+  const numberCounts = new Map<string, number>();
+
+  for (let i = headerRowIdx + 1; i < grid.length; i++) {
+    const cells = grid[i] ?? [];
+    if (cells.every((c) => String(c ?? "").trim() === "")) continue;
+    const rowNo = i + 1; // 1-based, as shown in Excel
+
+    const cell = (key: ColumnKey) => {
+      const idx = columns.indexOf(key);
+      return idx >= 0 ? String(cells[idx] ?? "").trim() : "";
+    };
+
+    const size = normalizeSize(cell("containerSize"), opts.allowedSizes);
+    if (!size) {
+      errors.push(
+        `Row ${rowNo}: container size "${cell("containerSize") || "—"}" is not in this contract's scope (allowed: ${opts.allowedSizes.join(", ")}).`,
+      );
+    }
+
+    const containerNumber = cell("containerNumber").toUpperCase();
+    if (!ISO_CONTAINER_NUMBER_REGEX.test(containerNumber)) {
+      errors.push(
+        `Row ${rowNo}: "${cell("containerNumber") || "—"}" is not a valid ISO container number (e.g. MSCU1234567).`,
+      );
+    } else {
+      numberCounts.set(containerNumber, (numberCounts.get(containerNumber) ?? 0) + 1);
+    }
+
+    const vgmRaw = cell("vgmTons");
+    const vgm = Number(vgmRaw);
+    if (!vgmRaw || Number.isNaN(vgm) || vgm <= 0) {
+      errors.push(`Row ${rowNo}: VGM "${vgmRaw || "—"}" must be a number greater than 0.`);
+    }
+
+    rows.push({
+      containerSize: size ?? "",
+      containerNumber,
+      sealNumber: cell("sealNumber"),
+      vgmTons: vgmRaw,
+      hazardous: opts.includeHazardous && parseFlag(cell("hazardous")),
+      reefer: opts.includeReefer && parseFlag(cell("reefer")),
+    });
+  }
+
+  numberCounts.forEach((count, num) => {
+    if (count > 1) errors.push(`Container number ${num} appears ${count} times — numbers must be unique.`);
+  });
+
+  if (rows.length === 0 && errors.length === 0) {
+    errors.push("The sheet has no container rows below the header.");
+  }
+
+  return errors.length > 0 ? { rows: [], errors } : { rows, errors: [] };
+}
+
+/** Generate and download the simple import template with one sample row per size. */
+export function downloadContainerImportTemplate(opts: ContainerExcelOptions) {
+  const headers = ["Container Size", "Container Number", "Seal Number", "VGM (Tons)"];
+  if (opts.includeHazardous) headers.push("Hazardous (YES/NO)");
+  if (opts.includeReefer) headers.push("Reefer (YES/NO)");
+
+  const sizes = opts.allowedSizes.length > 0 ? opts.allowedSizes : ["20ft"];
+  const sampleRows = sizes.map((size, i) => {
+    const row: Array<string | number> = [
+      size,
+      `MSCU${String(1234567 + i).padStart(7, "0")}`,
+      `SL${String(482910 + i)}`,
+      size.startsWith("40") ? 28 : 24.5,
+    ];
+    if (opts.includeHazardous) row.push("NO");
+    if (opts.includeReefer) row.push("NO");
+    return row;
+  });
+
+  const sheet = XLSX.utils.aoa_to_sheet([headers, ...sampleRows]);
+  sheet["!cols"] = headers.map((h) => ({ wch: Math.max(h.length + 2, 16) }));
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, sheet, "Containers");
+  XLSX.writeFile(workbook, "container-import-template.xlsx");
+}
diff --git a/apps/edr-freight-web/backoffice/src/components/customers/ResetPasswordAction.tsx b/apps/edr-freight-web/backoffice/src/components/customers/ResetPasswordAction.tsx
new file mode 100644
index 000000000..bc505a21f
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/components/customers/ResetPasswordAction.tsx
@@ -0,0 +1,105 @@
+import { Button, Modal, Radio, Stack, Text } from "@mantine/core";
+import { useMutation } from "@tanstack/react-query";
+import { KeyRound } from "lucide-react";
+import { useState } from "react";
+
+import { useAuth } from "@/auth/useAuth";
+import { useToast } from "@/hooks/use-toast";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+import { api } from "@/services/api";
+import type { Company, ResetChannel } from "@/types/customer";
+
+export interface ResetPasswordActionProps {
+  company: Pick<Company, "id" | "email" | "phone">;
+}
+
+/**
+ * Staff-triggered password reset. Sends a one-time code to the customer's
+ * primary contact; the customer picks their own new password. No credential is
+ * ever shown to or handled by staff.
+ */
+export default function ResetPasswordAction({ company }: ResetPasswordActionProps) {
+  const { user } = useAuth();
+  const { toast } = useToast();
+  const [opened, setOpened] = useState(false);
+  const [channel, setChannel] = useState<ResetChannel>("phone");
+
+  const { mutate, isPending } = useMutation(
+    api.customers.resetPassword.mutationOptions({
+      onSuccess: (result) => {
+        setOpened(false);
+        toast({
+          title: "Reset code sent",
+          description: `The customer can now reset their password using the code sent to ${result.maskedTarget}.`,
+        });
+      },
+      onError: (error) => {
+        toast({
+          title: "Could not send reset code",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    }),
+  );
+
+  if (!hasPermission(user, FREIGHT_PERMS.customers.resetPassword)) return null;
+
+  return (
+    <>
+      <Button
+        variant="default"
+        leftSection={<KeyRound size={16} />}
+        onClick={() => setOpened(true)}
+      >
+        Reset password
+      </Button>
+
+      <Modal
+        opened={opened}
+        onClose={() => setOpened(false)}
+        title="Send a password-reset code"
+        centered
+      >
+        <Stack gap="md">
+          <Text size="sm" c="dimmed">
+            We&apos;ll send a one-time code to this customer&apos;s primary contact.
+            They choose their own new password — you will not see it.
+          </Text>
+
+          <Radio.Group
+            value={channel}
+            onChange={(v) => setChannel(v as ResetChannel)}
+            label="Send the code via"
+          >
+            <Stack gap="xs" mt="xs">
+              <Radio
+                value="phone"
+                label="SMS"
+                description={company.phone ?? "No phone on the company record"}
+              />
+              <Radio
+                value="email"
+                label="Email"
+                description={company.email ?? "No email on the company record"}
+              />
+            </Stack>
+          </Radio.Group>
+
+          <Text size="xs" c="dimmed">
+            The code goes to the primary contact&apos;s own email or phone, which
+            may differ from the company contact details shown above.
+          </Text>
+
+          <Button
+            color="edr-green"
+            loading={isPending}
+            onClick={() => mutate({ companyId: company.id, channel })}
+          >
+            Send reset code
+          </Button>
+        </Stack>
+      </Modal>
+    </>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/components/customers/index.ts b/apps/edr-freight-web/backoffice/src/components/customers/index.ts
index 2a87e3b0c..d42673d2b 100644
--- a/apps/edr-freight-web/backoffice/src/components/customers/index.ts
+++ b/apps/edr-freight-web/backoffice/src/components/customers/index.ts
@@ -13,5 +13,9 @@ export {
   ChangeRequestReview,
   ChangeRequestPendingBadge,
 } from "./ChangeRequestReview";
+export {
+  default as ResetPasswordAction,
+  type ResetPasswordActionProps,
+} from "./ResetPasswordAction";
 export { formatBytes, formatDate, formatMoney, humanize } from "./format";
 export { TableCard, type TableCardProps } from "./TableCard";
diff --git a/apps/edr-freight-web/backoffice/src/components/layout/FreightSidebar.tsx b/apps/edr-freight-web/backoffice/src/components/layout/FreightSidebar.tsx
index 391a8157d..698b0fc2c 100644
--- a/apps/edr-freight-web/backoffice/src/components/layout/FreightSidebar.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/layout/FreightSidebar.tsx
@@ -250,7 +250,10 @@ const FreightSidebar = ({
       <AppShell.Section
         grow
         component={ScrollArea}
-        type="never"
+        type="hover"
+        scrollbars="y"
+        scrollbarSize={6}
+        scrollHideDelay={500}
         px="sm"
         pb="md"
       >
diff --git a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
index 403a98f1b..8c1aed302 100644
--- a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
@@ -313,6 +313,7 @@ const RuleEngineFormDialog = ({
       <TextInput
         key={field.name}
         label={label}
+        description={field.description}
         type={isNumber ? "number" : field.type === "date" ? "date" : "text"}
         // Every rule-engine number (sizes, capacities, counts, points, rates,
         // display order) is a non-negative magnitude — reject negatives outright
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/PriorityTrackingTab.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/PriorityTrackingTab.tsx
index 84367fad7..b02ebbc8f 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/PriorityTrackingTab.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/PriorityTrackingTab.tsx
@@ -295,9 +295,9 @@ export function PriorityTrackingTab({ data, bookings }: Props) {
   }, [bookings]);
 
   const scoreMax = useMemo(() => maxScore(ranked), [ranked]);
-  // maxWagons is not on the board DTO (capacity is length/weight-based), so the
-  // capacity line shows the wagons currently committed rather than a hard cap.
-  const maxWagons: number | null = null;
+  // Wagon-slot cap from the board DTO (derived from train length and the
+  // shortest wagon type); null on legacy rows without a computable cap.
+  const maxWagons: number | null = data.capacity.maxWagons ?? null;
 
   // Split the ranking at the capacity line: cumulative wagons of slot-occupying
   // bookings (allocated + selected + paid-waiting) up to the train's wagon cap.
@@ -431,23 +431,31 @@ export function PriorityTrackingTab({ data, bookings }: Props) {
             <Text size="xs" fw={700}>
               {data.capacity.allocatedWagons} allocated ·{" "}
               {capUsed} in batch
+              {maxWagons != null ? ` · ${maxWagons} max` : ""}
             </Text>
           </Group>
+          {/* Scale against the real wagon cap when the DTO carries one; fall back
+              to the in-batch total on legacy rows without a computable cap. */}
           <Progress.Root size="lg" radius="xl">
             <Progress.Section
               value={
-                capUsed > 0
-                  ? Math.min(100, (data.capacity.allocatedWagons / capUsed) * 100)
+                (maxWagons ?? capUsed) > 0
+                  ? Math.min(
+                      100,
+                      (data.capacity.allocatedWagons / (maxWagons ?? capUsed)) * 100,
+                    )
                   : 0
               }
               color="edr-green"
             />
             <Progress.Section
               value={
-                capUsed > 0
+                (maxWagons ?? capUsed) > 0
                   ? Math.min(
                       100,
-                      ((capUsed - data.capacity.allocatedWagons) / capUsed) * 100,
+                      ((capUsed - data.capacity.allocatedWagons) /
+                        (maxWagons ?? capUsed)) *
+                        100,
                     )
                   : 0
               }
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/TrainCompositionDiagram.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/TrainCompositionDiagram.tsx
index c7530209b..6ba1a0e29 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/TrainCompositionDiagram.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/TrainCompositionDiagram.tsx
@@ -16,6 +16,7 @@ type DiagramWagonInput = {
   sequenceNo: number;
   capacityTons: number;
   assignedWeightTons: number;
+  tareWeightTons?: number | null;
   slotLoadType?: string | null;
   wagonType?: { code?: string | null } | null;
   wagonTypeCode?: string | null;
@@ -33,6 +34,7 @@ type NormalizedWagon = {
   sequenceNo: number;
   capacityTons: number;
   assignedWeightTons: number;
+  tareWeightTons: number;
   wagonTypeCode: string | null;
   physicalWagonNumber: string | null;
   isEmpty: boolean;
@@ -69,6 +71,7 @@ function normalizeWagon(w: DiagramWagonInput, freightType?: string | null): Norm
     sequenceNo: w.sequenceNo,
     capacityTons: Number(w.capacityTons) || 0,
     assignedWeightTons: Number(w.assignedWeightTons) || 0,
+    tareWeightTons: Number(w.tareWeightTons) || 0,
     wagonTypeCode: w.wagonType?.code ?? w.wagonTypeCode ?? null,
     physicalWagonNumber: w.physicalWagonNumber ?? null,
     isEmpty: allocations.length === 0,
@@ -278,7 +281,9 @@ function WagonCar({ wagon }: { wagon: NormalizedWagon }) {
         wagon.bookingRefs.length ? wagon.bookingRefs.join(", ") : ""
       }${
         wagon.containerNumbers.length ? `\nContainers: ${wagon.containerNumbers.join(", ")}` : ""
-      }${wagon.cargoDescription ? `\n${wagon.cargoDescription}` : ""}\nLoad: ${wagon.assignedWeightTons}/${wagon.capacityTons}T (${utilization}%)`;
+      }${wagon.cargoDescription ? `\n${wagon.cargoDescription}` : ""}\nLoad: ${wagon.assignedWeightTons}/${wagon.capacityTons}T (${utilization}%)${
+        wagon.tareWeightTons ? `\nTare: ${wagon.tareWeightTons}T` : ""
+      }`;
 
   // container blocks: one per container number (cap visual at 2 = TEU per wagon)
   const blocks = wagon.containerNumbers.slice(0, 2);
@@ -523,15 +528,22 @@ export function TrainCompositionDiagram({
     const assigned = normalized.filter((w) => !w.isEmpty).length;
     const totalWeight = normalized.reduce((s, w) => s + w.assignedWeightTons, 0);
     const totalCapacity = normalized.reduce((s, w) => s + w.capacityTons, 0);
+    // Every coupled wagon's tare is hauled — empty ones included — so the
+    // locomotive pull limit is measured against gross (tare + cargo), the same
+    // ceiling the allocation engine spends from.
+    const totalTare = normalized.reduce((s, w) => s + w.tareWeightTons, 0);
+    const grossWeight = totalWeight + totalTare;
     return {
       total: normalized.length,
       assigned,
       empty: normalized.length - assigned,
       totalWeight: Math.round(totalWeight * 100) / 100,
+      totalTare: Math.round(totalTare * 100) / 100,
+      grossWeight: Math.round(grossWeight * 100) / 100,
       totalCapacity,
       pullUtil:
         locomotive?.maxPullWeightTons && locomotive.maxPullWeightTons > 0
-          ? Math.min(100, Math.round((totalWeight / locomotive.maxPullWeightTons) * 100))
+          ? Math.min(100, Math.round((grossWeight / locomotive.maxPullWeightTons) * 100))
           : null,
     };
   }, [normalized, locomotive]);
@@ -598,12 +610,30 @@ export function TrainCompositionDiagram({
               }}
             >
               <Text size="xs" fw={700} c="dark.4">
-                {stats.totalWeight}T
+                {stats.totalWeight}T cargo
               </Text>
               <Text size="xs" c="dimmed">
                 of {stats.totalCapacity}T capacity
               </Text>
             </Group>
+            {stats.totalTare > 0 ? (
+              <Group
+                gap={6}
+                style={{
+                  padding: "4px 12px",
+                  borderRadius: 999,
+                  background: "var(--mantine-color-gray-0)",
+                  border: "1px solid var(--mantine-color-gray-2)",
+                }}
+              >
+                <Text size="xs" fw={700} c="dark.4">
+                  {stats.grossWeight}T gross
+                </Text>
+                <Text size="xs" c="dimmed">
+                  incl. {stats.totalTare}T tare
+                </Text>
+              </Group>
+            ) : null}
             <Group gap="xs">
               <LegendDot color="cyan" label="Container" />
               <LegendDot color="orange" label="Bulk" />
@@ -626,7 +656,10 @@ export function TrainCompositionDiagram({
               <Group gap={6} wrap="nowrap">
                 <Gauge size={14} color={freightBrand.primary} />
                 <Text size="xs" fw={700} c="edr-green.8">
-                  Locomotive load · {stats.totalWeight}T of {locomotive?.maxPullWeightTons}T
+                  Locomotive load ·{" "}
+                  {stats.totalTare > 0
+                    ? `${stats.grossWeight}T of ${locomotive?.maxPullWeightTons}T (${stats.totalWeight}T cargo + ${stats.totalTare}T tare)`
+                    : `${stats.totalWeight}T of ${locomotive?.maxPullWeightTons}T`}
                 </Text>
               </Group>
               <Text size="sm" fw={800} c={stats.pullUtil > 95 ? "red.7" : "edr-green.7"}>
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx
index 78e09a7e0..5eeee7d13 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx
@@ -7,7 +7,7 @@ import { useMutation, useQuery } from '@tanstack/react-query';
 import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
 import { warehouseService } from '@/services/warehouse.service';
-import { extractErrorMessage } from './options';
+import { extractDownloadErrorMessage, extractErrorMessage } from './options';
 import type { FeePreview, WarehouseInventoryItem, WarehouseInvoiceStatus } from '@/types/warehouse';
 import { openPdfBlob } from './pdf';
 
@@ -157,7 +157,7 @@ export function FeePreviewModal({ opened, onClose, inventoryId }: FeePreviewModa
         pdfWindow?.close();
         toast({
           title: 'Gate clearance recorded',
-          description: `Release paper could not be opened: ${extractErrorMessage(documentError)}`,
+          description: `Release paper could not be opened: ${await extractDownloadErrorMessage(documentError)}`,
         });
       }
       onClose();
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/InventoryWorkbench.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/InventoryWorkbench.tsx
index b8bb43086..c4f1f5cec 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/InventoryWorkbench.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/InventoryWorkbench.tsx
@@ -18,7 +18,7 @@ import { LoadInventoryModal } from './LoadInventoryModal';
 import { MoveInventoryModal } from './MoveInventoryModal';
 import { ReleaseOrderModal } from './ReleaseOrderModal';
 import { WarehouseInventoryTable } from './WarehouseInventoryTable';
-import { extractErrorMessage } from './options';
+import { extractDownloadErrorMessage, extractErrorMessage } from './options';
 import { openPdfBlob } from './pdf';
 
 interface InventoryWorkbenchProps {
@@ -111,7 +111,7 @@ export function InventoryWorkbench({ items, isLoading, onLastMile }: InventoryWo
       toast({
         variant: 'destructive',
         title: 'Release paper preview failed',
-        description: extractErrorMessage(error),
+        description: await extractDownloadErrorMessage(error),
       });
     } finally {
       setBusyId(null);
@@ -131,7 +131,7 @@ export function InventoryWorkbench({ items, isLoading, onLastMile }: InventoryWo
       toast({
         variant: 'destructive',
         title: 'Handover document failed',
-        description: extractErrorMessage(error),
+        description: await extractDownloadErrorMessage(error),
       });
     } finally {
       setBusyId(null);
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
index 3b4be03db..a1b91decb 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
@@ -76,7 +76,7 @@ import { MoveInventoryModal } from './MoveInventoryModal';
 import { ReleaseOrderModal } from './ReleaseOrderModal';
 import { StoreInventoryModal } from './StoreInventoryModal';
 import { WarehouseInquiryTable } from './WarehouseInquiryTable';
-import { extractErrorMessage, formatDate, formatNumber, inventoryStatusOptions } from './options';
+import { extractDownloadErrorMessage, extractErrorMessage, formatDate, formatNumber, inventoryStatusOptions } from './options';
 import { openPdfBlob } from './pdf';
 import '@/components/overview/overview.css';
 
@@ -112,7 +112,7 @@ function GrnDocumentButton({ inventoryId, grnNumber }: { inventoryId: string; gr
       toast({ title: opened ? 'GRN document opened' : 'GRN document downloaded' });
     } catch (error) {
       pdfWindow?.close();
-      toast({ variant: 'destructive', title: 'GRN document failed', description: extractErrorMessage(error) });
+      toast({ variant: 'destructive', title: 'GRN document failed', description: await extractDownloadErrorMessage(error) });
     } finally {
       setLoading(false);
     }
@@ -900,7 +900,7 @@ function EligibleTab({
           toast({ title: opened ? 'GRN document opened' : 'GRN document downloaded' });
         } catch (error) {
           pdfWindow?.close();
-          toast({ variant: 'destructive', title: 'GRN document failed', description: extractErrorMessage(error) });
+          toast({ variant: 'destructive', title: 'GRN document failed', description: await extractDownloadErrorMessage(error) });
         }
       }
       setSelected(new Set());
@@ -1697,7 +1697,6 @@ function LoadedExportTab({
                 <Table.Th>Weight</Table.Th>
                 <Table.Th>Route</Table.Th>
                 <Table.Th>Status</Table.Th>
-                {dispatchable && <Table.Th ta="right">Actions</Table.Th>}
               </Table.Tr>
             </Table.Thead>
             <Table.Tbody>
@@ -1739,19 +1738,6 @@ function LoadedExportTab({
                       {r.status}
                     </Badge>
                   </Table.Td>
-                  {dispatchable && (
-                    <Table.Td ta="right">
-                      <Button
-                        size="compact-xs"
-                        variant="light"
-                        color="green"
-                        loading={bulkDispatch.isPending}
-                        onClick={() => dispatch([r.id])}
-                      >
-                        Dispatch
-                      </Button>
-                    </Table.Td>
-                  )}
                 </Table.Tr>
               ))}
             </Table.Tbody>
@@ -2245,6 +2231,9 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
       handoverDocumentReference: row.handoverDocumentReference,
       handoverDocumentDate: row.handoverDocumentDate,
       deliveredAt: row.deliveredAt,
+      // Carries the saved [Exit Inspection] block so Truck Leaving opens with the
+      // arrival details (plate, driver, tare, gate-in) read-only instead of blank.
+      notes: row.notes,
       booking: row.bookingId
         ? {
             id: row.bookingId,
@@ -2282,7 +2271,7 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
       void qc.invalidateQueries({ queryKey: ['warehouse-inventory'] });
     } catch (error) {
       pdfWindow?.close();
-      toast({ variant: 'destructive', title: 'Handover document failed', description: extractErrorMessage(error) });
+      toast({ variant: 'destructive', title: 'Handover document failed', description: await extractDownloadErrorMessage(error) });
     } finally {
       setBusyId(null);
     }
@@ -2296,7 +2285,7 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
       openPdfBlob(response.data, `release-${row.bookingReference ?? row.id}.pdf`, pdfWindow);
     } catch (error) {
       pdfWindow?.close();
-      toast({ variant: 'destructive', title: 'Exit paper failed', description: extractErrorMessage(error) });
+      toast({ variant: 'destructive', title: 'Exit paper failed', description: await extractDownloadErrorMessage(error) });
     } finally {
       setBusyId(null);
     }
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
index 5cca0d3b2..d986e2aba 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Alert, Button, Group, Modal, MultiSelect, NumberInput, Select, SimpleGrid, Stack, Text, TextInput } from '@mantine/core';
+import { Alert, Button, Group, Modal, MultiSelect, NumberInput, SegmentedControl, Select, SimpleGrid, Stack, Text, TextInput } from '@mantine/core';
 import { Info, Scale } from 'lucide-react';
 
 import { useMutation, useQuery } from '@tanstack/react-query';
@@ -105,6 +105,7 @@ const parseInspectionNote = (notes: string | null | undefined) => {
     grossWeight: lineNumber(note, 'Gross Weight'),
     netWeight: lineNumber(note, 'Net Weight'),
     gateOutTime: toLocalDateTimeInput(lineValue(note, 'Gate Out Time')),
+    weighingSkipped: /^Weighing:\s*SKIPPED/im.test(note ?? ''),
   };
 };
 
@@ -135,6 +136,8 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
   const [containerNumbers, setContainerNumbers] = useState<string[]>(['']);
   const [gateInTime, setGateInTime] = useState('');
   const [tareWeight, setTareWeight] = useState<number | ''>('');
+  // Containers may skip the weighbridge (decided at arrival, sticks for exit). Bulk always weighs.
+  const [weighTruck, setWeighTruck] = useState<'yes' | 'no'>('yes');
   const [grossWeight, setGrossWeight] = useState<number | ''>('');
   const [netWeight, setNetWeight] = useState<number | ''>('');
   const [gateOutTime, setGateOutTime] = useState('');
@@ -158,6 +161,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
       setContainerNumbers(initialContainerNumbers(item, inspection.containerNumber || prefillContainerNumber || assignedContainerNumber));
       setGateInTime(inspection.gateInTime);
       setTareWeight(inspection.tareWeight);
+      setWeighTruck(inspection.weighingSkipped ? 'no' : 'yes');
       setGrossWeight(inspection.grossWeight);
       setNetWeight(item?.weight == null ? inspection.netWeight : Number(item.weight));
       setGateOutTime(inspection.gateOutTime);
@@ -165,7 +169,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
   }, [opened, item, truckPrefill]);
 
   const savedInspection = parseInspectionNote(item?.notes);
-  const isExitStep = savedInspection.tareWeight !== '';
+  const isExitStep = savedInspection.tareWeight !== '' || savedInspection.weighingSkipped;
   const isEntranceLocked = isExitStep;
   const isCustomerAssignedTruck = Boolean(item?.booking?.customerTruckAssignedAt);
   const hasLastMileTruckPrefill = Boolean(truckPrefill?.truckPlateNumber || truckPrefill?.trailerPlateNumber);
@@ -220,7 +224,9 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
       .reduce((sum, n) => sum + (containerWeightByNumber.get(n.toUpperCase()) ?? 0), 0)
       .toFixed(3),
   );
-  const useContainerNet = hasContainerWeights && selectedContainerNumbers.length > 0;
+  // Skip is only offered for container bookings; bulk always weighs.
+  const skipWeighing = hasContainerWeights && weighTruck === 'no';
+  const useContainerNet = hasContainerWeights && selectedContainerNumbers.length > 0 && !skipWeighing;
 
   const systemNetWeight = useContainerNet
     ? selectedCargoWeight
@@ -230,6 +236,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
   const computedNetWeight =
     tareWeight !== '' && grossWeight !== '' ? Number((Number(grossWeight) - Number(tareWeight)).toFixed(3)) : null;
   const weightMismatch =
+    !skipWeighing &&
     computedNetWeight != null && systemNetWeight !== '' && Math.abs(Number(systemNetWeight) - computedNetWeight) > 0.001;
   const title = isExitStep ? 'Customer truck leaving and exit weighing' : 'Customer truck arrival weighing';
 
@@ -239,19 +246,25 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
       toast({ variant: 'destructive', title: 'Truck plate and driver name are required' });
       return;
     }
-    if (!gateInTime || tareWeight === '') {
-      toast({ variant: 'destructive', title: 'Gate in time and tare weight are required' });
+    if (!gateInTime || (!skipWeighing && tareWeight === '')) {
+      toast({
+        variant: 'destructive',
+        title: skipWeighing ? 'Gate in time is required' : 'Gate in time and tare weight are required',
+      });
       return;
     }
-    if (isExitStep && (!gateOutTime || grossWeight === '')) {
-      toast({ variant: 'destructive', title: 'Gate out time and gross weight are required' });
+    if (isExitStep && (!gateOutTime || (!skipWeighing && grossWeight === ''))) {
+      toast({
+        variant: 'destructive',
+        title: skipWeighing ? 'Gate out time is required' : 'Gate out time and gross weight are required',
+      });
       return;
     }
     if (isExitStep && hasContainerWeights && selectedContainerNumbers.length === 0) {
       toast({ variant: 'destructive', title: 'Select the containers loaded on this truck' });
       return;
     }
-    if (isExitStep && systemNetWeight === '') {
+    if (isExitStep && !skipWeighing && systemNetWeight === '') {
       toast({ variant: 'destructive', title: 'System recorded net weight is missing' });
       return;
     }
@@ -279,9 +292,10 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
           truckType: truckType.trim() || undefined,
           containerNumber: containerNumbers.map((number) => number.trim()).filter(Boolean).join(', ') || undefined,
           gateInTime: toIsoDateTime(gateInTime),
-          tareWeight: Number(tareWeight),
-          grossWeight: grossWeight === '' ? undefined : Number(grossWeight),
-          netWeight: isExitStep && systemNetWeight !== '' ? Number(systemNetWeight) : undefined,
+          weighingSkipped: skipWeighing || undefined,
+          tareWeight: skipWeighing ? undefined : Number(tareWeight),
+          grossWeight: skipWeighing || grossWeight === '' ? undefined : Number(grossWeight),
+          netWeight: !skipWeighing && isExitStep && systemNetWeight !== '' ? Number(systemNetWeight) : undefined,
           gateOutTime: isExitStep ? toIsoDateTime(gateOutTime) : undefined,
         },
       });
@@ -421,9 +435,24 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
           )}
           <TextInput label="Gate in time" type="datetime-local" value={gateInTime} onChange={(e) => setGateInTime(e.currentTarget.value)} readOnly={isEntranceLocked} />
         </Group>
+        {hasContainerWeights && (
+          <Group gap="md" align="center">
+            <Text size="sm" fw={600}>Weigh truck?</Text>
+            <SegmentedControl
+              size="xs"
+              data={[{ value: 'yes', label: 'Yes — weigh' }, { value: 'no', label: 'No — pass' }]}
+              value={weighTruck}
+              onChange={(v) => setWeighTruck((v as 'yes' | 'no') ?? 'yes')}
+              disabled={isEntranceLocked}
+            />
+            {skipWeighing && (
+              <Text size="xs" c="dimmed">Weighbridge skipped — container passes without tare/gross.</Text>
+            )}
+          </Group>
+        )}
         <Group grow>
-          <NumberInput label="Tare weight (t)" required min={0} value={tareWeight} onChange={(v) => setTareWeight(v === '' ? '' : Number(v))} readOnly={isEntranceLocked} />
-          <NumberInput label="Gross weight (t)" required={isExitStep} min={0} value={grossWeight} onChange={(v) => setGrossWeight(v === '' ? '' : Number(v))} disabled={!isExitStep} />
+          <NumberInput label="Tare weight (t)" required={!skipWeighing} min={0} value={tareWeight} onChange={(v) => setTareWeight(v === '' ? '' : Number(v))} readOnly={isEntranceLocked} disabled={skipWeighing} />
+          <NumberInput label="Gross weight (t)" required={isExitStep && !skipWeighing} min={0} value={grossWeight} onChange={(v) => setGrossWeight(v === '' ? '' : Number(v))} disabled={!isExitStep || skipWeighing} />
           <NumberInput
             label={useContainerNet ? 'Selected cargo net (t)' : 'Recorded net weight (system t)'}
             min={0}
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/TruckDispatchModal.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/TruckDispatchModal.tsx
index 73e37c1ec..f26469ac7 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/TruckDispatchModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/TruckDispatchModal.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react';
 
 import { useToast } from '@/hooks/use-toast';
 import { warehouseService } from '@/services/warehouse.service';
-import { extractErrorMessage } from './options';
+import { extractDownloadErrorMessage, extractErrorMessage } from './options';
 import { openPdfBlob } from './pdf';
 
 interface TruckDispatchModalProps {
@@ -56,7 +56,7 @@ export function TruckDispatchModal({ opened, onClose, bookingId, bookingReferenc
       const res = await warehouseService.downloadTruckExitPaper(assignmentId);
       openPdfBlob(res.data, `exit-${plate}.pdf`);
     } catch (e) {
-      toast({ variant: 'destructive', title: 'Exit paper not ready', description: extractErrorMessage(e) });
+      toast({ variant: 'destructive', title: 'Exit paper not ready', description: await extractDownloadErrorMessage(e) });
     }
   };
 
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/WarehouseInventoryTable.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/WarehouseInventoryTable.tsx
index 871780bbf..51650b459 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/WarehouseInventoryTable.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/WarehouseInventoryTable.tsx
@@ -10,7 +10,7 @@ import {
   type WarehouseInventoryItem,
 } from '@/types/warehouse';
 import { InventoryStatusBadge } from './badges';
-import { extractErrorMessage, formatDate, formatNumber, humanizeEnum } from './options';
+import { extractDownloadErrorMessage, formatDate, formatNumber, humanizeEnum } from './options';
 import { openPdfBlob } from './pdf';
 
 interface WarehouseInventoryTableProps {
@@ -78,7 +78,7 @@ function GrnDocumentButton({ item }: { item: WarehouseInventoryItem }) {
       toast({ title: opened ? 'GRN document opened' : 'GRN document downloaded' });
     } catch (error) {
       pdfWindow?.close();
-      toast({ variant: 'destructive', title: 'GRN document failed', description: extractErrorMessage(error) });
+      toast({ variant: 'destructive', title: 'GRN document failed', description: await extractDownloadErrorMessage(error) });
     } finally {
       setLoading(false);
     }
@@ -160,7 +160,12 @@ export function WarehouseInventoryTable({
           {items.map((item) => {
             const kind = itemKind(item);
             const busy = busyId === item.id;
-            const nextAction = getNextInventoryAction(item);
+            // Per-booking Load and Dispatch are retired: wagon loading happens in
+            // the train flow and dispatch at the train level (which already
+            // advances inventory). Only the remaining lifecycle actions render.
+            const rawNextAction = getNextInventoryAction(item);
+            const nextAction =
+              rawNextAction === 'load' || rawNextAction === 'dispatch' ? null : rawNextAction;
             const canGenerateHandover =
               item.inspectionStatus === 'PASSED' &&
               Boolean(item.bookingId) &&
@@ -232,26 +237,15 @@ export function WarehouseInventoryTable({
                       </Button>
                     )}
                     {item.status === 'READY_FOR_PICKUP' && (
-                      <>
-                        <Button
-                          size="compact-xs"
-                          variant="light"
-                          color="blue"
-                          loading={busy}
-                          onClick={() => onAdvance(item, 'store')}
-                        >
-                          Store
-                        </Button>
-                        <Button
-                          size="compact-xs"
-                          variant="light"
-                          color="green"
-                          loading={busy}
-                          onClick={() => onAdvance(item, 'dispatch')}
-                        >
-                          Dispatch
-                        </Button>
-                      </>
+                      <Button
+                        size="compact-xs"
+                        variant="light"
+                        color="blue"
+                        loading={busy}
+                        onClick={() => onAdvance(item, 'store')}
+                      >
+                        Store
+                      </Button>
                     )}
                     {item.status !== 'DISPATCHED' && (
                       <Tooltip label="Move" withArrow>
diff --git a/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts b/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
index 2ceaae870..dbac021f3 100644
--- a/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
@@ -103,7 +103,8 @@ export const QUERY_KEYS = {
     schedules: () => ["train-scheduling", "schedules"] as const,
     scheduleById: (id: string) => ["train-scheduling", "schedule", id] as const,
     track: (id: string) => ["train-scheduling", "track", id] as const,
-    batchBoard: () => ["train-scheduling", "batch-board"] as const,
+    batchBoard: (filters?: unknown) =>
+      ["train-scheduling", "batch-board", "list", filters ?? {}] as const,
     batchBoardDetail: (scheduleId: string) =>
       ["train-scheduling", "batch-board", scheduleId] as const,
     unassignedBookings: (id: string) =>
diff --git a/apps/edr-freight-web/backoffice/src/constants/URLS.ts b/apps/edr-freight-web/backoffice/src/constants/URLS.ts
index 77a3bc95e..c6f98c8a2 100644
--- a/apps/edr-freight-web/backoffice/src/constants/URLS.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/URLS.ts
@@ -86,6 +86,8 @@ export const URL_CONSTANTS = {
       `/bookings/by-company/${id}/customer-view`,
     PAYMENTS_CUSTOMER_VIEW: (id: string) =>
       `/payments/by-company/${id}/customer-view`,
+    RESET_PASSWORD: (companyId: string) =>
+      `/backoffice/customers/${companyId}/reset-password`,
   },
 
   BILLING: {
diff --git a/apps/edr-freight-web/backoffice/src/features/contracts/mapContractListRow.ts b/apps/edr-freight-web/backoffice/src/features/contracts/mapContractListRow.ts
index 69c394927..0cd842830 100644
--- a/apps/edr-freight-web/backoffice/src/features/contracts/mapContractListRow.ts
+++ b/apps/edr-freight-web/backoffice/src/features/contracts/mapContractListRow.ts
@@ -80,7 +80,7 @@ export function toContractListRow(contract: Freight.IContract): ContractListRow
     approvalSteps: contract.approvalSteps,
     customerLabel: contract.isGovernment
       ? (contract.governmentInstitution ?? "Government")
-      : (contract.companyId ?? "—"),
+      : (contract.company?.name ?? "—"),
     status: contract.status,
     contractKind: contract.contractKind,
     tradeDirection: contract.tradeDirection,
diff --git a/apps/edr-freight-web/backoffice/src/hooks/contract-templates/useContractTemplates.ts b/apps/edr-freight-web/backoffice/src/hooks/contract-templates/useContractTemplates.ts
new file mode 100644
index 000000000..7e01d883c
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/hooks/contract-templates/useContractTemplates.ts
@@ -0,0 +1,98 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import toast from "react-hot-toast";
+
+import {
+  contractTemplatesService,
+  type ArticlePayload,
+  type UpdateContractTemplatePayload,
+} from "@/services/contract-templates.service";
+
+const KEYS = {
+  ROOT: ["contract-templates"] as const,
+  list: () => ["contract-templates", "list"] as const,
+  byCode: (code: string) => ["contract-templates", "detail", code] as const,
+  preview: (code: string) => ["contract-templates", "preview", code] as const,
+};
+
+export function useContractTemplates() {
+  return useQuery({
+    queryKey: KEYS.list(),
+    queryFn: () => contractTemplatesService.list(),
+  });
+}
+
+export function useContractTemplate(code: string | undefined) {
+  return useQuery({
+    queryKey: KEYS.byCode(code ?? ""),
+    queryFn: () => contractTemplatesService.getByCode(code as string),
+    enabled: Boolean(code),
+  });
+}
+
+/** Rendered mock-data HTML preview of the template's saved state. */
+export function useContractTemplatePreview(code: string | undefined, enabled = true) {
+  return useQuery({
+    queryKey: KEYS.preview(code ?? ""),
+    queryFn: () => contractTemplatesService.preview(code as string),
+    enabled: Boolean(code) && enabled,
+    staleTime: 0,
+  });
+}
+
+function useTemplateMutation<TVariables>(
+  mutationFn: (vars: TVariables) => Promise<unknown>,
+  successMessage: string,
+) {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn,
+    onSuccess: () => {
+      toast.success(successMessage);
+      void queryClient.invalidateQueries({ queryKey: KEYS.ROOT });
+    },
+    onError: (error: unknown) => {
+      const message =
+        (error as { response?: { data?: { message?: string } } })?.response?.data
+          ?.message ?? "Something went wrong";
+      toast.error(Array.isArray(message) ? message.join(", ") : message);
+    },
+  });
+}
+
+export function useUpdateContractTemplate(code: string) {
+  return useTemplateMutation(
+    (payload: UpdateContractTemplatePayload) =>
+      contractTemplatesService.update(code, payload),
+    "Template updated",
+  );
+}
+
+export function useAddArticle(code: string) {
+  return useTemplateMutation(
+    (payload: ArticlePayload) => contractTemplatesService.addArticle(code, payload),
+    "Article added",
+  );
+}
+
+export function useUpdateArticle(code: string) {
+  return useTemplateMutation(
+    (vars: { articleId: string; payload: Partial<ArticlePayload> }) =>
+      contractTemplatesService.updateArticle(code, vars.articleId, vars.payload),
+    "Article updated",
+  );
+}
+
+export function useRemoveArticle(code: string) {
+  return useTemplateMutation(
+    (articleId: string) => contractTemplatesService.removeArticle(code, articleId),
+    "Article removed",
+  );
+}
+
+export function useReplaceArticles(code: string) {
+  return useTemplateMutation(
+    (articles: Array<{ id?: string; title: string; body: string }>) =>
+      contractTemplatesService.replaceArticles(code, articles),
+    "Articles reordered",
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/lib/permissions.ts b/apps/edr-freight-web/backoffice/src/lib/permissions.ts
index e0c5c3d08..92fe85ad7 100644
--- a/apps/edr-freight-web/backoffice/src/lib/permissions.ts
+++ b/apps/edr-freight-web/backoffice/src/lib/permissions.ts
@@ -62,6 +62,7 @@ export const FREIGHT_PERMS = {
     update: "edr_freight_app:customers:update",
     deactivate: "edr_freight_app:customers:deactivate",
     verify: "edr_freight_app:customers:verify",
+    resetPassword: "edr_freight_app:customers:reset-password",
   },
   payments: {
     view: "edr_freight_app:payments:view",
diff --git a/apps/edr-freight-web/backoffice/src/lib/queryClient.ts b/apps/edr-freight-web/backoffice/src/lib/queryClient.ts
index 781ffba74..5b2bcb255 100644
--- a/apps/edr-freight-web/backoffice/src/lib/queryClient.ts
+++ b/apps/edr-freight-web/backoffice/src/lib/queryClient.ts
@@ -28,6 +28,10 @@ export const queryClient = new QueryClient({
     queries: {
       retry: 1,
       staleTime: 30_000,
+      // Data freshness is driven by mutation invalidation (MutationCache above),
+      // socket pushes, and explicit polling — not by tab focus. Focus refetch
+      // just re-fires every mounted query each time the window is refocused.
+      refetchOnWindowFocus: false,
     },
   },
 });
diff --git a/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestsPage.tsx
index 477900ee1..c406b7a4b 100644
--- a/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestsPage.tsx
@@ -4,18 +4,21 @@ import {
   Button,
   Card,
   Group,
+  MultiSelect,
   Select,
   Stack,
   Tabs,
   Text,
   TextInput,
 } from "@mantine/core";
+import { DateInput } from "@mantine/dates";
 import {
   AlertTriangle,
   ArrowRight,
   Calendar,
   CheckCircle2,
   Clock,
+  FilterX,
   LayoutList,
   Package,
   Plus,
@@ -26,6 +29,7 @@ import {
 } from "lucide-react";
 import { useCallback, useMemo, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
+import { useQuery } from "@tanstack/react-query";
 
 import { BookingActionsMenu } from "@/components/bookings/BookingActionsMenu";
 import { BookingApprovalProgressCell } from "@/components/bookings/BookingApprovalProgressCell";
@@ -43,6 +47,7 @@ import {
   useBookingList,
   useBookingListSummary,
 } from "@/hooks/bookings/useBookings";
+import { api } from "@/services/api";
 import type { BookingListFilter } from "@/services/bookings.service";
 import type { BookingListRow } from "@/types/booking";
 import {
@@ -77,6 +82,33 @@ const FREIGHT_TYPE_OPTIONS = [
   { value: "BULK", label: "Bulk" },
 ];
 
+const PAYMENT_STATUS_OPTIONS = [
+  { value: "PENDING", label: "Payment pending" },
+  { value: "PNR_GENERATED", label: "PNR generated" },
+  { value: "VERIFICATION_IN_PROGRESS", label: "Verification in progress" },
+  { value: "PAID", label: "Paid" },
+  { value: "FAILED", label: "Payment failed" },
+];
+
+const OWNERSHIP_OPTIONS = [
+  { value: "true", label: "Government" },
+  { value: "false", label: "Private" },
+];
+
+/** Local start-of-day → ISO, for inclusive "from" date filters. */
+function startOfDayIso(d: Date): string {
+  const x = new Date(d);
+  x.setHours(0, 0, 0, 0);
+  return x.toISOString();
+}
+
+/** Local end-of-day → ISO, for inclusive "to" date filters. */
+function endOfDayIso(d: Date): string {
+  const x = new Date(d);
+  x.setHours(23, 59, 59, 999);
+  return x.toISOString();
+}
+
 function formatDate(value: string | null | undefined): string {
   if (!value) return "—";
   const d = new Date(value);
@@ -95,10 +127,18 @@ export default function BookingRequestsPage() {
   const [query, setQuery] = useState("");
   // Booking-kind tabs (one-time vs general contract) replace the old status tabs.
   const [kindTab, setKindTab] = useState<BookingKindTab>("ONE_TIME");
-  // Per-tab filter selects (each nullable = "all").
-  const [statusFilter, setStatusFilter] = useState<string | null>(null);
+  // Per-tab filter controls (empty/null = "all").
+  const [statusFilter, setStatusFilter] = useState<string[]>([]);
   const [directionFilter, setDirectionFilter] = useState<string | null>(null);
   const [freightTypeFilter, setFreightTypeFilter] = useState<string | null>(null);
+  const [paymentStatusFilter, setPaymentStatusFilter] = useState<string | null>(null);
+  const [ownershipFilter, setOwnershipFilter] = useState<string | null>(null);
+  const [originYardFilter, setOriginYardFilter] = useState<string | null>(null);
+  const [destinationYardFilter, setDestinationYardFilter] = useState<string | null>(null);
+  const [createdFrom, setCreatedFrom] = useState<Date | null>(null);
+  const [createdTo, setCreatedTo] = useState<Date | null>(null);
+  const [scheduledFrom, setScheduledFrom] = useState<Date | null>(null);
+  const [scheduledTo, setScheduledTo] = useState<Date | null>(null);
   const [allocateOpen, setAllocateOpen] = useState(false);
   const [allocateIds, setAllocateIds] = useState<string[]>([]);
   const suppressRowClickRef = useRef(false);
@@ -118,9 +158,21 @@ export default function BookingRequestsPage() {
       // React Query cache key per kind tab.
       tab: kindTab,
       bookingType: kindTab,
-      ...(statusFilter ? { statuses: statusFilter } : {}),
+      ...(statusFilter.length ? { statuses: statusFilter.join(",") } : {}),
       ...(directionFilter ? { tradeDirection: directionFilter } : {}),
       ...(freightTypeFilter ? { freightType: freightTypeFilter } : {}),
+      ...(paymentStatusFilter ? { paymentStatus: paymentStatusFilter } : {}),
+      ...(ownershipFilter
+        ? { isGovernment: ownershipFilter as "true" | "false" }
+        : {}),
+      ...(originYardFilter ? { originYardId: originYardFilter } : {}),
+      ...(destinationYardFilter
+        ? { destinationYardId: destinationYardFilter }
+        : {}),
+      ...(createdFrom ? { createdFrom: startOfDayIso(createdFrom) } : {}),
+      ...(createdTo ? { createdTo: endOfDayIso(createdTo) } : {}),
+      ...(scheduledFrom ? { scheduledFrom: startOfDayIso(scheduledFrom) } : {}),
+      ...(scheduledTo ? { scheduledTo: endOfDayIso(scheduledTo) } : {}),
     };
   }, [
     pagination.pageIndex,
@@ -129,6 +181,14 @@ export default function BookingRequestsPage() {
     statusFilter,
     directionFilter,
     freightTypeFilter,
+    paymentStatusFilter,
+    ownershipFilter,
+    originYardFilter,
+    destinationYardFilter,
+    createdFrom,
+    createdTo,
+    scheduledFrom,
+    scheduledTo,
   ]);
 
   const { data, isLoading, isError, refetch, isFetching } = useBookingList(filter);
@@ -142,6 +202,49 @@ export default function BookingRequestsPage() {
     refetch: refetchSummary,
   } = useBookingListSummary(filter);
 
+  // Yard options for the origin/destination filters (shared routes reference list).
+  const { data: yardRefs } = useQuery(
+    api.routes.yards.queryOptions({ staleTime: 5 * 60_000 }),
+  );
+  const yardOptions = useMemo(
+    () =>
+      (yardRefs ?? []).map((y) => ({
+        value: y.id,
+        label: y.label ?? y.code,
+      })),
+    [yardRefs],
+  );
+
+  const resetPage = useCallback(() => {
+    setPagination({ pageIndex: 0, pageSize: pagination.pageSize });
+  }, [setPagination, pagination.pageSize]);
+
+  const activeFilterCount =
+    (statusFilter.length ? 1 : 0) +
+    (directionFilter ? 1 : 0) +
+    (freightTypeFilter ? 1 : 0) +
+    (paymentStatusFilter ? 1 : 0) +
+    (ownershipFilter ? 1 : 0) +
+    (originYardFilter ? 1 : 0) +
+    (destinationYardFilter ? 1 : 0) +
+    (createdFrom || createdTo ? 1 : 0) +
+    (scheduledFrom || scheduledTo ? 1 : 0);
+
+  const clearFilters = useCallback(() => {
+    setStatusFilter([]);
+    setDirectionFilter(null);
+    setFreightTypeFilter(null);
+    setPaymentStatusFilter(null);
+    setOwnershipFilter(null);
+    setOriginYardFilter(null);
+    setDestinationYardFilter(null);
+    setCreatedFrom(null);
+    setCreatedTo(null);
+    setScheduledFrom(null);
+    setScheduledTo(null);
+    resetPage();
+  }, [resetPage]);
+
   const rows = useMemo(() => {
     const items = (data?.items ?? []).map(toBookingListRow);
     const q = query.trim().toLowerCase();
@@ -415,18 +518,44 @@ export default function BookingRequestsPage() {
                     </Text>
                   </Group>
                   <Group gap="sm" wrap="wrap">
-                    <Select
-                      placeholder="All statuses"
+                    <MultiSelect
+                      placeholder={statusFilter.length ? undefined : "All statuses"}
                       data={STATUS_OPTIONS}
                       value={statusFilter}
                       onChange={(v) => {
                         setStatusFilter(v);
-                        setPagination({ pageIndex: 0, pageSize: pagination.pageSize });
+                        resetPage();
                       }}
                       clearable
                       searchable
                       radius="lg"
-                      style={{ minWidth: 200 }}
+                      style={{ minWidth: 220 }}
+                    />
+                    <Select
+                      placeholder="All origins"
+                      data={yardOptions}
+                      value={originYardFilter}
+                      onChange={(v) => {
+                        setOriginYardFilter(v);
+                        resetPage();
+                      }}
+                      clearable
+                      searchable
+                      radius="lg"
+                      style={{ minWidth: 180 }}
+                    />
+                    <Select
+                      placeholder="All destinations"
+                      data={yardOptions}
+                      value={destinationYardFilter}
+                      onChange={(v) => {
+                        setDestinationYardFilter(v);
+                        resetPage();
+                      }}
+                      clearable
+                      searchable
+                      radius="lg"
+                      style={{ minWidth: 180 }}
                     />
                     <Select
                       placeholder="All directions"
@@ -434,11 +563,11 @@ export default function BookingRequestsPage() {
                       value={directionFilter}
                       onChange={(v) => {
                         setDirectionFilter(v);
-                        setPagination({ pageIndex: 0, pageSize: pagination.pageSize });
+                        resetPage();
                       }}
                       clearable
                       radius="lg"
-                      style={{ minWidth: 170 }}
+                      style={{ minWidth: 150 }}
                     />
                     <Select
                       placeholder="All freight types"
@@ -446,13 +575,98 @@ export default function BookingRequestsPage() {
                       value={freightTypeFilter}
                       onChange={(v) => {
                         setFreightTypeFilter(v);
-                        setPagination({ pageIndex: 0, pageSize: pagination.pageSize });
+                        resetPage();
                       }}
                       clearable
                       radius="lg"
-                      style={{ minWidth: 170 }}
+                      style={{ minWidth: 150 }}
                     />
                   </Group>
+                  <Group gap="sm" wrap="wrap">
+                    <Select
+                      placeholder="All payment statuses"
+                      data={PAYMENT_STATUS_OPTIONS}
+                      value={paymentStatusFilter}
+                      onChange={(v) => {
+                        setPaymentStatusFilter(v);
+                        resetPage();
+                      }}
+                      clearable
+                      radius="lg"
+                      style={{ minWidth: 180 }}
+                    />
+                    <Select
+                      placeholder="Gov / Private"
+                      data={OWNERSHIP_OPTIONS}
+                      value={ownershipFilter}
+                      onChange={(v) => {
+                        setOwnershipFilter(v);
+                        resetPage();
+                      }}
+                      clearable
+                      radius="lg"
+                      style={{ minWidth: 140 }}
+                    />
+                    <DateInput
+                      placeholder="Created from"
+                      value={createdFrom}
+                      onChange={(v) => {
+                        setCreatedFrom(v ? new Date(v) : null);
+                        resetPage();
+                      }}
+                      maxDate={createdTo ?? undefined}
+                      clearable
+                      radius="lg"
+                      style={{ minWidth: 140 }}
+                    />
+                    <DateInput
+                      placeholder="Created to"
+                      value={createdTo}
+                      onChange={(v) => {
+                        setCreatedTo(v ? new Date(v) : null);
+                        resetPage();
+                      }}
+                      minDate={createdFrom ?? undefined}
+                      clearable
+                      radius="lg"
+                      style={{ minWidth: 140 }}
+                    />
+                    <DateInput
+                      placeholder="Scheduled from"
+                      value={scheduledFrom}
+                      onChange={(v) => {
+                        setScheduledFrom(v ? new Date(v) : null);
+                        resetPage();
+                      }}
+                      maxDate={scheduledTo ?? undefined}
+                      clearable
+                      radius="lg"
+                      style={{ minWidth: 150 }}
+                    />
+                    <DateInput
+                      placeholder="Scheduled to"
+                      value={scheduledTo}
+                      onChange={(v) => {
+                        setScheduledTo(v ? new Date(v) : null);
+                        resetPage();
+                      }}
+                      minDate={scheduledFrom ?? undefined}
+                      clearable
+                      radius="lg"
+                      style={{ minWidth: 150 }}
+                    />
+                    {activeFilterCount > 0 ? (
+                      <Button
+                        variant="subtle"
+                        color="gray"
+                        radius="lg"
+                        leftSection={<FilterX size={16} />}
+                        onClick={clearFilters}
+                      >
+                        Clear filters ({activeFilterCount})
+                      </Button>
+                    ) : null}
+                  </Group>
                 </Stack>
               </Box>
 
diff --git a/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceDetailPage.tsx
index a514cd3ec..2cb5404e7 100644
--- a/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceDetailPage.tsx
@@ -176,6 +176,7 @@ export default function DocumentClearanceDetailPage() {
                   hideSummary
                   approvalsLocked={isPhasedGeneral && docsPhaseComplete}
                   queriesLocked={queriesLocked}
+                  phasedCustoms={isPhasedGeneral}
                   onChanged={() => void refetch()}
                 />
               </Grid.Col>
diff --git a/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceListPage.tsx b/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceListPage.tsx
index da93d5995..542852a5f 100644
--- a/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/bookings/DocumentClearanceListPage.tsx
@@ -128,7 +128,16 @@ function DirectionIcon({ direction }: { direction: string }) {
   );
 }
 
-export default function DocumentClearanceListPage() {
+export default function DocumentClearanceListPage({
+  opsMode = false,
+}: {
+  /**
+   * true → Operations self-clearance queue: NON-customs bookings whose
+   * per-booking clearance docs the operations team reviews (GENERAL Path A).
+   * false → legacy GL queue: customs bookings only.
+   */
+  opsMode?: boolean;
+}) {
   const navigate = useNavigate();
   const [pageTab, setPageTab] = useState<PageTab>("queue");
   const [activeTab, setActiveTab] = useState<ClearanceTabKey>("all");
@@ -139,7 +148,7 @@ export default function DocumentClearanceListPage() {
   const isHistory = pageTab === "history";
 
   const { data, isLoading, isError, isFetching, refetch } = useQuery({
-    queryKey: ["clearance", "list", isHistory],
+    queryKey: ["clearance", "list", isHistory, opsMode],
     queryFn: () =>
       bookingsService.list({
         status: isHistory ? CLEARANCE_HISTORY_STATUS : CLEARANCE_REVIEW_STATUS,
@@ -148,8 +157,10 @@ export default function DocumentClearanceListPage() {
   });
 
   const allRows = useMemo(() => {
-    // GL clearance queue: customs bookings only
-    const rows = (data?.items ?? []).map(toClearanceRow).filter((r) => r.hasCustoms);
+    // opsMode: self-clearance (non-customs) bookings; else customs bookings only.
+    const rows = (data?.items ?? [])
+      .map(toClearanceRow)
+      .filter((r) => (opsMode ? !r.hasCustoms : r.hasCustoms));
 
     if (isHistory) {
       return [...rows].sort((a, b) => {
@@ -159,7 +170,7 @@ export default function DocumentClearanceListPage() {
       });
     }
     return rows;
-  }, [data?.items, isHistory]);
+  }, [data?.items, isHistory, opsMode]);
 
   const tabCounts = useMemo(
     () => ({
@@ -310,8 +321,12 @@ export default function DocumentClearanceListPage() {
     <PageContainer>
       <Stack gap="lg">
         <PageHeader
-          title="Document Clearance"
-          subtitle="Review customer documents, raise queries, and finalize clearance for each booking."
+          title={opsMode ? "Self-Clearance Review" : "Document Clearance"}
+          subtitle={
+            opsMode
+              ? "Review the customer's own clearance documents per shipment booking, raise queries, and finalize."
+              : "Review customer documents, raise queries, and finalize clearance for each booking."
+          }
           meta={statusBadge}
           action={
             <ActionIcon
diff --git a/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplateEditorPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplateEditorPage.tsx
new file mode 100644
index 000000000..0ad7ef301
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplateEditorPage.tsx
@@ -0,0 +1,468 @@
+import { useMemo, useState } from "react";
+import { useParams } from "react-router-dom";
+import {
+  ActionIcon,
+  Badge,
+  Button,
+  Card,
+  Center,
+  Group,
+  Loader,
+  Modal,
+  Paper,
+  Stack,
+  Switch,
+  Text,
+  Textarea,
+  TextInput,
+  Title,
+  Tooltip,
+} from "@mantine/core";
+import {
+  ArrowDown,
+  ArrowUp,
+  Pencil,
+  Plus,
+  RefreshCw,
+  Settings2,
+  Trash2,
+} from "lucide-react";
+
+import { PageContainer, PageHeader } from "@/components/page";
+import {
+  useAddArticle,
+  useContractTemplate,
+  useContractTemplatePreview,
+  useRemoveArticle,
+  useReplaceArticles,
+  useUpdateArticle,
+  useUpdateContractTemplate,
+} from "@/hooks/contract-templates/useContractTemplates";
+import type { ContractTemplateArticle } from "@/services/contract-templates.service";
+
+const BODY_HINT =
+  'One clause per line — clauses are numbered automatically. Prefix a line with "- " to nest it as a bullet under the previous clause. Placeholders like {{client.companyName}}, {{contractDate}}, {{contractYear}} and {{reference}} are filled from the contract.';
+
+interface ArticleDraft {
+  id?: string;
+  title: string;
+  body: string;
+}
+
+export default function ContractTemplateEditorPage() {
+  const { code } = useParams<{ code: string }>();
+  const { data: template, isLoading } = useContractTemplate(code);
+  const preview = useContractTemplatePreview(code);
+
+  const updateTemplate = useUpdateContractTemplate(code ?? "");
+  const addArticle = useAddArticle(code ?? "");
+  const updateArticle = useUpdateArticle(code ?? "");
+  const removeArticle = useRemoveArticle(code ?? "");
+  const replaceArticles = useReplaceArticles(code ?? "");
+
+  const [articleDraft, setArticleDraft] = useState<ArticleDraft | null>(null);
+  const [deleteTarget, setDeleteTarget] = useState<ContractTemplateArticle | null>(null);
+  const [detailsOpen, setDetailsOpen] = useState(false);
+
+  const sortedArticles = useMemo(
+    () => [...(template?.articles ?? [])].sort((a, b) => a.order - b.order),
+    [template],
+  );
+
+  const moveArticle = (index: number, delta: -1 | 1) => {
+    const next = [...sortedArticles];
+    const target = index + delta;
+    if (target < 0 || target >= next.length) return;
+    [next[index], next[target]] = [next[target], next[index]];
+    replaceArticles.mutate(
+      next.map(({ id, title, body }) => ({ id, title, body })),
+    );
+  };
+
+  const saveArticle = () => {
+    if (!articleDraft) return;
+    if (articleDraft.id) {
+      updateArticle.mutate({
+        articleId: articleDraft.id,
+        payload: { title: articleDraft.title, body: articleDraft.body },
+      });
+    } else {
+      addArticle.mutate({ title: articleDraft.title, body: articleDraft.body });
+    }
+    setArticleDraft(null);
+  };
+
+  if (isLoading || !template) {
+    return (
+      <PageContainer>
+        <Center h={360}>
+          <Loader color="edr-green" />
+        </Center>
+      </PageContainer>
+    );
+  }
+
+  return (
+    <PageContainer>
+      <PageHeader
+        title={template.name}
+        subtitle={template.documentTitle}
+        backTo="/dashboard/contract-templates"
+        meta={
+          <Group gap={6}>
+            <Badge variant="outline" color="edr-green">
+              {template.code.replaceAll("_", " · ")}
+            </Badge>
+            {!template.isActive && (
+              <Badge variant="light" color="red">
+                Inactive
+              </Badge>
+            )}
+          </Group>
+        }
+        action={
+          <Group gap="sm">
+            <Switch
+              color="edr-green"
+              label="Active"
+              checked={template.isActive}
+              onChange={(event) =>
+                updateTemplate.mutate({ isActive: event.currentTarget.checked })
+              }
+            />
+            <Button
+              variant="light"
+              color="edr-green"
+              leftSection={<Settings2 size={16} />}
+              onClick={() => setDetailsOpen(true)}
+            >
+              Document details
+            </Button>
+            <Button
+              color="edr-green"
+              leftSection={<Plus size={16} />}
+              onClick={() => setArticleDraft({ title: "", body: "" })}
+            >
+              Add article
+            </Button>
+          </Group>
+        }
+      />
+
+      <div className="grid grid-cols-1 gap-4 xl:grid-cols-2">
+        {/* ── Article list ─────────────────────────────────────────────── */}
+        <Stack gap="sm">
+          {sortedArticles.map((article, index) => (
+            <Card key={article.id} withBorder radius="lg" padding="md">
+              <Group justify="space-between" align="flex-start" wrap="nowrap">
+                <div style={{ minWidth: 0 }}>
+                  <Text fw={700} size="sm" c="edr-green.7">
+                    Article {index + 1}
+                  </Text>
+                  <Title order={5}>{article.title}</Title>
+                  <Text size="sm" c="dimmed" lineClamp={2} mt={4}>
+                    {article.body}
+                  </Text>
+                </div>
+                <Group gap={4} wrap="nowrap">
+                  <Tooltip label="Move up">
+                    <ActionIcon
+                      variant="subtle"
+                      color="gray"
+                      disabled={index === 0}
+                      onClick={() => moveArticle(index, -1)}
+                    >
+                      <ArrowUp size={16} />
+                    </ActionIcon>
+                  </Tooltip>
+                  <Tooltip label="Move down">
+                    <ActionIcon
+                      variant="subtle"
+                      color="gray"
+                      disabled={index === sortedArticles.length - 1}
+                      onClick={() => moveArticle(index, 1)}
+                    >
+                      <ArrowDown size={16} />
+                    </ActionIcon>
+                  </Tooltip>
+                  <Tooltip label="Edit article">
+                    <ActionIcon
+                      variant="subtle"
+                      color="edr-green"
+                      onClick={() =>
+                        setArticleDraft({
+                          id: article.id,
+                          title: article.title,
+                          body: article.body,
+                        })
+                      }
+                    >
+                      <Pencil size={16} />
+                    </ActionIcon>
+                  </Tooltip>
+                  <Tooltip label="Remove article">
+                    <ActionIcon
+                      variant="subtle"
+                      color="red"
+                      onClick={() => setDeleteTarget(article)}
+                    >
+                      <Trash2 size={16} />
+                    </ActionIcon>
+                  </Tooltip>
+                </Group>
+              </Group>
+            </Card>
+          ))}
+          {sortedArticles.length === 0 && (
+            <Card withBorder radius="lg" padding="xl">
+              <Center>
+                <Text c="dimmed">
+                  No articles yet — add the first article to build this contract.
+                </Text>
+              </Center>
+            </Card>
+          )}
+        </Stack>
+
+        {/* ── Live preview ─────────────────────────────────────────────── */}
+        <Card withBorder radius="lg" padding="sm" className="xl:sticky xl:top-4 self-start">
+          <Group justify="space-between" mb="xs" px={4}>
+            <Text fw={600} size="sm">
+              Document preview (mock data)
+            </Text>
+            <Tooltip label="Refresh preview">
+              <ActionIcon
+                variant="subtle"
+                color="edr-green"
+                loading={preview.isFetching}
+                onClick={() => void preview.refetch()}
+              >
+                <RefreshCw size={16} />
+              </ActionIcon>
+            </Tooltip>
+          </Group>
+          <Paper withBorder radius="md" style={{ overflow: "hidden" }}>
+            {preview.isLoading ? (
+              <Center h={480}>
+                <Loader color="edr-green" />
+              </Center>
+            ) : (
+              <iframe
+                title="Template preview"
+                srcDoc={preview.data?.html}
+                style={{
+                  width: "100%",
+                  height: "calc(100vh - 240px)",
+                  minHeight: 480,
+                  border: 0,
+                  background: "#f3f8f5",
+                }}
+              />
+            )}
+          </Paper>
+        </Card>
+      </div>
+
+      {/* ── Add / edit article modal ───────────────────────────────────── */}
+      <Modal
+        opened={Boolean(articleDraft)}
+        onClose={() => setArticleDraft(null)}
+        title={articleDraft?.id ? "Edit article" : "Add article"}
+        size="xl"
+      >
+        {articleDraft && (
+          <Stack gap="sm">
+            <TextInput
+              label="Article title"
+              placeholder="e.g. Obligations of the Client"
+              value={articleDraft.title}
+              onChange={(event) =>
+                setArticleDraft({ ...articleDraft, title: event.currentTarget.value })
+              }
+              required
+            />
+            <Textarea
+              label="Article body"
+              description={BODY_HINT}
+              value={articleDraft.body}
+              onChange={(event) =>
+                setArticleDraft({ ...articleDraft, body: event.currentTarget.value })
+              }
+              autosize
+              minRows={12}
+              maxRows={24}
+              styles={{ input: { fontFamily: "ui-monospace, monospace", fontSize: 13 } }}
+              required
+            />
+            <Group justify="flex-end">
+              <Button variant="default" onClick={() => setArticleDraft(null)}>
+                Cancel
+              </Button>
+              <Button
+                color="edr-green"
+                disabled={
+                  articleDraft.title.trim().length < 2 ||
+                  articleDraft.body.trim().length < 2
+                }
+                loading={addArticle.isPending || updateArticle.isPending}
+                onClick={saveArticle}
+              >
+                {articleDraft.id ? "Save changes" : "Add article"}
+              </Button>
+            </Group>
+          </Stack>
+        )}
+      </Modal>
+
+      {/* ── Delete confirm ─────────────────────────────────────────────── */}
+      <Modal
+        opened={Boolean(deleteTarget)}
+        onClose={() => setDeleteTarget(null)}
+        title="Remove article"
+        size="md"
+      >
+        <Stack gap="md">
+          <Text size="sm">
+            Remove <strong>{deleteTarget?.title}</strong> from this template? The
+            remaining articles are renumbered automatically.
+          </Text>
+          <Group justify="flex-end">
+            <Button variant="default" onClick={() => setDeleteTarget(null)}>
+              Cancel
+            </Button>
+            <Button
+              color="red"
+              loading={removeArticle.isPending}
+              onClick={() => {
+                if (deleteTarget) removeArticle.mutate(deleteTarget.id);
+                setDeleteTarget(null);
+              }}
+            >
+              Remove article
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
+      {/* ── Document details modal ─────────────────────────────────────── */}
+      <DocumentDetailsModal
+        opened={detailsOpen}
+        onClose={() => setDetailsOpen(false)}
+        initial={{
+          name: template.name,
+          description: template.description ?? "",
+          documentTitle: template.documentTitle,
+          whereasClauses: template.whereasClauses,
+        }}
+        saving={updateTemplate.isPending}
+        onSave={(values) => {
+          updateTemplate.mutate(values);
+          setDetailsOpen(false);
+        }}
+      />
+    </PageContainer>
+  );
+}
+
+interface DocumentDetailsModalProps {
+  opened: boolean;
+  onClose: () => void;
+  initial: {
+    name: string;
+    description: string;
+    documentTitle: string;
+    whereasClauses: string[];
+  };
+  saving: boolean;
+  onSave: (values: {
+    name: string;
+    description: string;
+    documentTitle: string;
+    whereasClauses: string[];
+  }) => void;
+}
+
+function DocumentDetailsModal({
+  opened,
+  onClose,
+  initial,
+  saving,
+  onSave,
+}: DocumentDetailsModalProps) {
+  const [name, setName] = useState(initial.name);
+  const [description, setDescription] = useState(initial.description);
+  const [documentTitle, setDocumentTitle] = useState(initial.documentTitle);
+  const [whereas, setWhereas] = useState(initial.whereasClauses.join("\n\n"));
+
+  // Re-sync local state each time the modal opens with fresh server data.
+  const [lastOpened, setLastOpened] = useState(false);
+  if (opened && !lastOpened) {
+    setName(initial.name);
+    setDescription(initial.description);
+    setDocumentTitle(initial.documentTitle);
+    setWhereas(initial.whereasClauses.join("\n\n"));
+    setLastOpened(true);
+  } else if (!opened && lastOpened) {
+    setLastOpened(false);
+  }
+
+  return (
+    <Modal opened={opened} onClose={onClose} title="Document details" size="xl">
+      <Stack gap="sm">
+        <TextInput
+          label="Template name"
+          value={name}
+          onChange={(event) => setName(event.currentTarget.value)}
+          required
+        />
+        <TextInput
+          label="Cover page title"
+          description="Printed on the contract cover, e.g. “Import Container Transport Service by Railway”."
+          value={documentTitle}
+          onChange={(event) => setDocumentTitle(event.currentTarget.value)}
+          required
+        />
+        <Textarea
+          label="Card description"
+          description="Shown on the Templates page card only — not printed."
+          value={description}
+          onChange={(event) => setDescription(event.currentTarget.value)}
+          autosize
+          minRows={2}
+        />
+        <Textarea
+          label="Recitals (WHEREAS clauses)"
+          description="One recital per paragraph — separate recitals with a blank line."
+          value={whereas}
+          onChange={(event) => setWhereas(event.currentTarget.value)}
+          autosize
+          minRows={5}
+          maxRows={12}
+        />
+        <Group justify="flex-end">
+          <Button variant="default" onClick={onClose}>
+            Cancel
+          </Button>
+          <Button
+            color="edr-green"
+            loading={saving}
+            disabled={name.trim().length < 3 || documentTitle.trim().length < 3}
+            onClick={() =>
+              onSave({
+                name: name.trim(),
+                description: description.trim(),
+                documentTitle: documentTitle.trim(),
+                whereasClauses: whereas
+                  .split(/\n\s*\n/)
+                  .map((clause) => clause.trim())
+                  .filter(Boolean),
+              })
+            }
+          >
+            Save details
+          </Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplatesPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplatesPage.tsx
new file mode 100644
index 000000000..e13c8a741
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplatesPage.tsx
@@ -0,0 +1,152 @@
+import { useState } from "react";
+import { useNavigate } from "react-router-dom";
+import {
+  Badge,
+  Button,
+  Card,
+  Center,
+  Group,
+  Loader,
+  SimpleGrid,
+  Stack,
+  Text,
+  ThemeIcon,
+} from "@mantine/core";
+import { Boxes, Container, Eye, FileSignature, Pencil } from "lucide-react";
+
+import { PageContainer, PageHeader } from "@/components/page";
+import { useContractTemplates } from "@/hooks/contract-templates/useContractTemplates";
+import type { ContractTemplate } from "@/services/contract-templates.service";
+import TemplatePreviewModal from "./TemplatePreviewModal";
+
+const DIRECTION_LABEL: Record<string, string> = {
+  IMPORT: "Import",
+  EXPORT: "Export",
+  INTERCITY: "Intercity",
+};
+
+const DIRECTION_COLOR: Record<string, string> = {
+  IMPORT: "edr-green",
+  EXPORT: "teal",
+  INTERCITY: "lime",
+};
+
+function templateDirection(code: ContractTemplate["code"]): string {
+  return code.split("_")[0];
+}
+
+function isBulk(code: ContractTemplate["code"]): boolean {
+  return code.endsWith("_BULK");
+}
+
+export default function ContractTemplatesPage() {
+  const navigate = useNavigate();
+  const { data: templates, isLoading } = useContractTemplates();
+  const [previewCode, setPreviewCode] = useState<string | null>(null);
+
+  const previewTemplate = templates?.find((t) => t.code === previewCode);
+
+  return (
+    <PageContainer>
+      <PageHeader
+        title="Contract templates"
+        subtitle="The six contract documents generated when a contract is approved — one per trade direction and freight type. Articles are fully editable."
+      />
+
+      {isLoading ? (
+        <Center h={320}>
+          <Loader color="edr-green" />
+        </Center>
+      ) : (
+        <SimpleGrid cols={{ base: 1, md: 2, xl: 3 }} spacing="lg">
+          {(templates ?? []).map((template) => {
+            const direction = templateDirection(template.code);
+            return (
+              <Card key={template.code} withBorder radius="xl" padding="lg">
+                <Stack gap="sm" h="100%">
+                  <Group justify="space-between" align="flex-start">
+                    <ThemeIcon
+                      size={44}
+                      radius="md"
+                      variant="light"
+                      color="edr-green"
+                    >
+                      {isBulk(template.code) ? (
+                        <Boxes size={24} />
+                      ) : (
+                        <Container size={24} />
+                      )}
+                    </ThemeIcon>
+                    <Group gap={6}>
+                      <Badge
+                        variant="light"
+                        color={DIRECTION_COLOR[direction] ?? "edr-green"}
+                      >
+                        {DIRECTION_LABEL[direction] ?? direction}
+                      </Badge>
+                      <Badge variant="outline" color="gray">
+                        {isBulk(template.code) ? "Bulk" : "Container"}
+                      </Badge>
+                      {!template.isActive && (
+                        <Badge variant="light" color="red">
+                          Inactive
+                        </Badge>
+                      )}
+                    </Group>
+                  </Group>
+
+                  <div>
+                    <Text fw={700} size="lg">
+                      {template.name}
+                    </Text>
+                    <Text size="sm" c="dimmed" lineClamp={3}>
+                      {template.description || template.documentTitle}
+                    </Text>
+                  </div>
+
+                  <Group gap="xs" mt="auto">
+                    <FileSignature size={14} className="text-edr-primary" />
+                    <Text size="xs" c="dimmed">
+                      {template.articles.length} articles · updated{" "}
+                      {new Date(template.updatedAt).toLocaleDateString("en-GB", {
+                        day: "numeric",
+                        month: "short",
+                        year: "numeric",
+                      })}
+                    </Text>
+                  </Group>
+
+                  <Group grow>
+                    <Button
+                      variant="light"
+                      color="edr-green"
+                      leftSection={<Eye size={16} />}
+                      onClick={() => setPreviewCode(template.code)}
+                    >
+                      Preview
+                    </Button>
+                    <Button
+                      color="edr-green"
+                      leftSection={<Pencil size={16} />}
+                      onClick={() =>
+                        navigate(`/dashboard/contract-templates/${template.code}`)
+                      }
+                    >
+                      Edit articles
+                    </Button>
+                  </Group>
+                </Stack>
+              </Card>
+            );
+          })}
+        </SimpleGrid>
+      )}
+
+      <TemplatePreviewModal
+        code={previewCode}
+        title={previewTemplate ? `${previewTemplate.name} — preview` : undefined}
+        onClose={() => setPreviewCode(null)}
+      />
+    </PageContainer>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/contract_templates/TemplatePreviewModal.tsx b/apps/edr-freight-web/backoffice/src/pages/contract_templates/TemplatePreviewModal.tsx
new file mode 100644
index 000000000..fd741305e
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/contract_templates/TemplatePreviewModal.tsx
@@ -0,0 +1,49 @@
+import { Center, Loader, Modal, Paper, Text } from "@mantine/core";
+
+import { useContractTemplatePreview } from "@/hooks/contract-templates/useContractTemplates";
+
+interface TemplatePreviewModalProps {
+  code: string | null;
+  title?: string;
+  onClose: () => void;
+}
+
+/** Full-document HTML preview rendered by the API against mock contract data. */
+export default function TemplatePreviewModal({
+  code,
+  title,
+  onClose,
+}: TemplatePreviewModalProps) {
+  const { data, isLoading, isError } = useContractTemplatePreview(
+    code ?? undefined,
+    Boolean(code),
+  );
+
+  return (
+    <Modal
+      opened={Boolean(code)}
+      onClose={onClose}
+      title={title ?? "Contract preview"}
+      size="90%"
+      padding="sm"
+    >
+      {isLoading ? (
+        <Center h={420}>
+          <Loader color="edr-green" />
+        </Center>
+      ) : isError ? (
+        <Center h={200}>
+          <Text c="red">Failed to render the preview.</Text>
+        </Center>
+      ) : (
+        <Paper withBorder radius="md" style={{ overflow: "hidden" }}>
+          <iframe
+            title="Contract template preview"
+            srcDoc={data?.html}
+            style={{ width: "100%", height: "72vh", border: 0, background: "#f3f8f5" }}
+          />
+        </Paper>
+      )}
+    </Modal>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
index 1121329fb..78f42a7d7 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
@@ -25,6 +25,7 @@ import {
   PackagePlus,
   RefreshCw,
   Search,
+  Send,
   ShieldCheck,
   ShipWheel,
   Table as TableIcon,
@@ -49,11 +50,13 @@ import {
   useContractClearanceQueue,
   useEtClearanceQueue,
 } from "@/hooks/contracts/useContracts";
+import { useBookingEtClearanceQueue } from "@/hooks/bookings/useBookings";
+import type { BookingDetail } from "@/types/booking";
 import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { GlUpcomingWindowsSection } from "@/components/contracts/GlUpcomingWindowsSection";
 
 type ViewMode = "table" | "cards";
-type QueueTab = "all" | "et";
+type QueueTab = "all" | "et" | "shipments";
 
 interface ClearanceRow {
   id: string;
@@ -194,6 +197,10 @@ export default function ContractClearanceListPage() {
   const { user } = useAuth();
   const canReview = hasPermission(user, FREIGHT_PERMS.contracts.clearanceReview);
   const canEt = hasPermission(user, FREIGHT_PERMS.contracts.clearanceEtActions);
+  const canCreateBooking = hasPermission(
+    user,
+    FREIGHT_PERMS.contracts.createBooking,
+  );
 
   const defaultQueue: QueueTab = canReview ? "all" : "et";
   const [queueTab, setQueueTab] = useState<QueueTab>(defaultQueue);
@@ -202,16 +209,29 @@ export default function ContractClearanceListPage() {
   const { pagination, setPagination } = usePagination({ pageSize: 10 });
 
   const { data: allData, isLoading: allLoading, isError: allError, isFetching: allFetching, refetch: refetchAll } =
-    useContractClearanceQueue(queueTab === "all");
+    useContractClearanceQueue(queueTab === "all" || queueTab === "shipments");
   const { data: etData, isLoading: etLoading, isError: etError, isFetching: etFetching, refetch: refetchEt } =
     useEtClearanceQueue(queueTab === "et");
+  const {
+    data: bookingQueue,
+    isLoading: bookingsLoading,
+    isError: bookingsError,
+    isFetching: bookingsFetching,
+    refetch: refetchBookings,
+  } = useBookingEtClearanceQueue(queueTab === "shipments");
 
   const data = queueTab === "et" ? etData : allData;
   const isLoading = queueTab === "et" ? etLoading : allLoading;
   const isError = queueTab === "et" ? etError : allError;
-  const isFetching = queueTab === "et" ? etFetching : allFetching;
+  const isFetching =
+    queueTab === "et"
+      ? etFetching
+      : queueTab === "shipments"
+        ? bookingsFetching
+        : allFetching;
   const refetch = () => {
     if (queueTab === "et") void refetchEt();
+    else if (queueTab === "shipments") void refetchBookings();
     else void refetchAll();
   };
 
@@ -239,9 +259,43 @@ export default function ContractClearanceListPage() {
         ),
       });
     }
+    if (canReview || canEt) {
+      opts.push({
+        value: "shipments",
+        label: (
+          <Group gap={6} wrap="nowrap">
+            <PackageCheck size={15} />
+            <Box visibleFrom="sm">Shipments</Box>
+          </Group>
+        ),
+      });
+    }
     return opts;
   }, [canReview, canEt]);
 
+  // GENERAL-contract shipment bookings in per-booking clearance (ET queue).
+  const bookingRows = useMemo(() => {
+    const rows = (bookingQueue ?? []).map((b: BookingDetail) => ({
+      id: b.id,
+      reference: b.reference,
+      customerLabel: b.company?.name ?? b.governmentInstitution ?? "—",
+      originLabel: b.originYard?.name ?? "—",
+      destinationLabel: b.destinationYard?.name ?? "—",
+      tradeDirection: b.tradeDirection ?? "—",
+      freightType: b.freightType ?? "—",
+      status: b.status,
+    }));
+    const q = query.trim().toLowerCase();
+    if (!q) return rows;
+    return rows.filter(
+      (r) =>
+        r.reference.toLowerCase().includes(q) ||
+        r.customerLabel.toLowerCase().includes(q) ||
+        r.originLabel.toLowerCase().includes(q) ||
+        r.destinationLabel.toLowerCase().includes(q),
+    );
+  }, [bookingQueue, query]);
+
   const allRows = useMemo(
     () => (data?.items ?? []).map(toClearanceRow),
     [data?.items],
@@ -269,7 +323,7 @@ export default function ContractClearanceListPage() {
     );
   }, [allRows, query]);
 
-  const total = rows.length;
+  const total = queueTab === "shipments" ? bookingRows.length : rows.length;
   const pageCount = Math.max(1, Math.ceil(total / pagination.pageSize));
 
   const pagedRows = useMemo(() => {
@@ -410,16 +464,29 @@ export default function ContractClearanceListPage() {
             </Badge>
           }
           action={
-            <ActionIcon
-              variant="default"
-              size="lg"
-              radius="md"
-              onClick={() => refetch()}
-              loading={isFetching}
-              aria-label="Refresh"
-            >
-              <RefreshCw size={16} />
-            </ActionIcon>
+            <Group gap="sm" wrap="nowrap">
+              {canCreateBooking ? (
+                <Button
+                  variant="filled"
+                  color="edr-green"
+                  radius="md"
+                  leftSection={<Send size={15} />}
+                  onClick={() => navigate("/dashboard/shipment-requests")}
+                >
+                  Shipment requests
+                </Button>
+              ) : null}
+              <ActionIcon
+                variant="default"
+                size="lg"
+                radius="md"
+                onClick={() => refetch()}
+                loading={isFetching}
+                aria-label="Refresh"
+              >
+                <RefreshCw size={16} />
+              </ActionIcon>
+            </Group>
           }
         />
 
@@ -528,7 +595,14 @@ export default function ContractClearanceListPage() {
               </Group>
             </Box>
 
-            {view === "table" ? (
+            {queueTab === "shipments" ? (
+              <ShipmentBookingsTable
+                rows={bookingRows}
+                loading={bookingsLoading}
+                error={bookingsError}
+                onOpen={(id) => navigate(`/dashboard/clearance/${id}`)}
+              />
+            ) : view === "table" ? (
               <Box style={{ overflowX: "auto" }} px="xs" pb="xs">
                 <DataTable<ClearanceRow, unknown>
                   columns={columns}
@@ -567,6 +641,143 @@ export default function ContractClearanceListPage() {
   );
 }
 
+interface ShipmentBookingRow {
+  id: string;
+  reference: string;
+  customerLabel: string;
+  originLabel: string;
+  destinationLabel: string;
+  tradeDirection: string;
+  freightType: string;
+  status: string;
+}
+
+const prettyStatus = (s: string) =>
+  s
+    .toLowerCase()
+    .replace(/_/g, " ")
+    .replace(/^\w/, (c) => c.toUpperCase());
+
+const shipmentStatusColor = (s: string) => {
+  if (s === "AWAITING_DOCUMENTS") return "yellow";
+  if (s === "DOCUMENTS_UNDER_REVIEW") return "blue";
+  if (s === "CLEARANCE_READY") return "edr-green";
+  return "gray";
+};
+
+/** GENERAL-contract shipment bookings currently in per-booking clearance. */
+function ShipmentBookingsTable({
+  rows,
+  loading,
+  error,
+  onOpen,
+}: {
+  rows: ShipmentBookingRow[];
+  loading: boolean;
+  error: boolean;
+  onOpen: (id: string) => void;
+}) {
+  const columns = useMemo<ColumnDef<ShipmentBookingRow>[]>(
+    () => [
+      {
+        id: "booking",
+        header: () => <span className={bookingTable.headerCell}>Booking</span>,
+        cell: ({ row }) => (
+          <div className="flex items-center gap-3 py-1.5">
+            <div className={bookingTable.rowIcon}>
+              <PackageCheck className="size-4" strokeWidth={1.75} />
+            </div>
+            <div className="min-w-0">
+              <p className="truncate font-medium text-foreground">
+                {row.original.reference}
+              </p>
+              <p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
+                <User className="size-3 shrink-0 opacity-70" />
+                {row.original.customerLabel}
+              </p>
+            </div>
+          </div>
+        ),
+      },
+      {
+        id: "route",
+        header: () => <span className={bookingTable.headerCell}>Route</span>,
+        cell: ({ row }) => (
+          <Group gap={6} wrap="nowrap">
+            <Text size="sm" className="truncate">
+              {row.original.originLabel}
+            </Text>
+            <ArrowRight size={13} className="shrink-0 text-muted-foreground" />
+            <Text size="sm" className="truncate">
+              {row.original.destinationLabel}
+            </Text>
+          </Group>
+        ),
+      },
+      {
+        id: "kind",
+        header: () => <span className={bookingTable.headerCell}>Type</span>,
+        cell: ({ row }) => (
+          <Group gap={6} wrap="nowrap">
+            <Badge variant="light" color="gray" radius="sm">
+              {prettyStatus(row.original.tradeDirection)}
+            </Badge>
+            <Badge variant="outline" color="gray" radius="sm">
+              {prettyStatus(row.original.freightType)}
+            </Badge>
+          </Group>
+        ),
+      },
+      {
+        id: "status",
+        header: () => <span className={bookingTable.headerCell}>Status</span>,
+        cell: ({ row }) => (
+          <Badge
+            variant="light"
+            color={shipmentStatusColor(row.original.status)}
+            radius="sm"
+          >
+            {prettyStatus(row.original.status)}
+          </Badge>
+        ),
+      },
+      {
+        id: "chevron",
+        header: "",
+        cell: () => (
+          <Group justify="flex-end" pr="xs">
+            <ChevronRight size={16} className="text-muted-foreground" />
+          </Group>
+        ),
+      },
+    ],
+    [],
+  );
+
+  if (!loading && !error && rows.length === 0) {
+    return (
+      <Stack align="center" gap={8} py={48}>
+        <ThemeIcon variant="light" color="gray" radius="xl" size={48}>
+          <Inbox size={22} />
+        </ThemeIcon>
+        <Text c="dimmed">No shipment bookings in clearance.</Text>
+      </Stack>
+    );
+  }
+
+  return (
+    <Box style={{ overflowX: "auto" }} px="xs" pb="xs">
+      <DataTable<ShipmentBookingRow, unknown>
+        columns={columns}
+        data={rows}
+        status={loading ? "loading" : error ? "error" : "success"}
+        onRowClick={(row) => onOpen(row.id)}
+        containerClassName="border-0 shadow-none bg-transparent"
+      />
+    </Box>
+  );
+}
+
 function ClearanceCardGrid({
   rows,
   loading,
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
index c81f5b919..99f29b985 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
@@ -302,7 +302,7 @@ export default function ContractRequestDetailPage() {
 
   const customerLabel = contract.isGovernment
     ? (contract.governmentInstitution ?? "Government")
-    : (contract.companyId ?? "—");
+    : (contract.company?.name ?? "—");
 
   return (
     <PageContainer>
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx
index 70e9ac410..c4f87c3d6 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx
@@ -133,21 +133,21 @@ export default function ContractRequestsPage() {
   const columns: ColumnDef<ContractListRow>[] = [
     {
       id: "contract",
-      header: () => <span className={bookingTable.headerCell}>Contract</span>,
+      header: () => <span className={bookingTable.headerCell}>Customer</span>,
       cell: ({ row }) => {
         const c = row.original;
         return (
           <div className="flex items-center gap-3 py-1.5">
             <div className={bookingTable.rowIcon}>
-              <FileText className="size-4" strokeWidth={1.75} />
+              <User className="size-4" strokeWidth={1.75} />
             </div>
             <div className="min-w-0">
               <p className="truncate font-medium text-foreground">
-                {c.reference}
+                {c.customerLabel}
               </p>
               <p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
-                <User className="size-3 shrink-0 opacity-70" />
-                {c.customerLabel}
+                <FileText className="size-3 shrink-0 opacity-70" />
+                {c.reference}
               </p>
             </div>
           </div>
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx
index d5e3f3954..2f42866a9 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx
@@ -188,7 +188,12 @@ export default function GlClearanceDetailPage() {
             <Grid>
               <Grid.Col span={{ base: 12, lg: 7 }}>
                 {data.kind === "booking" ? (
-                  <ClearanceReviewSection bookingId={id!} hideSummary readOnly />
+                  <ClearanceReviewSection
+                    bookingId={id!}
+                    hideSummary
+                    readOnly
+                    phasedCustoms
+                  />
                 ) : (
                   <ContractClearanceReviewSection
                     contractId={id!}
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
index 0b7456851..afa15d8d1 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
@@ -1,65 +1,172 @@
+import { useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { Badge, Card, Group, Loader, Stack, Text } from "@mantine/core";
-import { ChevronRight, Ship } from "lucide-react";
+import {
+  Badge,
+  Box,
+  Card,
+  Group,
+  Loader,
+  SegmentedControl,
+  Stack,
+  Text,
+} from "@mantine/core";
+import { ChevronRight, FileSignature, PackageCheck, Ship } from "lucide-react";
 
 import { PageContainer } from "@/components/page/PageContainer";
 import { PageHeader } from "@/components/page/PageHeader";
 import { useDjClearanceQueue } from "@/hooks/contracts/useContracts";
+import { useBookingDjClearanceQueue } from "@/hooks/bookings/useBookings";
 
+type QueueTab = "contracts" | "shipments";
+
+const prettyStatus = (s?: string | null) =>
+  (s ?? "")
+    .toLowerCase()
+    .replace(/_/g, " ")
+    .replace(/^\w/, (c) => c.toUpperCase());
+
+/**
+ * GL Djibouti clearance queues:
+ * - Contracts: ONE_TIME customs contracts in phased clearance (legacy flow).
+ * - Shipments: GENERAL-contract bookings in per-booking clearance awaiting a DJ
+ *   action (DO collection after ET finalizes pre-clearance, RO for exports,
+ *   loading milestones). Managed like the one-time flow, but per booking.
+ */
 export default function GlDjiboutiClearanceListPage() {
   const navigate = useNavigate();
+  const [tab, setTab] = useState<QueueTab>("shipments");
   const { data: contractQueue, isLoading: contractsLoading } = useDjClearanceQueue();
+  const { data: bookingQueue, isLoading: bookingsLoading } =
+    useBookingDjClearanceQueue();
 
   const contractItems = contractQueue?.items ?? [];
+  const bookingItems = bookingQueue ?? [];
+  const isLoading = tab === "contracts" ? contractsLoading : bookingsLoading;
 
   return (
     <PageContainer>
-      <PageHeader
-        title="GL Djibouti — Clearance"
-        subtitle="Customs contracts handed off to Djibouti GL."
-      />
-      {contractsLoading ? (
-        <Group justify="center" py={60}>
-          <Loader color="edr-green" />
-        </Group>
-      ) : (
-        <Stack gap="sm">
-          {contractItems.length === 0 ? (
-            <Text c="dimmed" ta="center" py="xl">
-              No Djibouti customs contracts yet.
-            </Text>
-          ) : (
-            contractItems.map((c) => (
-              <Card
-                key={c.id}
-                withBorder
-                radius="md"
-                padding="md"
-                style={{ cursor: "pointer" }}
-                onClick={() => navigate(`/dashboard/gl-djibouti/clearance/${c.id}`)}
-              >
-                <Group justify="space-between" wrap="nowrap">
-                  <Group gap="sm">
-                    <Ship size={18} className="text-[color:var(--freight-brand)]" />
-                    <div>
-                      <Text fw={700}>{c.reference}</Text>
-                      <Text size="sm" c="dimmed">
-                        {c.tradeDirection} · {c.status}
-                      </Text>
-                    </div>
-                  </Group>
-                  <Group gap="xs">
-                    <Badge variant="light" color="edr-green">
-                      Contract
-                    </Badge>
-                    <ChevronRight size={18} className="text-muted-foreground" />
-                  </Group>
+      <Stack gap="lg">
+        <PageHeader
+          title="GL Djibouti — Clearance"
+          subtitle="Customs contracts and shipment bookings handed off to Djibouti GL."
+        />
+
+        <SegmentedControl
+          value={tab}
+          onChange={(v) => setTab(v as QueueTab)}
+          radius="md"
+          data={[
+            {
+              value: "shipments",
+              label: (
+                <Group gap={6} wrap="nowrap">
+                  <PackageCheck size={15} />
+                  <Box visibleFrom="sm">Shipments</Box>
+                  <Badge size="sm" radius="sm" variant="light" color="edr-green">
+                    {bookingItems.length}
+                  </Badge>
                 </Group>
-              </Card>
-            ))
-          )}
-        </Stack>
-      )}
+              ),
+            },
+            {
+              value: "contracts",
+              label: (
+                <Group gap={6} wrap="nowrap">
+                  <FileSignature size={15} />
+                  <Box visibleFrom="sm">Contracts</Box>
+                  <Badge size="sm" radius="sm" variant="light" color="gray">
+                    {contractItems.length}
+                  </Badge>
+                </Group>
+              ),
+            },
+          ]}
+        />
+
+        {isLoading ? (
+          <Group justify="center" py={60}>
+            <Loader color="edr-green" />
+          </Group>
+        ) : tab === "contracts" ? (
+          <Stack gap="sm">
+            {contractItems.length === 0 ? (
+              <Text c="dimmed" ta="center" py="xl">
+                No Djibouti customs contracts yet.
+              </Text>
+            ) : (
+              contractItems.map((c) => (
+                <Card
+                  key={c.id}
+                  withBorder
+                  radius="md"
+                  padding="md"
+                  style={{ cursor: "pointer" }}
+                  onClick={() => navigate(`/dashboard/gl-djibouti/clearance/${c.id}`)}
+                >
+                  <Group justify="space-between" wrap="nowrap">
+                    <Group gap="sm">
+                      <Ship size={18} className="text-[color:var(--freight-brand)]" />
+                      <div>
+                        <Text fw={700}>{c.reference}</Text>
+                        <Text size="sm" c="dimmed">
+                          {c.tradeDirection} · {prettyStatus(c.status)}
+                        </Text>
+                      </div>
+                    </Group>
+                    <Group gap="xs">
+                      <Badge variant="light" color="edr-green">
+                        Contract
+                      </Badge>
+                      <ChevronRight size={18} className="text-muted-foreground" />
+                    </Group>
+                  </Group>
+                </Card>
+              ))
+            )}
+          </Stack>
+        ) : (
+          <Stack gap="sm">
+            {bookingItems.length === 0 ? (
+              <Text c="dimmed" ta="center" py="xl">
+                No shipment bookings awaiting a Djibouti action.
+              </Text>
+            ) : (
+              bookingItems.map((b) => (
+                <Card
+                  key={b.id}
+                  withBorder
+                  radius="md"
+                  padding="md"
+                  style={{ cursor: "pointer" }}
+                  onClick={() => navigate(`/dashboard/gl-djibouti/clearance/${b.id}`)}
+                >
+                  <Group justify="space-between" wrap="nowrap">
+                    <Group gap="sm">
+                      <PackageCheck
+                        size={18}
+                        className="text-[color:var(--freight-brand)]"
+                      />
+                      <div>
+                        <Text fw={700}>{b.reference}</Text>
+                        <Text size="sm" c="dimmed">
+                          {b.tradeDirection} · {prettyStatus(b.status)}
+                          {b.company?.name ? ` · ${b.company.name}` : ""}
+                        </Text>
+                      </div>
+                    </Group>
+                    <Group gap="xs">
+                      <Badge variant="light" color="blue">
+                        Shipment
+                      </Badge>
+                      <ChevronRight size={18} className="text-muted-foreground" />
+                    </Group>
+                  </Group>
+                </Card>
+              ))
+            )}
+          </Stack>
+        )}
+      </Stack>
     </PageContainer>
   );
 }
diff --git a/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
index c68a4ca25..317f915fb 100644
--- a/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
@@ -43,6 +43,7 @@ import {
   ProfileChips,
   ProfileStatusBadge,
   ProfileTypeBadge,
+  ResetPasswordAction,
   TableCard,
   formatBytes,
   formatDate,
@@ -573,6 +574,7 @@ export default function CustomerDetailPage() {
             <ChangeRequestPendingBadge companyId={company.id} />
           </Group>
         }
+        action={<ResetPasswordAction company={company} />}
       />
 
       <Tabs defaultValue="overview">
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetCrudPages.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetCrudPages.tsx
index 2f8fa67fd..7ce03b96b 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetCrudPages.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetCrudPages.tsx
@@ -107,6 +107,10 @@ const normalizePayload = (values: Record<string, FormValue>) =>
       .filter(([, value]) => value !== '' && !(Array.isArray(value) && value.length === 0)),
   );
 
+/** Render a spec value inherited from the wagon type; em dash when the type isn't loaded. */
+const fmtTypeSpec = (value: number | undefined | null, unit: string) =>
+  value == null ? '—' : `${Number(value)} ${unit}`;
+
 const extractBackendErrors = (error: unknown) => {
   const responseData = (error as { response?: { data?: unknown } })?.response?.data;
   const data = responseData && typeof responseData === 'object' ? responseData as Record<string, unknown> : undefined;
@@ -922,7 +926,17 @@ export function WagonsCrudPage() {
               ? `${wagon.currentLocationYard.label ?? wagon.currentLocationYard.code} (${wagon.currentLocationYard.country ?? '-'})`
               : '-',
         },
-        { key: 'maxPayloadWeight', label: 'Max payload' },
+        {
+          // Read-only: the spec lives on the wagon type, so it is displayed, never edited here.
+          key: 'tareWeight',
+          label: 'Tare weight',
+          render: (wagon) => fmtTypeSpec(wagon.wagonType?.tareWeightTons, 't'),
+        },
+        {
+          key: 'maxPayloadWeight',
+          label: 'Max payload',
+          render: (wagon) => fmtTypeSpec(wagon.wagonType?.capacityTons, 't'),
+        },
         { key: 'status', label: 'Status', render: (wagon) => statusBadge(wagon.status) },
       ]}
       fields={[
@@ -933,11 +947,6 @@ export function WagonsCrudPage() {
           type: 'select',
           required: true,
           options: wagonTypeOptions,
-          onValueChange: (value, current) => {
-            const selectedType = wagonTypes.find((type: any) => type.id === value);
-            if (!selectedType || Number(current.maxPayloadWeight) > 0) return {};
-            return { maxPayloadWeight: Number(selectedType.capacityTons) };
-          },
         },
         {
           key: 'currentLocationYardId',
@@ -946,8 +955,6 @@ export function WagonsCrudPage() {
           required: true,
           options: yardOptions,
         },
-        { key: 'tareWeight', label: 'Tare weight', type: 'number', required: true },
-        { key: 'maxPayloadWeight', label: 'Max payload weight', type: 'number', required: true },
         {
           key: 'status',
           label: 'Status',
@@ -963,7 +970,7 @@ export function WagonsCrudPage() {
         },
         { key: 'notes', label: 'Notes' },
       ]}
-      emptyValues={{ wagonNumber: '', wagonTypeId: '', currentLocationYardId: '', tareWeight: 0, maxPayloadWeight: 0, status: 'AVAILABLE', notes: '' }}
+      emptyValues={{ wagonNumber: '', wagonTypeId: '', currentLocationYardId: '', status: 'AVAILABLE', notes: '' }}
     />
   );
 }
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts b/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts
index 9e6ef7169..091e056b7 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts
@@ -263,17 +263,16 @@ export const FLEET_RESOURCES: FleetResourceConfig[] = [
     cardSubtitleKey: "currentYard",
     searchKeys: ["wagonNumber", "wagonTypeId", "trainId", "status", "currentYardId"],
     columns: [
+      // Tare weight and payload capacity are not wagon columns — they belong to the
+      // wagon type and are shown through it (see WagonsCrudPage in FleetCrudPages).
       { id: "wagonNumber", header: "Number", accessorKey: "wagonNumber", format: "code" },
       { id: "wagonTypeId", header: "Type", accessorKey: "wagonTypeId", format: "entityLabel" },
-      { id: "maxPayloadWeight", header: "Max payload", accessorKey: "maxPayloadWeight", format: "number" },
       { id: "currentYard", header: "Current Yard", accessorKey: "currentYard", format: "entityLabel" },
       { id: "status", header: "Status", accessorKey: "status", format: "statusBadge" },
     ],
     formFields: [
       { name: "wagonNumber", label: "Wagon number", type: "text", required: true },
       { name: "wagonTypeId", label: "Wagon type", type: "select", required: true, dynamicOptions: "wagonTypes" },
-      { name: "tareWeight", label: "Tare weight", type: "number", required: true },
-      { name: "maxPayloadWeight", label: "Max payload weight", type: "number", required: true },
       { name: "currentYardId", label: "Current Yard", type: "select", dynamicOptions: "yards" },
       { name: "status", label: "Status", type: "select", required: true, options: WAGON_STATUS_OPTIONS },
       { name: "notes", label: "Notes", type: "textarea" },
@@ -281,8 +280,6 @@ export const FLEET_RESOURCES: FleetResourceConfig[] = [
     emptyValues: {
       wagonNumber: "",
       wagonTypeId: "",
-      tareWeight: 0,
-      maxPayloadWeight: 0,
       currentYardId: "",
       status: Freight.WagonStatus.Available,
       notes: "",
diff --git a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
index e6a21f918..b5eb71862 100644
--- a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
+++ b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
@@ -279,6 +279,7 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
       { id: "name", header: "Name", accessorKey: "name" },
       { id: "capacityTons", header: "Capacity (t)", accessorKey: "capacityTons", format: "number" },
       { id: "lengthMeters", header: "Length (m)", accessorKey: "lengthMeters", format: "number" },
+      { id: "tareWeightTons", header: "Tare (t)", accessorKey: "tareWeightTons", format: "number" },
       {
         id: "supportedLoadTypes",
         header: "Load types",
@@ -290,6 +291,15 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
       { name: "name", label: "Name", type: "text", required: true },
       { name: "capacityTons", label: "Capacity (tons)", type: "number", required: true },
       { name: "lengthMeters", label: "Length (meters)", type: "number", required: true },
+      // The locomotive's pull limit is a GROSS limit, so capacity planning charges
+      // `cargo + wagons × tare` against it. The API rejects a create without this.
+      {
+        name: "tareWeightTons",
+        label: "Tare weight (tons)",
+        type: "number",
+        required: true,
+        description: "Empty wagon weight — counts against the locomotive's pull limit alongside the cargo",
+      },
       {
         name: "supportedLoadTypes",
         label: "Supported load types",
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchBoardPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchBoardPage.tsx
index 1b7e490e7..9f3f862c4 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchBoardPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchBoardPage.tsx
@@ -1,8 +1,9 @@
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import {
   ActionIcon,
   Alert,
+  Badge,
   Box,
   Button,
   Card,
@@ -16,10 +17,15 @@ import {
   Stack,
   Text,
   ThemeIcon,
+  Tooltip,
 } from "@mantine/core";
+import { DateInput } from "@mantine/dates";
+import { useDebouncedValue } from "@mantine/hooks";
 import {
   AlertTriangle,
+  ArrowDownWideNarrow,
   ArrowRight,
+  ArrowUpNarrowWide,
   CalendarClock,
   CalendarDays,
   Eye,
@@ -47,9 +53,31 @@ import {
 import { RouteCorridor } from "@/components/trainScheduling/scheduleVisuals";
 import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
 import { FREIGHT_BRAND, FREIGHT_BRAND_DARK } from "@/theme/freight-brand";
-import { useQuery } from "@tanstack/react-query";
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import { api } from "@/services/api";
-import type { BatchBoardSchedule } from "@/types/trainScheduling";
+import type {
+  BatchBoardFilters,
+  BatchBoardSchedule,
+  BatchBoardSortField,
+  TrainScheduleStatus,
+} from "@/types/trainScheduling";
+
+const STATUS_BADGE: Record<string, { color: string; label: string }> = {
+  DRAFT: { color: "gray", label: "Draft" },
+  SCHEDULED: { color: "blue", label: "Scheduled" },
+  DISPATCHED: { color: "orange", label: "Dispatched" },
+  ARRIVED: { color: "green", label: "Arrived" },
+  CANCELLED: { color: "red", label: "Cancelled" },
+};
+
+function StatusBadge({ status }: { status: string }) {
+  const meta = STATUS_BADGE[status] ?? { color: "gray", label: status };
+  return (
+    <Badge variant="light" color={meta.color} radius="sm">
+      {meta.label}
+    </Badge>
+  );
+}
 
 const fmtTons = (n: number) =>
   `${n.toLocaleString(undefined, { maximumFractionDigits: 1 })} t`;
@@ -237,7 +265,8 @@ function ScheduleCard({ schedule }: { schedule: BatchBoardSchedule }) {
                 c="dimmed"
                 style={{ letterSpacing: 0.8 }}
               >
-                Freight schedule · {schedule.status}
+                {schedule.scheduleReference ?? "Freight schedule"} ·{" "}
+                {schedule.status}
               </Text>
             </Box>
           </Group>
@@ -395,15 +424,73 @@ function CardSkeleton() {
 
 export default function BatchBoardPage() {
   const navigate = useNavigate();
-  const { data, isLoading, isError, isFetching, refetch } = useQuery(
-    api.trainScheduling.batchBoard.queryOptions({ refetchInterval: 30_000 }),
-  );
   const { viewMode, setViewMode } = useFleetViewMode("batch-board");
-  const { pagination, setPagination } = usePagination({ pageSize: 10 });
+  const { pagination, setPagination } = usePagination({ pageSize: 12 });
   const [search, setSearch] = useState("");
+  const [debouncedSearch] = useDebouncedValue(search, 300);
+  const [statusFilter, setStatusFilter] = useState("ALL");
   const [windowFilter, setWindowFilter] = useState("ALL");
+  const [sortBy, setSortBy] = useState<BatchBoardSortField>("createdAt");
+  const [sortOrder, setSortOrder] = useState<"ASC" | "DESC">("DESC");
+  const [departureFrom, setDepartureFrom] = useState<Date | null>(null);
+  const [departureTo, setDepartureTo] = useState<Date | null>(null);
 
-  const schedules = data ?? [];
+  // Every knob maps straight onto the server-side batch-board query — the API
+  // filters, searches, sorts and paginates; this page just renders the page.
+  const filters = useMemo((): BatchBoardFilters => {
+    const endOfDay = (d: Date) =>
+      new Date(d.getFullYear(), d.getMonth(), d.getDate(), 23, 59, 59, 999);
+    return {
+      page: pagination.pageIndex + 1,
+      pageSize: pagination.pageSize,
+      search: debouncedSearch.trim() || undefined,
+      statuses:
+        statusFilter === "ALL"
+          ? undefined
+          : [statusFilter as TrainScheduleStatus],
+      bookingWindowStatus:
+        windowFilter === "ALL"
+          ? undefined
+          : (windowFilter as "OPEN" | "FULL" | "CLOSED"),
+      departureFrom: departureFrom ? departureFrom.toISOString() : undefined,
+      departureTo: departureTo ? endOfDay(departureTo).toISOString() : undefined,
+      sortBy,
+      sortOrder,
+    };
+  }, [
+    pagination,
+    debouncedSearch,
+    statusFilter,
+    windowFilter,
+    departureFrom,
+    departureTo,
+    sortBy,
+    sortOrder,
+  ]);
+
+  // Any filter change restarts from the first page.
+  useEffect(() => {
+    setPagination((p) => ({ ...p, pageIndex: 0 }));
+  }, [
+    debouncedSearch,
+    statusFilter,
+    windowFilter,
+    departureFrom,
+    departureTo,
+    sortBy,
+    sortOrder,
+    setPagination,
+  ]);
+
+  const { data, isLoading, isError, isFetching, refetch } = useQuery({
+    ...api.trainScheduling.batchBoard.queryOptions({ input: { filters } }),
+    refetchInterval: 30_000,
+    placeholderData: keepPreviousData,
+  });
+
+  const schedules = data?.items ?? [];
+  const total = data?.total ?? 0;
+  const pageCount = data?.totalPages ?? 1;
 
   const summary = useMemo(() => {
     const openWindows = schedules.filter((s) => s.bookingWindowStatus === "OPEN").length;
@@ -412,33 +499,6 @@ export default function BatchBoardPage() {
     return { openWindows, totalBookings, totalWagons };
   }, [schedules]);
 
-  const filtered = useMemo(() => {
-    const query = search.trim().toLowerCase();
-    return schedules.filter((s) => {
-      if (windowFilter !== "ALL" && s.bookingWindowStatus !== windowFilter) return false;
-      if (!query) return true;
-      const haystack = [
-        s.trainNumber,
-        s.routeName,
-        s.origin,
-        s.destination,
-        s.locomotive?.code,
-        s.status,
-        s.bookingWindowStatus,
-      ]
-        .filter(Boolean)
-        .join(" ")
-        .toLowerCase();
-      return haystack.includes(query);
-    });
-  }, [schedules, search, windowFilter]);
-
-  const pageCount = Math.max(1, Math.ceil(filtered.length / pagination.pageSize));
-  const paged = useMemo(() => {
-    const start = pagination.pageIndex * pagination.pageSize;
-    return filtered.slice(start, start + pagination.pageSize);
-  }, [filtered, pagination]);
-
   const columns = useMemo((): ColumnDef<BatchBoardSchedule>[] => {
     const headerClassName = ruleEngineTable.headerCell;
     const cellClassName = ruleEngineTable.bodyCell;
@@ -456,6 +516,11 @@ export default function BatchBoardPage() {
               <Text size="sm" fw={700} lh={1.2} truncate>
                 {row.original.trainNumber ?? row.original.routeName ?? "Schedule"}
               </Text>
+              {row.original.scheduleReference ? (
+                <Text size="10px" fw={600} c="dimmed" lh={1.2}>
+                  {row.original.scheduleReference}
+                </Text>
+              ) : null}
               <Box maw={220}>
                 <RouteCorridor
                   origin={row.original.origin}
@@ -502,6 +567,30 @@ export default function BatchBoardPage() {
           );
         },
       },
+      {
+        id: "status",
+        header: "Status",
+        meta: { headerClassName, cellClassName },
+        cell: ({ row }) => <StatusBadge status={row.original.status} />,
+      },
+      {
+        id: "created",
+        header: "Created",
+        meta: { headerClassName, cellClassName },
+        cell: ({ row }) => {
+          const { day, time } = splitDate(row.original.createdAt);
+          return (
+            <Stack gap={0}>
+              <Text size="sm" fw={600} lh={1.2}>
+                {day}
+              </Text>
+              <Text size="xs" c="dimmed" lh={1.2}>
+                {time || "—"}
+              </Text>
+            </Stack>
+          );
+        },
+      },
       {
         id: "window",
         header: "Window",
@@ -623,7 +712,7 @@ export default function BatchBoardPage() {
     <PageContainer>
       <PageHeader
         title="Batch Board"
-        subtitle="Active schedules and their booking windows."
+        subtitle="All import schedules — live and historical — with their booking windows."
         action={
           <Button variant="default" loading={isFetching} onClick={() => void refetch()}>
             Refresh
@@ -635,21 +724,21 @@ export default function BatchBoardPage() {
         loading={isLoading}
         items={[
           {
-            label: "Active schedules",
-            value: schedules.length,
-            hint: "on the board right now",
+            label: "Schedules",
+            value: total,
+            hint: "matching the current filters",
             icon: Train,
           },
           {
             label: "Open windows",
             value: summary.openWindows,
-            hint: "accepting bookings",
+            hint: "accepting bookings (this page)",
             icon: CalendarDays,
           },
           {
             label: "Bookings in play",
             value: summary.totalBookings,
-            hint: `${summary.totalWagons} wagons allocated`,
+            hint: `${summary.totalWagons} wagons allocated (this page)`,
             icon: Package,
           },
         ]}
@@ -661,24 +750,96 @@ export default function BatchBoardPage() {
             <FleetToolbar
               search={search}
               onSearchChange={setSearch}
-              searchPlaceholder="Search schedules…"
+              searchPlaceholder="Search train, route, station, loco…"
               viewMode={viewMode}
               onViewModeChange={setViewMode}
               filters={
-                <Select
-                  size="sm"
-                  radius="lg"
-                  value={windowFilter}
-                  onChange={(v) => v && setWindowFilter(v)}
-                  data={[
-                    { value: "ALL", label: "All windows" },
-                    { value: "OPEN", label: "Open" },
-                    { value: "FULL", label: "Full" },
-                    { value: "CLOSED", label: "Closed" },
-                  ]}
-                  w={150}
-                  styles={{ input: { borderColor: "var(--mantine-color-gray-3)" } }}
-                />
+                <Group gap="xs" wrap="wrap">
+                  <Select
+                    size="sm"
+                    radius="lg"
+                    value={statusFilter}
+                    onChange={(v) => v && setStatusFilter(v)}
+                    data={[
+                      { value: "ALL", label: "All statuses" },
+                      { value: "DRAFT", label: "Draft" },
+                      { value: "SCHEDULED", label: "Scheduled" },
+                      { value: "DISPATCHED", label: "Dispatched" },
+                      { value: "ARRIVED", label: "Arrived" },
+                      { value: "CANCELLED", label: "Cancelled" },
+                    ]}
+                    w={150}
+                    styles={{ input: { borderColor: "var(--mantine-color-gray-3)" } }}
+                  />
+                  <Select
+                    size="sm"
+                    radius="lg"
+                    value={windowFilter}
+                    onChange={(v) => v && setWindowFilter(v)}
+                    data={[
+                      { value: "ALL", label: "All windows" },
+                      { value: "OPEN", label: "Open" },
+                      { value: "FULL", label: "Full" },
+                      { value: "CLOSED", label: "Closed" },
+                    ]}
+                    w={140}
+                    styles={{ input: { borderColor: "var(--mantine-color-gray-3)" } }}
+                  />
+                  <DateInput
+                    size="sm"
+                    radius="lg"
+                    placeholder="Departs from"
+                    value={departureFrom}
+                    onChange={(v) => setDepartureFrom(v ? new Date(v) : null)}
+                    clearable
+                    w={140}
+                    styles={{ input: { borderColor: "var(--mantine-color-gray-3)" } }}
+                  />
+                  <DateInput
+                    size="sm"
+                    radius="lg"
+                    placeholder="Departs to"
+                    value={departureTo}
+                    onChange={(v) => setDepartureTo(v ? new Date(v) : null)}
+                    clearable
+                    w={140}
+                    styles={{ input: { borderColor: "var(--mantine-color-gray-3)" } }}
+                  />
+                  <Select
+                    size="sm"
+                    radius="lg"
+                    value={sortBy}
+                    onChange={(v) => v && setSortBy(v as BatchBoardSortField)}
+                    data={[
+                      { value: "createdAt", label: "Sort: Created" },
+                      { value: "scheduledDepartureDate", label: "Sort: Departure" },
+                      { value: "trainNumber", label: "Sort: Train no." },
+                      { value: "status", label: "Sort: Status" },
+                    ]}
+                    w={160}
+                    styles={{ input: { borderColor: "var(--mantine-color-gray-3)" } }}
+                  />
+                  <Tooltip
+                    label={sortOrder === "DESC" ? "Newest / Z–A first" : "Oldest / A–Z first"}
+                    withArrow
+                  >
+                    <ActionIcon
+                      variant="default"
+                      size={36}
+                      radius="lg"
+                      aria-label="Toggle sort direction"
+                      onClick={() =>
+                        setSortOrder((o) => (o === "DESC" ? "ASC" : "DESC"))
+                      }
+                    >
+                      {sortOrder === "DESC" ? (
+                        <ArrowDownWideNarrow size={16} />
+                      ) : (
+                        <ArrowUpNarrowWide size={16} />
+                      )}
+                    </ActionIcon>
+                  </Tooltip>
+                </Group>
               }
             />
           </Box>
@@ -686,7 +847,7 @@ export default function BatchBoardPage() {
           {viewMode === "table" ? (
             <DataTable
               columns={columns}
-              data={paged}
+              data={schedules}
               status={tableStatus}
               onRowClick={(schedule) =>
                 navigate(`/dashboard/operations/batch-board/${schedule.scheduleId}`)
@@ -699,12 +860,12 @@ export default function BatchBoardPage() {
                     }
                   : undefined
               }
-              emptyMessage="No active schedules"
+              emptyMessage="No schedules match the current filters"
               pagination={{
                 pageIndex: pagination.pageIndex,
                 pageSize: pagination.pageSize,
                 pageCount,
-                totalCount: filtered.length,
+                totalCount: total,
               }}
               tableOptions={{
                 manualPagination: true,
@@ -727,7 +888,7 @@ export default function BatchBoardPage() {
               <CardSkeleton />
               <CardSkeleton />
             </SimpleGrid>
-          ) : filtered.length === 0 ? (
+          ) : schedules.length === 0 ? (
             <Paper radius="lg" p={48} m="md" bg="gray.0">
               <Stack align="center" gap="sm">
                 <Box
@@ -745,20 +906,52 @@ export default function BatchBoardPage() {
                   <Inbox size={28} color="var(--mantine-color-gray-5)" />
                 </Box>
                 <Text fw={700} c="gray.7">
-                  No active schedules
+                  No schedules match the current filters
                 </Text>
                 <Text size="sm" c="dimmed" ta="center" maw={380}>
-                  Schedules with an open booking window appear here. Create or activate a
-                  schedule to get started.
+                  Every import schedule — live and historical — appears here. Loosen the
+                  filters or clear the search to see more.
                 </Text>
               </Stack>
             </Paper>
           ) : (
-            <SimpleGrid cols={{ base: 1, md: 2, lg: 3, xl: 4 }} spacing="lg" p="md">
-              {filtered.map((s) => (
-                <ScheduleCard key={s.scheduleId} schedule={s} />
-              ))}
-            </SimpleGrid>
+            <>
+              <SimpleGrid cols={{ base: 1, md: 2, lg: 3, xl: 4 }} spacing="lg" p="md">
+                {schedules.map((s) => (
+                  <ScheduleCard key={s.scheduleId} schedule={s} />
+                ))}
+              </SimpleGrid>
+              <Group justify="space-between" px="md" pb="md">
+                <Text size="sm" c="dimmed">
+                  {total} schedule{total === 1 ? "" : "s"}
+                </Text>
+                <Group gap="xs">
+                  <Button
+                    variant="default"
+                    size="xs"
+                    disabled={pagination.pageIndex === 0}
+                    onClick={() =>
+                      setPagination((p) => ({ ...p, pageIndex: p.pageIndex - 1 }))
+                    }
+                  >
+                    Previous
+                  </Button>
+                  <Text size="sm" c="dimmed">
+                    Page {pagination.pageIndex + 1} of {pageCount}
+                  </Text>
+                  <Button
+                    variant="default"
+                    size="xs"
+                    disabled={pagination.pageIndex + 1 >= pageCount}
+                    onClick={() =>
+                      setPagination((p) => ({ ...p, pageIndex: p.pageIndex + 1 }))
+                    }
+                  >
+                    Next
+                  </Button>
+                </Group>
+              </Group>
+            </>
           )}
         </Stack>
       </Card>
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx
index 3684dd1e7..114b2e742 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx
@@ -20,12 +20,12 @@ import {
   AlertTriangle,
   ArrowLeft,
   ArrowLeftRight,
-  Boxes,
   CalendarDays,
   CheckCircle2,
   ClipboardCheck,
   Clock,
   FileSignature,
+  Hash,
   Hourglass,
   Layers,
   Package,
@@ -622,6 +622,9 @@ export default function BatchScheduleDetailPage() {
     api.trainScheduling.scheduleDetail.queryOptions({
       input: { id: scheduleId ?? "", freightType: "CONTAINER" },
       enabled: Boolean(scheduleId),
+      // Composition data only changes through mutations, which invalidate the
+      // whole train-scheduling root — no need to refetch on remounts in between.
+      staleTime: 5 * 60_000,
     }),
   );
 
@@ -745,7 +748,13 @@ export default function BatchScheduleDetailPage() {
         items={[
           { label: "Operations" },
           { label: "Batch board", href: "/dashboard/operations/batch-board" },
-          { label: data.trainNumber ?? data.routeName ?? "Schedule" },
+          {
+            label:
+              data.scheduleReference ??
+              data.trainNumber ??
+              data.routeName ??
+              "Schedule",
+          },
         ]}
       />
 
@@ -792,6 +801,11 @@ export default function BatchScheduleDetailPage() {
                   <Title order={2} fw={800}>
                     {data.trainNumber ?? data.routeName ?? "Schedule"}
                   </Title>
+                  {data.scheduleReference ? (
+                    <HeroChip icon={<Hash size={12} />}>
+                      {data.scheduleReference}
+                    </HeroChip>
+                  ) : null}
                   <WindowStatusPill status={data.bookingWindowStatus} />
                   {data.windowPhase ? (
                     <WindowPhasePill
@@ -890,14 +904,6 @@ export default function BatchScheduleDetailPage() {
 
             <KpiStrip
               items={[
-                {
-                  label: "Allocated wagons",
-                  value: data.capacity.maxWagons
-                    ? `${data.capacity.allocatedWagons} / ${data.capacity.maxWagons}`
-                    : data.capacity.allocatedWagons,
-                  hint: "on this train",
-                  icon: Boxes,
-                },
                 {
                   label: "Train length",
                   value: data.capacity.maxLengthMeters
@@ -1111,7 +1117,7 @@ export default function BatchScheduleDetailPage() {
                 <TrainCompositionDiagram
                   locomotive={scheduleDetailQuery.data.trainSet?.locomotive}
                   wagons={scheduleDetailQuery.data.trainSet?.wagons ?? []}
-                  freightType="CONTAINER"
+                  freightType={scheduleDetailQuery.data.freightType ?? null}
                   trainNumber={scheduleDetailQuery.data.trainNumber}
                   totalLengthMeters={
                     scheduleDetailQuery.data.trainSet?.totalLengthMeters
@@ -1133,7 +1139,7 @@ export default function BatchScheduleDetailPage() {
                 <TrainConsistView
                   scheduleDetail={scheduleDetailQuery.data}
                   scheduleId={scheduleId ?? ""}
-                  maxWagons={53}
+                  maxWagons={data.capacity.maxWagons ?? 53}
                   highlightBookingId={selectedBookingId}
                 />
               </Box>
diff --git a/apps/edr-freight-web/backoffice/src/services/api.ts b/apps/edr-freight-web/backoffice/src/services/api.ts
index c04c67169..f5281c283 100644
--- a/apps/edr-freight-web/backoffice/src/services/api.ts
+++ b/apps/edr-freight-web/backoffice/src/services/api.ts
@@ -12,6 +12,8 @@ import type {
   CustomerPayment,
   PaginatedCompanies,
   ProfileStatus,
+  ResetChannel,
+  ResetPasswordResult,
 } from "@/types/customer";
 import {
   CreateDropdownOptionDto,
@@ -42,7 +44,8 @@ import {
 } from "@/types/rule-engine";
 import type {
   AssignBookingsPayload,
-  BatchBoardSchedule,
+  BatchBoardFilters,
+  BatchBoardListResponse,
   BatchBoardScheduleDetail,
   BookableSchedule,
   BookingWindow,
@@ -221,11 +224,14 @@ export const api = {
       () => QUERY_KEYS.TRAIN_SCHEDULING.schedules(),
     ),
 
-    batchBoard: endpoint<void, BatchBoardSchedule[]>(
+    batchBoard: endpoint<
+      { filters?: BatchBoardFilters },
+      BatchBoardListResponse
+    >(
       "train-scheduling",
       "batch-board",
-      () => trainSchedulingService.getBatchBoard(),
-      () => QUERY_KEYS.TRAIN_SCHEDULING.batchBoard(),
+      ({ filters }) => trainSchedulingService.getBatchBoard(filters),
+      ({ filters }) => QUERY_KEYS.TRAIN_SCHEDULING.batchBoard(filters),
     ),
 
     allBookingWindows: endpoint<void, StaffBookingWindow[]>(
@@ -2265,6 +2271,16 @@ export const api = {
       ({ id }) => QUERY_KEYS.CUSTOMERS.payments(id),
     ),
 
+    resetPassword: endpoint<
+      { companyId: string; channel: ResetChannel },
+      ResetPasswordResult
+    >(
+      "customers",
+      "resetPassword",
+      ({ companyId, channel }) =>
+        customersService.resetPassword(companyId, channel),
+    ),
+
     setProfileStatus: endpoint<
       { profileId: string; status: ProfileStatus; note?: string },
       CompanyProfile
diff --git a/apps/edr-freight-web/backoffice/src/services/bookings.service.ts b/apps/edr-freight-web/backoffice/src/services/bookings.service.ts
index 6a4c0cb1c..b97ac2bc3 100644
--- a/apps/edr-freight-web/backoffice/src/services/bookings.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/bookings.service.ts
@@ -21,6 +21,19 @@ export interface BookingListFilter {
   bookingType?: string;
   tradeDirection?: string;
   paymentCurrency?: string;
+  paymentStatus?: string;
+  /** ISO date-time — bookings created on/after. */
+  createdFrom?: string;
+  /** ISO date-time — bookings created on/before (pass end-of-day for inclusive). */
+  createdTo?: string;
+  /** ISO date-time — bookings scheduled on/after. */
+  scheduledFrom?: string;
+  /** ISO date-time — bookings scheduled on/before (pass end-of-day for inclusive). */
+  scheduledTo?: string;
+  originYardId?: string;
+  destinationYardId?: string;
+  /** "true" = government bookings only, "false" = private only. */
+  isGovernment?: "true" | "false";
   page?: number;
   pageSize?: number;
   sortBy?: string;
@@ -130,6 +143,14 @@ export const bookingsService = {
       if (filter.bookingType) params.bookingType = filter.bookingType;
       if (filter.tradeDirection) params.tradeDirection = filter.tradeDirection;
       if (filter.paymentCurrency) params.paymentCurrency = filter.paymentCurrency;
+      if (filter.paymentStatus) params.paymentStatus = filter.paymentStatus;
+      if (filter.createdFrom) params.createdFrom = filter.createdFrom;
+      if (filter.createdTo) params.createdTo = filter.createdTo;
+      if (filter.scheduledFrom) params.scheduledFrom = filter.scheduledFrom;
+      if (filter.scheduledTo) params.scheduledTo = filter.scheduledTo;
+      if (filter.originYardId) params.originYardId = filter.originYardId;
+      if (filter.destinationYardId) params.destinationYardId = filter.destinationYardId;
+      if (filter.isGovernment) params.isGovernment = filter.isGovernment;
     }
     const response = await client.get<BookingListSummary>(B.LIST_SUMMARY, {
       params,
@@ -154,6 +175,14 @@ export const bookingsService = {
       if (filter.bookingType) params.bookingType = filter.bookingType;
       if (filter.tradeDirection) params.tradeDirection = filter.tradeDirection;
       if (filter.paymentCurrency) params.paymentCurrency = filter.paymentCurrency;
+      if (filter.paymentStatus) params.paymentStatus = filter.paymentStatus;
+      if (filter.createdFrom) params.createdFrom = filter.createdFrom;
+      if (filter.createdTo) params.createdTo = filter.createdTo;
+      if (filter.scheduledFrom) params.scheduledFrom = filter.scheduledFrom;
+      if (filter.scheduledTo) params.scheduledTo = filter.scheduledTo;
+      if (filter.originYardId) params.originYardId = filter.originYardId;
+      if (filter.destinationYardId) params.destinationYardId = filter.destinationYardId;
+      if (filter.isGovernment) params.isGovernment = filter.isGovernment;
     }
     const response = await client.get<PaginatedBookings>(B.BASE, {
       params,
diff --git a/apps/edr-freight-web/backoffice/src/services/contract-templates.service.ts b/apps/edr-freight-web/backoffice/src/services/contract-templates.service.ts
new file mode 100644
index 000000000..75202507b
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/services/contract-templates.service.ts
@@ -0,0 +1,112 @@
+import { api as client } from "../auth/http";
+
+const BASE = "/contract-templates";
+
+export interface ContractTemplateArticle {
+  id: string;
+  title: string;
+  body: string;
+  order: number;
+}
+
+export interface ContractTemplate {
+  id: string;
+  code:
+    | "IMPORT_BULK"
+    | "EXPORT_BULK"
+    | "INTERCITY_BULK"
+    | "IMPORT_CONTAINER"
+    | "EXPORT_CONTAINER"
+    | "INTERCITY_CONTAINER";
+  name: string;
+  description?: string | null;
+  documentTitle: string;
+  whereasClauses: string[];
+  articles: ContractTemplateArticle[];
+  isActive: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface UpdateContractTemplatePayload {
+  name?: string;
+  description?: string;
+  documentTitle?: string;
+  whereasClauses?: string[];
+  isActive?: boolean;
+}
+
+export interface ArticlePayload {
+  title: string;
+  body: string;
+  position?: number;
+}
+
+export const contractTemplatesService = {
+  async list(): Promise<ContractTemplate[]> {
+    const { data } = await client.get<ContractTemplate[]>(BASE);
+    return data;
+  },
+
+  async getByCode(code: string): Promise<ContractTemplate> {
+    const { data } = await client.get<ContractTemplate>(`${BASE}/${code}`);
+    return data;
+  },
+
+  async update(
+    code: string,
+    payload: UpdateContractTemplatePayload,
+  ): Promise<ContractTemplate> {
+    const { data } = await client.patch<ContractTemplate>(
+      `${BASE}/${code}`,
+      payload,
+    );
+    return data;
+  },
+
+  async preview(code: string): Promise<{ html: string }> {
+    const { data } = await client.post<{ html: string }>(
+      `${BASE}/${code}/preview`,
+      {},
+    );
+    return data;
+  },
+
+  async addArticle(code: string, payload: ArticlePayload): Promise<ContractTemplate> {
+    const { data } = await client.post<ContractTemplate>(
+      `${BASE}/${code}/articles`,
+      payload,
+    );
+    return data;
+  },
+
+  async updateArticle(
+    code: string,
+    articleId: string,
+    payload: Partial<ArticlePayload>,
+  ): Promise<ContractTemplate> {
+    const { data } = await client.patch<ContractTemplate>(
+      `${BASE}/${code}/articles/${articleId}`,
+      payload,
+    );
+    return data;
+  },
+
+  async removeArticle(code: string, articleId: string): Promise<ContractTemplate> {
+    const { data } = await client.delete<ContractTemplate>(
+      `${BASE}/${code}/articles/${articleId}`,
+    );
+    return data;
+  },
+
+  async replaceArticles(
+    code: string,
+    articles: Array<{ id?: string; title: string; body: string }>,
+  ): Promise<ContractTemplate> {
+    const { data } = await client.put<ContractTemplate>(
+      `${BASE}/${code}/articles`,
+      { articles },
+    );
+    return data;
+  },
+};
diff --git a/apps/edr-freight-web/backoffice/src/services/contracts.service.ts b/apps/edr-freight-web/backoffice/src/services/contracts.service.ts
index c23b51df2..de16d9c54 100644
--- a/apps/edr-freight-web/backoffice/src/services/contracts.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/contracts.service.ts
@@ -482,10 +482,25 @@ export const contractsService = {
     postContract<Freight.IContract>(C.OPS_CLEARANCE_FINALIZE(id)),
 
   // ── Booking under contract (GL ET — Path B) ──
-  createBookingUnderContract: (
+  // The API returns { booking, warnings } (CreateBookingUnderContractResult) —
+  // unwrap to the booking itself so callers can use its id directly.
+  createBookingUnderContract: async (
     id: string,
     payload: Freight.CreateBookingUnderContractDto,
-  ) => postContract<{ id: string; reference: string }>(C.BOOKINGS(id), payload),
+  ): Promise<{ id: string; reference: string; warnings?: string[] }> => {
+    const result = await postContract<{
+      booking?: { id: string; reference: string };
+      id?: string;
+      reference?: string;
+      warnings?: string[];
+    }>(C.BOOKINGS(id), payload);
+    const booking = result.booking ?? result;
+    return {
+      id: booking.id ?? "",
+      reference: booking.reference ?? "",
+      warnings: result.warnings,
+    };
+  },
 
   /**
    * Pre-create validation + authoritative price preview: the same
diff --git a/apps/edr-freight-web/backoffice/src/services/customers.service.ts b/apps/edr-freight-web/backoffice/src/services/customers.service.ts
index cafe0aece..0476d41bb 100644
--- a/apps/edr-freight-web/backoffice/src/services/customers.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/customers.service.ts
@@ -11,6 +11,8 @@ import type {
   CustomerPayment,
   PaginatedCompanies,
   ProfileStatus,
+  ResetChannel,
+  ResetPasswordResult,
 } from "@/types/customer";
 
 const cleanParams = (params: object) =>
@@ -81,6 +83,22 @@ export const customersService = {
       .then((r) => r.data);
   },
 
+  /**
+   * Send a password-reset code to the company's primary contact. Staff never
+   * receive a credential — the customer sets their own password from the code.
+   */
+  resetPassword(
+    companyId: string,
+    channel: ResetChannel,
+  ): Promise<ResetPasswordResult> {
+    return apiClient
+      .post<ResetPasswordResult>(
+        URL_CONSTANTS.COMPANIES.RESET_PASSWORD(companyId),
+        { channel },
+      )
+      .then((r) => r.data);
+  },
+
   setProfileStatus(
     profileId: string,
     status: ProfileStatus,
diff --git a/apps/edr-freight-web/backoffice/src/services/routes.service.ts b/apps/edr-freight-web/backoffice/src/services/routes.service.ts
index 65de13760..9c59e31ad 100644
--- a/apps/edr-freight-web/backoffice/src/services/routes.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/routes.service.ts
@@ -39,11 +39,16 @@ export interface SaveRoutePayload {
   status?: RouteStatus;
 }
 
+/**
+ * Human-readable route label: yard names, not yard codes. Staff read
+ * "Addis Ababa → Dire Dawa", not "ADDIS_ABABA → DIRE_DAWA". Falls back to the
+ * code only when a yard has no label.
+ */
 export function formatRouteLabel(route: RouteRecord): string {
   const origin =
-    route.originYard?.code ?? route.originYard?.label ?? 'Origin';
+    route.originYard?.label ?? route.originYard?.code ?? 'Origin';
   const dest =
-    route.destinationYard?.code ?? route.destinationYard?.label ?? 'Destination';
+    route.destinationYard?.label ?? route.destinationYard?.code ?? 'Destination';
   return `${origin} → ${dest}`;
 }
 
diff --git a/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts b/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
index be05c6d8c..fb26b9605 100644
--- a/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
@@ -3,7 +3,8 @@ import { api as client } from "../auth/http";
 import { unwrap } from "@/utils/endpoint";
 import { URL_CONSTANTS } from "@/constants/URLS";
 import type {
-  BatchBoardSchedule,
+  BatchBoardFilters,
+  BatchBoardListResponse,
   BatchBoardScheduleDetail,
   BookableSchedule,
   BookingWindow,
@@ -100,9 +101,25 @@ export const trainSchedulingService = {
     return unwrap(response.data);
   },
 
-  getBatchBoard: async (): Promise<BatchBoardSchedule[]> => {
-    const response = await client.get<BatchBoardSchedule[]>(
+  getBatchBoard: async (
+    filters: BatchBoardFilters = {},
+  ): Promise<BatchBoardListResponse> => {
+    const params: Record<string, string | number> = {};
+    if (filters.page) params.page = filters.page;
+    if (filters.pageSize) params.pageSize = filters.pageSize;
+    if (filters.statuses?.length) params.statuses = filters.statuses.join(",");
+    if (filters.bookingWindowStatus)
+      params.bookingWindowStatus = filters.bookingWindowStatus;
+    if (filters.search?.trim()) params.search = filters.search.trim();
+    if (filters.departureFrom) params.departureFrom = filters.departureFrom;
+    if (filters.departureTo) params.departureTo = filters.departureTo;
+    if (filters.createdFrom) params.createdFrom = filters.createdFrom;
+    if (filters.createdTo) params.createdTo = filters.createdTo;
+    if (filters.sortBy) params.sortBy = filters.sortBy;
+    if (filters.sortOrder) params.sortOrder = filters.sortOrder;
+    const response = await client.get<BatchBoardListResponse>(
       URL_CONSTANTS.TRAIN_SCHEDULING.BATCH_BOARD,
+      { params },
     );
     return unwrap(response.data);
   },
diff --git a/apps/edr-freight-web/backoffice/src/services/wagon.service.ts b/apps/edr-freight-web/backoffice/src/services/wagon.service.ts
index a200195e0..e30320988 100644
--- a/apps/edr-freight-web/backoffice/src/services/wagon.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/wagon.service.ts
@@ -15,14 +15,16 @@ export interface Wagon {
     label: string;
     country?: string;
   } | null;
+  /** Owns this wagon's spec — tare, capacity, length are read from here, never off the wagon. */
   wagonType?: {
     id: string;
     code: string;
     name: string;
     supportedLoadTypes?: string[];
+    tareWeightTons?: number;
+    capacityTons?: number;
+    lengthMeters?: number;
   } | null;
-  tareWeight: number;
-  maxPayloadWeight: number;
   status: Freight.WagonStatus;
   currentYardId: string | null;
   currentYard?: { id: string; label?: string; code?: string } | null;
diff --git a/apps/edr-freight-web/backoffice/src/types/customer.ts b/apps/edr-freight-web/backoffice/src/types/customer.ts
index 8d76571d4..7328decf0 100644
--- a/apps/edr-freight-web/backoffice/src/types/customer.ts
+++ b/apps/edr-freight-web/backoffice/src/types/customer.ts
@@ -99,6 +99,15 @@ export interface CompanyChangeRequest {
   updatedAt: string;
 }
 
+/** The channel a customer's password-reset code is delivered over. */
+export type ResetChannel = "email" | "phone";
+
+export interface ResetPasswordResult {
+  channel: ResetChannel;
+  /** Where the code went, e.g. `+251•••4821` — safe to show to staff. */
+  maskedTarget: string;
+}
+
 /** Mirrors backend `Company` (+ its `companyProfiles`). */
 export interface Company {
   id: string;
diff --git a/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts b/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts
index c09c067d8..129171b7f 100644
--- a/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts
+++ b/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts
@@ -257,11 +257,14 @@ export interface StaffBookingWindow {
 
 export interface BatchBoardSchedule {
   scheduleId: string;
+  /** Human-facing schedule reference (S-YYYY-NNNNN). */
+  scheduleReference: string | null;
   trainNumber: string | null;
   routeName: string | null;
   origin: string | null;
   destination: string | null;
   scheduleDate: string | null;
+  createdAt: string | null;
   status: string;
   bookingWindowStatus: string;
   direction: string | null;
@@ -300,6 +303,37 @@ export interface BatchBoardSchedule {
   bookings: BatchBoardBooking[];
 }
 
+export type BatchBoardSortField =
+  | "createdAt"
+  | "scheduledDepartureDate"
+  | "trainNumber"
+  | "status";
+
+/** Server-side filters for the paginated batch board list. */
+export interface BatchBoardFilters {
+  page?: number;
+  pageSize?: number;
+  /** Subset of schedule statuses; omit for all (incl. arrived/cancelled). */
+  statuses?: TrainScheduleStatus[];
+  bookingWindowStatus?: "OPEN" | "FULL" | "CLOSED";
+  /** Matches train number, route yards, stations, locomotive code. */
+  search?: string;
+  departureFrom?: string;
+  departureTo?: string;
+  createdFrom?: string;
+  createdTo?: string;
+  sortBy?: BatchBoardSortField;
+  sortOrder?: "ASC" | "DESC";
+}
+
+export interface BatchBoardListResponse {
+  items: BatchBoardSchedule[];
+  total: number;
+  page: number;
+  pageSize: number;
+  totalPages: number;
+}
+
 export type BookingAllocationStatus =
   | "NOT_ATTEMPTED"
   | "ASSIGNED"
@@ -337,6 +371,8 @@ export interface BatchWindowGroup {
 
 export interface BatchBoardScheduleDetail {
   scheduleId: string;
+  /** Human-facing schedule reference (S-YYYY-NNNNN). */
+  scheduleReference: string | null;
   trainNumber: string | null;
   routeName: string | null;
   origin: string | null;
@@ -506,6 +542,8 @@ export interface TrainScheduleDetail {
       capacityTons: number;
       lengthMeters: number;
       assignedWeightTons: number;
+      /** Empty-wagon weight from the wagon type — gross = tare + cargo. */
+      tareWeightTons?: number | null;
       status?: string;
       physicalWagonId?: string | null;
       physicalWagonNumber?: string | null;
diff --git a/apps/edr-freight-web/backoffice/src/types/warehouse.ts b/apps/edr-freight-web/backoffice/src/types/warehouse.ts
index e16271880..8a806201e 100644
--- a/apps/edr-freight-web/backoffice/src/types/warehouse.ts
+++ b/apps/edr-freight-web/backoffice/src/types/warehouse.ts
@@ -86,8 +86,9 @@ export function getNextInventoryAction(item: WarehouseInventoryItem): InventoryA
       return 'store';
     case 'STORED':
       // Reserve is retired: a stored export item goes straight to loading prep
-      // once inspection passes. Import STORED is handled via the import queue.
-      if (isImport) return null;
+      // once inspection passes. An import item parked back into storage returns
+      // to pickup — otherwise Store would strand it with no action.
+      if (isImport) return inspected ? 'ready-for-pickup' : null;
       return inspected ? 'ready-for-loading' : null;
     case 'RESERVED':
       // Export loading is gated on a passed inspection.
@@ -367,6 +368,8 @@ export interface ReleaseOrderPayload {
   grossWeight?: number;
   netWeight?: number;
   gateOutTime?: string;
+  /** Container bookings only: operator chose not to weigh — tare/gross omitted, match skipped. */
+  weighingSkipped?: boolean;
 }
 
 /** Import branch: proof of delivery captured on customer pickup. */
diff --git a/apps/edr-freight-web/portal/package.json b/apps/edr-freight-web/portal/package.json
index 433b83c1a..2cfd488d6 100644
--- a/apps/edr-freight-web/portal/package.json
+++ b/apps/edr-freight-web/portal/package.json
@@ -36,6 +36,7 @@
     "recharts": "^3.8.1",
     "socket.io-client": "^4.8.3",
     "tailwind-merge": "^3.6.0",
+    "xlsx": "^0.18.5",
     "zod": "^4.4.3",
     "zustand": "^5.0.0"
   },
diff --git a/apps/edr-freight-web/portal/src/App.tsx b/apps/edr-freight-web/portal/src/App.tsx
index 697c2f89c..e4c5685fd 100644
--- a/apps/edr-freight-web/portal/src/App.tsx
+++ b/apps/edr-freight-web/portal/src/App.tsx
@@ -32,6 +32,7 @@ import EDRFreightLandingPage from "./pages/EDRFreightLandingPage";
 import MyPortalPage from "./pages/MyPortalPage";
 import MySignaturePage from "./pages/MySignaturePage";
 import SettingsPage from "./pages/SettingsPage";
+import ForgotPasswordPage from "./pages/accounts/ForgotPasswordPage";
 import LoginPage from "./pages/accounts/LoginPage";
 import SetPasswordPage from "./pages/accounts/SetPasswordPage";
 import SignupPage from "./pages/accounts/SignupPage";
@@ -252,6 +253,7 @@ const App = () => {
       <Route element={<RedirectIfAuthed />}>
         <Route path="/login" element={<LoginPage />} />
         <Route path="/signup" element={<SignupPage />} />
+        <Route path="/forgot-password" element={<ForgotPasswordPage />} />
       </Route>
 
       {/* Signup-flow pages; reached while a session already exists */}
diff --git a/apps/edr-freight-web/portal/src/components/auth/OtpChannelStep.tsx b/apps/edr-freight-web/portal/src/components/auth/OtpChannelStep.tsx
new file mode 100644
index 000000000..b61bb2eab
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/components/auth/OtpChannelStep.tsx
@@ -0,0 +1,179 @@
+import { Alert, Button, PinInput, SegmentedControl, Stack, Text } from "@mantine/core";
+import {
+  AlertCircle,
+  ArrowLeft,
+  Mail,
+  RotateCw,
+  ShieldCheck,
+  Smartphone,
+} from "lucide-react";
+
+import { maskEmail, maskPhone } from "@/utils/identifier";
+
+export type OtpChannel = "phone" | "email";
+
+export const OTP_LENGTH = 6;
+
+export interface OtpChannelSelectProps {
+  value: OtpChannel;
+  onChange: (channel: OtpChannel) => void;
+  disabled?: boolean;
+  label?: string;
+}
+
+/** Phone/email toggle deciding where the verification code is sent. */
+export function OtpChannelSelect({
+  value,
+  onChange,
+  disabled,
+  label = "Send verification code via",
+}: OtpChannelSelectProps) {
+  return (
+    <div className="space-y-1.5">
+      <Text size="sm" fw={500} c="edr-text">
+        {label}
+      </Text>
+      <SegmentedControl
+        fullWidth
+        disabled={disabled}
+        value={value}
+        onChange={(v) => onChange(v as OtpChannel)}
+        data={[
+          {
+            value: "phone",
+            label: (
+              <span className="flex items-center justify-center gap-1.5">
+                <Smartphone size={14} /> Phone
+              </span>
+            ),
+          },
+          {
+            value: "email",
+            label: (
+              <span className="flex items-center justify-center gap-1.5">
+                <Mail size={14} /> Email
+              </span>
+            ),
+          },
+        ]}
+      />
+    </div>
+  );
+}
+
+export interface OtpChannelStepProps {
+  channel: OtpChannel;
+  /** Raw email or phone the code went to; masked before display. */
+  target: string;
+  value: string;
+  onChange: (otp: string) => void;
+  onVerify: () => void;
+  onBack: () => void;
+  onResend: () => void;
+  /** Seconds until resend is allowed; 0 enables the button. */
+  resendIn: number;
+  sending: boolean;
+  verifying: boolean;
+  error: string | null;
+  title?: string;
+  description?: string;
+  submitLabel: string;
+}
+
+/**
+ * The "enter the code we sent you" stage. Shared by signup and the
+ * forgot-password flow — both send through the same `/api/otp/*` service.
+ */
+export default function OtpChannelStep({
+  channel,
+  target,
+  value,
+  onChange,
+  onVerify,
+  onBack,
+  onResend,
+  resendIn,
+  sending,
+  verifying,
+  error,
+  title,
+  description,
+  submitLabel,
+}: OtpChannelStepProps) {
+  const maskedTarget = channel === "email" ? maskEmail(target) : maskPhone(target);
+  const busy = sending || verifying;
+
+  return (
+    <Stack gap="md">
+      <div className="mb-1 flex justify-center">
+        <span className="flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 text-primary">
+          <ShieldCheck size={22} />
+        </span>
+      </div>
+
+      <div className="space-y-1.5 text-center">
+        <h1 className="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl">
+          {title ?? `Verify your ${channel === "email" ? "email" : "phone"}`}
+        </h1>
+        <p className="text-sm leading-relaxed text-gray-500">
+          We sent a {OTP_LENGTH}-digit code to{" "}
+          <span className="font-medium text-gray-700">{maskedTarget}</span>.{" "}
+          {description ?? "Enter it to continue."}
+        </p>
+      </div>
+
+      {error ? (
+        <Alert color="red" variant="light" icon={<AlertCircle size={18} />}>
+          {error}
+        </Alert>
+      ) : null}
+
+      <Stack gap={6} align="center">
+        <Text size="sm" fw={500} c="edr-text">
+          Verification code
+        </Text>
+        <PinInput
+          length={OTP_LENGTH}
+          type="number"
+          oneTimeCode
+          value={value}
+          placeholder="0"
+          disabled={verifying}
+          styles={{ input: { textAlign: "center" } }}
+          onChange={onChange}
+        />
+      </Stack>
+
+      <Button
+        color="edr-green"
+        fullWidth
+        loading={verifying}
+        disabled={verifying || value.trim().length !== OTP_LENGTH}
+        onClick={onVerify}
+      >
+        {submitLabel}
+      </Button>
+
+      <div className="flex items-center justify-between">
+        <Button
+          variant="subtle"
+          color="gray"
+          leftSection={<ArrowLeft size={14} />}
+          disabled={busy}
+          onClick={onBack}
+        >
+          Back
+        </Button>
+        <Button
+          variant="subtle"
+          color="edr-green"
+          leftSection={<RotateCw size={14} />}
+          disabled={resendIn > 0 || busy}
+          onClick={onResend}
+        >
+          {resendIn > 0 ? `Resend in ${resendIn}s` : "Resend code"}
+        </Button>
+      </div>
+    </Stack>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/components/auth/PasswordChecklist.tsx b/apps/edr-freight-web/portal/src/components/auth/PasswordChecklist.tsx
new file mode 100644
index 000000000..89cea7a0e
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/components/auth/PasswordChecklist.tsx
@@ -0,0 +1,41 @@
+import { Check, X } from "lucide-react";
+
+import { passwordRequirements } from "@/utils/passwordSchema";
+
+export interface PasswordChecklistProps {
+  /** The current password value; the checklist hides itself when empty. */
+  value: string;
+}
+
+/** Live pass/fail list of the password rules, shown under a password field. */
+export default function PasswordChecklist({ value }: PasswordChecklistProps) {
+  if (!value) return null;
+
+  return (
+    <div className="mt-2 space-y-1">
+      {passwordRequirements.map((req) => {
+        const met = req.test(value);
+        return (
+          <div key={req.label} className="flex items-center gap-2">
+            <span
+              className={`flex h-4 w-4 shrink-0 items-center justify-center rounded-full ${
+                met
+                  ? "bg-primary text-primary-foreground"
+                  : "bg-gray-200 text-gray-500"
+              }`}
+            >
+              {met ? (
+                <Check className="h-2.5 w-2.5" />
+              ) : (
+                <X className="h-2.5 w-2.5" />
+              )}
+            </span>
+            <span className={`text-xs ${met ? "text-primary" : "text-gray-500"}`}>
+              {req.label}
+            </span>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/components/customer-actions/ContractClearanceAction.tsx b/apps/edr-freight-web/portal/src/components/customer-actions/ContractClearanceAction.tsx
index 4aa131c23..fbb8f97c2 100644
--- a/apps/edr-freight-web/portal/src/components/customer-actions/ContractClearanceAction.tsx
+++ b/apps/edr-freight-web/portal/src/components/customer-actions/ContractClearanceAction.tsx
@@ -83,7 +83,7 @@ export function ContractClearanceAction({
         centered
         overlayProps={{ blur: 2, backgroundOpacity: 0.55 }}
       >
-        <ContractClearancePanel contractId={contractId} bare />
+        <ContractClearancePanel contractId={contractId} bare onSubmitted={close} />
       </Modal>
     </ModalSafeWrapper>
   );
diff --git a/apps/edr-freight-web/portal/src/components/onboarding/OnboardingWizardDialog.tsx b/apps/edr-freight-web/portal/src/components/onboarding/OnboardingWizardDialog.tsx
index ab00965fa..849ba50c5 100644
--- a/apps/edr-freight-web/portal/src/components/onboarding/OnboardingWizardDialog.tsx
+++ b/apps/edr-freight-web/portal/src/components/onboarding/OnboardingWizardDialog.tsx
@@ -286,9 +286,13 @@ export default function OnboardingWizardDialog({
     });
   }, [roles, nationality, startMutation]);
 
-  // Note: no "back to role selection" — once the draft is created the role(s)
-  // are fixed; the form's first-step Back is a no-op so progress never resets.
-  const handleBackToRoles = useCallback(() => { }, []);
+  // Back from the form's first step returns to nationality/role selection.
+  // Safe to re-enter: startOnboarding is idempotent — it reuses the existing
+  // draft, refreshes the nationality and creates only roles that don't exist yet.
+  const handleBackToRoles = useCallback(() => {
+    setStartError(null);
+    setPhase("nationality-role");
+  }, []);
 
   // Save the current step's fields to the draft (PATCH /profile). Returns the
   // server error message on failure so the form can show it (e.g. duplicate TIN).
@@ -359,7 +363,6 @@ export default function OnboardingWizardDialog({
   // The active step across the whole journey, driving the header + progress pill.
   const activeStep: WizardStep = phase === "form" ? formStep : phase;
   const stepMeta = STEP_META[activeStep];
-  console.log({ stepMeta, activeStep, STEP_META });
   const activeIdx = WIZARD_STEPS.indexOf(activeStep);
 
   // Closing from the congratulations panel also clears the completed flag so a
@@ -403,7 +406,6 @@ export default function OnboardingWizardDialog({
     onSubmit: handleSubmit,
     isPending: finishMutation.isPending,
     onBack: handleBackToRoles,
-    hideFirstStepBack: true,
     initialStep: effectiveResumeStep,
     resyncOpen: opened,
     onStepChange: handleStepChange,
diff --git a/apps/edr-freight-web/portal/src/constants/URLS.ts b/apps/edr-freight-web/portal/src/constants/URLS.ts
index 89a3d57e7..5dfda7e58 100644
--- a/apps/edr-freight-web/portal/src/constants/URLS.ts
+++ b/apps/edr-freight-web/portal/src/constants/URLS.ts
@@ -5,6 +5,8 @@ export const URL_CONSTANTS = {
     REFRESH_TOKEN: "/api/auth/refresh-token",
     LOGOUT: "/api/auth/logout",
     PROFILE: "/auth/profile",
+    FORGOT_PASSWORD_REQUEST: "/api/auth/forgot-password/request",
+    FORGOT_PASSWORD_VERIFY: "/api/auth/forgot-password/verify",
   },
 
   USERS: {
diff --git a/apps/edr-freight-web/portal/src/hooks/useResendCooldown.ts b/apps/edr-freight-web/portal/src/hooks/useResendCooldown.ts
new file mode 100644
index 000000000..deeca8125
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/hooks/useResendCooldown.ts
@@ -0,0 +1,24 @@
+import { useEffect, useState } from "react";
+
+/** Seconds a user must wait before another OTP can be requested. */
+const DEFAULT_COOLDOWN_SECONDS = 60;
+
+/**
+ * Countdown that gates the "Resend code" button. Ticks with setTimeout rather
+ * than wall-clock arithmetic, so it needs no Date.now().
+ */
+export function useResendCooldown(seconds: number = DEFAULT_COOLDOWN_SECONDS) {
+  const [secondsLeft, setSecondsLeft] = useState(0);
+
+  useEffect(() => {
+    if (secondsLeft <= 0) return;
+    const t = setTimeout(() => setSecondsLeft((s) => s - 1), 1000);
+    return () => clearTimeout(t);
+  }, [secondsLeft]);
+
+  return {
+    secondsLeft,
+    start: () => setSecondsLeft(seconds),
+    reset: () => setSecondsLeft(0),
+  };
+}
diff --git a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/BookingRow.tsx b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/BookingRow.tsx
index b3acc1667..007fc7fe9 100644
--- a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/BookingRow.tsx
+++ b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/BookingRow.tsx
@@ -36,7 +36,9 @@ export const BookingRow = memo(function BookingRow({
   // Contract ready for signature → "View & sign" jumps straight to the
   // full-page contract viewer where the signature flow lives.
   const canSign = bookingIsSignable(booking);
-  const canApproveDelivery = booking.status === "COMPLETED";
+  // Visible from handover generation until the customer signs (flag is attached
+  // by the bookings list endpoint; false again the moment it's signed).
+  const canApproveDelivery = Boolean(booking.handoverAwaitingSignature);
   const origin = booking.originYard?.label ?? booking.originYard?.code ?? "—";
   const dest =
     booking.destinationYard?.label ?? booking.destinationYard?.code ?? "—";
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx b/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx
index cc9f81a29..abfb61551 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx
@@ -51,7 +51,6 @@ export default function CompanyProfileForm({
   onBack,
   initialStep,
   resyncOpen,
-  hideFirstStepBack,
   onStepChange,
   onSaveStep,
   rehydrate,
@@ -73,8 +72,6 @@ export default function CompanyProfileForm({
   initialStep?: CompanyStep;
   /** When this flips true (dialog reopened), jump back to initialStep (furthest reached). */
   resyncOpen?: boolean;
-  /** Hide the Back button on the first step (onboarding can't go back to role pick). */
-  hideFirstStepBack?: boolean;
   /** Reports the active step so the parent can persist resume progress. */
   onStepChange?: (step: CompanyStep) => void;
   /** Persist the current step's data before advancing; returns an error to show. */
@@ -514,10 +511,6 @@ export default function CompanyProfileForm({
     else setStep(stepOrder[currentIdx - 1]);
   };
 
-  // Back is hidden on the first step during onboarding (can't return to role
-  // selection); otherwise always available.
-  const showBack = !(hideFirstStepBack && step === "company");
-
   return (
     <>
       <form onSubmit={(e) => e.preventDefault()}>
@@ -851,17 +844,13 @@ export default function CompanyProfileForm({
           )}
 
           <Group justify="space-between" pt="xs">
-            {showBack ? (
-              <Button
-                variant="default"
-                onClick={prevStep}
-                leftSection={<ArrowLeft size={16} />}
-              >
-                Back
-              </Button>
-            ) : (
-              <span />
-            )}
+            <Button
+              variant="default"
+              onClick={prevStep}
+              leftSection={<ArrowLeft size={16} />}
+            >
+              Back
+            </Button>
             <Button
               color="edr-green"
               onClick={nextStep}
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/ForgotPasswordPage.tsx b/apps/edr-freight-web/portal/src/pages/accounts/ForgotPasswordPage.tsx
new file mode 100644
index 000000000..58cfeab43
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/accounts/ForgotPasswordPage.tsx
@@ -0,0 +1,312 @@
+import { type FormEvent, useState } from "react";
+import { Alert, Button, PasswordInput, Stack, TextInput } from "@mantine/core";
+import { AlertCircle, ArrowLeft, ArrowRight, KeyRound } from "lucide-react";
+import { Link, useNavigate } from "react-router-dom";
+
+import { useResendCooldown } from "@/hooks/useResendCooldown";
+import AuthShell from "@/components/auth/AuthShell";
+import OtpChannelStep, {
+  OTP_LENGTH,
+  OtpChannelSelect,
+  type OtpChannel,
+} from "@/components/auth/OtpChannelStep";
+import PasswordChecklist from "@/components/auth/PasswordChecklist";
+import { api } from "@/services/api";
+import type { ResetTicket } from "@/types/auth";
+import { normaliseIdentifier } from "@/utils/identifier";
+import { meetsAllRequirements } from "@/utils/passwordSchema";
+import { extractApiError } from "@/utils/result";
+
+type Stage = "identify" | "otp" | "password";
+
+export default function ForgotPasswordPage() {
+  const navigate = useNavigate();
+
+  const [stage, setStage] = useState<Stage>("identify");
+  const [identifier, setIdentifier] = useState("");
+  const [channel, setChannel] = useState<OtpChannel>("phone");
+  const [otpCode, setOtpCode] = useState("");
+  // The reset ticket lives in memory only — persisting it would leave a
+  // password-change credential sitting in localStorage.
+  const [ticket, setTicket] = useState<ResetTicket | null>(null);
+  const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
+
+  const [sending, setSending] = useState(false);
+  const [verifying, setVerifying] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const resendCooldown = useResendCooldown();
+
+  /** The identifier as the API will see it — normalised once, reused everywhere. */
+  const normalised = normaliseIdentifier(identifier);
+
+  const sendCode = async () => {
+    await api.auth.requestPasswordReset.call({ identifier: normalised, channel });
+    setOtpCode("");
+    resendCooldown.start();
+  };
+
+  // Stage 1 — ask for a code. The API answers identically for unknown accounts,
+  // so we always advance; a non-existent identifier simply never receives a code.
+  const handleIdentify = async (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setError(null);
+    setSending(true);
+    try {
+      await sendCode();
+      setStage("otp");
+    } catch (err) {
+      setError(extractApiError(err).message);
+    } finally {
+      setSending(false);
+    }
+  };
+
+  const handleResend = async () => {
+    setError(null);
+    setSending(true);
+    try {
+      await sendCode();
+    } catch (err) {
+      setError(extractApiError(err).message);
+    } finally {
+      setSending(false);
+    }
+  };
+
+  // Stage 2 — trade the code for a single-use ticket.
+  const handleVerify = async () => {
+    setError(null);
+    if (otpCode.trim().length !== OTP_LENGTH) {
+      setError(`Enter the ${OTP_LENGTH}-digit code we sent you.`);
+      return;
+    }
+    setVerifying(true);
+    try {
+      const result = await api.auth.verifyPasswordResetOtp.call({
+        identifier: normalised,
+        channel,
+        otp: otpCode.trim(),
+      });
+      setTicket(result);
+      setStage("password");
+    } catch (err) {
+      setError(extractApiError(err).message);
+    } finally {
+      setVerifying(false);
+    }
+  };
+
+  // Stage 3 — spend the ticket on IAM's set-password.
+  const handleReset = async (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setError(null);
+
+    if (!ticket) {
+      setError("Your reset session expired. Start again.");
+      setStage("identify");
+      return;
+    }
+    if (password !== confirmPassword) {
+      setError("Passwords do not match.");
+      return;
+    }
+
+    setVerifying(true);
+    try {
+      await api.auth.resetPassword.call({
+        userId: ticket.userId,
+        // The API matches this against email / username / phone, so the typed
+        // identifier works regardless of which one it is.
+        email: normalised,
+        verificationCode: ticket.verificationCode,
+        newPassword: password,
+        confirmPassword,
+      });
+      navigate("/login", {
+        replace: true,
+        state: { passwordReset: true },
+      });
+    } catch (err) {
+      setError(extractApiError(err).message);
+    } finally {
+      setVerifying(false);
+    }
+  };
+
+  const identifierLabel =
+    channel === "email" ? "the email on your account" : "the phone on your account";
+
+  return (
+    <AuthShell
+      tagline="Recover your account"
+      taglineBody="Reset your EDR Freight password with a one-time code sent to your email or phone."
+    >
+      <div className="flex w-full flex-col">
+        {stage === "identify" ? (
+          <form onSubmit={handleIdentify} className="flex w-full flex-col">
+            <div className="mb-1 flex justify-center">
+              <span className="flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 text-primary">
+                <KeyRound size={22} />
+              </span>
+            </div>
+
+            <div className="mb-4 mt-3 space-y-1.5 text-center sm:mb-5">
+              <h1 className="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl">
+                Forgot your password?
+              </h1>
+              <p className="text-sm leading-relaxed text-gray-500">
+                Enter your email or phone number and we&apos;ll send you a code to
+                reset it.
+              </p>
+            </div>
+
+            <Stack gap="md">
+              <TextInput
+                label="Email or Phone"
+                placeholder="name@company.com or 09XXXXXXXX"
+                autoComplete="username"
+                required
+                disabled={sending}
+                value={identifier}
+                onChange={(event) => setIdentifier(event.target.value)}
+              />
+
+              <OtpChannelSelect
+                value={channel}
+                onChange={setChannel}
+                disabled={sending}
+                label="Send the code to"
+              />
+
+              <p className="text-xs text-gray-500">
+                The code goes to {identifierLabel}, which may differ from what you
+                typed above.
+              </p>
+
+              {error ? (
+                <Alert color="red" variant="light" icon={<AlertCircle size={18} />}>
+                  {error}
+                </Alert>
+              ) : null}
+
+              <Button
+                type="submit"
+                color="edr-green"
+                fullWidth
+                loading={sending}
+                disabled={!identifier.trim()}
+                rightSection={!sending ? <ArrowRight size={16} /> : undefined}
+              >
+                Send code
+              </Button>
+
+              <p className="text-center text-sm text-gray-500">
+                Remembered it?{" "}
+                <Link to="/login" className="font-semibold text-primary hover:underline">
+                  Back to sign in
+                </Link>
+              </p>
+            </Stack>
+          </form>
+        ) : null}
+
+        {stage === "otp" ? (
+          <OtpChannelStep
+            channel={channel}
+            target={normalised}
+            value={otpCode}
+            onChange={setOtpCode}
+            onVerify={handleVerify}
+            onBack={() => {
+              setStage("identify");
+              setError(null);
+            }}
+            onResend={handleResend}
+            resendIn={resendCooldown.secondsLeft}
+            sending={sending}
+            verifying={verifying}
+            error={error}
+            title="Enter your reset code"
+            description="Enter it to choose a new password."
+            submitLabel="Verify code"
+          />
+        ) : null}
+
+        {stage === "password" ? (
+          <form onSubmit={handleReset} className="flex w-full flex-col">
+            <div className="mb-4 space-y-1.5 text-center sm:mb-5">
+              <h1 className="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl">
+                Choose a new password
+              </h1>
+              <p className="text-sm leading-relaxed text-gray-500">
+                Pick something strong you haven&apos;t used before.
+              </p>
+            </div>
+
+            <Stack gap="md">
+              <div>
+                <PasswordInput
+                  label="New password"
+                  placeholder="Create a strong password"
+                  required
+                  disabled={verifying}
+                  value={password}
+                  onChange={(event) => setPassword(event.target.value)}
+                />
+                <PasswordChecklist value={password} />
+              </div>
+
+              <PasswordInput
+                label="Confirm new password"
+                placeholder="Re-enter your password"
+                required
+                disabled={verifying}
+                error={
+                  confirmPassword && confirmPassword !== password
+                    ? "Passwords do not match"
+                    : undefined
+                }
+                value={confirmPassword}
+                onChange={(event) => setConfirmPassword(event.target.value)}
+              />
+
+              {error ? (
+                <Alert color="red" variant="light" icon={<AlertCircle size={18} />}>
+                  {error}
+                </Alert>
+              ) : null}
+
+              <Button
+                type="submit"
+                color="edr-green"
+                fullWidth
+                loading={verifying}
+                disabled={
+                  verifying ||
+                  !meetsAllRequirements(password) ||
+                  password !== confirmPassword
+                }
+              >
+                Reset password
+              </Button>
+
+              <Button
+                variant="subtle"
+                color="gray"
+                leftSection={<ArrowLeft size={14} />}
+                disabled={verifying}
+                onClick={() => {
+                  setStage("otp");
+                  setError(null);
+                }}
+              >
+                Back
+              </Button>
+            </Stack>
+          </form>
+        ) : null}
+      </div>
+    </AuthShell>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/LoginPage.tsx b/apps/edr-freight-web/portal/src/pages/accounts/LoginPage.tsx
index 885888a05..7e8e512dd 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/LoginPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/LoginPage.tsx
@@ -5,21 +5,11 @@ import { Link, useLocation, useNavigate } from "react-router-dom";
 
 import useAuth from "@/hooks/useAuth";
 import AuthShell from "@/components/auth/AuthShell";
+import { normaliseIdentifier } from "@/utils/identifier";
 import { extractApiError } from "@/utils/result";
 
 const EDR_LOGO = "/assets/edr-logo.png";
 
-/** Normalise Ethiopian local phone (09…/07…) to E.164; pass email through unchanged. */
-function normaliseIdentifier(raw: string): string {
-  const v = raw.trim();
-  const digits = v.replace(/\D/g, "");
-  if (digits.length >= 9 && (v.startsWith("0") || v.startsWith("+251"))) {
-    const local = digits.startsWith("251") ? digits.slice(3) : digits.replace(/^0/, "");
-    return `+251${local}`;
-  }
-  return v.toLowerCase();
-}
-
 export default function LoginPage() {
   const navigate = useNavigate();
   const location = useLocation();
@@ -80,7 +70,7 @@ export default function LoginPage() {
             <div className="mb-1.5 flex items-center justify-between">
               <span className="text-sm font-medium text-gray-800">Password</span>
               <Link
-                to="#"
+                to="/forgot-password"
                 className="text-xs font-semibold text-primary hover:underline"
               >
                 Forgot password?
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/SetPasswordPage.tsx b/apps/edr-freight-web/portal/src/pages/accounts/SetPasswordPage.tsx
index 87702bdd8..04625f2cd 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/SetPasswordPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/SetPasswordPage.tsx
@@ -1,4 +1,13 @@
-import { Alert, Box, Button, Group, PasswordInput, Stack, Text, ThemeIcon } from "@mantine/core";
+import {
+  Alert,
+  Box,
+  Button,
+  Group,
+  PasswordInput,
+  Stack,
+  Text,
+  ThemeIcon,
+} from "@mantine/core";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ArrowRight, Check, LockKeyhole, X } from "lucide-react";
 import { useMemo, useState } from "react";
@@ -8,27 +17,19 @@ import { z } from "zod";
 
 import useAuth from "@/hooks/useAuth";
 import AuthLayout from "@/components/auth/AuthLayout";
-
-const passwordRequirements = [
-  { label: "At least 8 characters", test: (v: string) => v.length >= 8 },
-  { label: "One uppercase letter", test: (v: string) => /[A-Z]/.test(v) },
-  { label: "One lowercase letter", test: (v: string) => /[a-z]/.test(v) },
-  { label: "One number", test: (v: string) => /\d/.test(v) },
-  { label: "One special character", test: (v: string) => /[^A-Za-z0-9]/.test(v) },
-] as const;
+import {
+  confirmPasswordField,
+  passwordField,
+  passwordRequirements,
+  samePassword,
+} from "@/utils/passwordSchema";
 
 const passwordSchema = z
   .object({
-    password: z
-      .string()
-      .min(8, "Password must be at least 8 characters")
-      .regex(/[A-Z]/, "Password must include an uppercase letter")
-      .regex(/[a-z]/, "Password must include a lowercase letter")
-      .regex(/\d/, "Password must include a number")
-      .regex(/[^A-Za-z0-9]/, "Password must include a special character"),
-    confirmPassword: z.string().min(1, "Please confirm your password"),
+    password: passwordField,
+    confirmPassword: confirmPasswordField,
   })
-  .refine((data) => data.password === data.confirmPassword, {
+  .refine(samePassword, {
     message: "Passwords do not match",
     path: ["confirmPassword"],
   });
@@ -54,7 +55,8 @@ export default function SetPasswordPage() {
   const password = watch("password");
 
   const requirements = useMemo(
-    () => passwordRequirements.map((r) => ({ ...r, met: r.test(password || "") })),
+    () =>
+      passwordRequirements.map((r) => ({ ...r, met: r.test(password || "") })),
     [password],
   );
 
@@ -93,11 +95,21 @@ export default function SetPasswordPage() {
           "Secure freight operations",
           "Advanced authentication system",
         ],
-        stats: { label: "Security Protection", value: "256-bit", footer: "Encrypted", progress: "w-[98%]" },
+        stats: {
+          label: "Security Protection",
+          value: "256-bit",
+          footer: "Encrypted",
+          progress: "w-[98%]",
+        },
       }}
     >
       <Stack gap="xs" mb="lg">
-        <Box w={48} h={48} bg="edr-soft" className="flex items-center justify-center rounded-2xl">
+        <Box
+          w={48}
+          h={48}
+          bg="edr-soft"
+          className="flex items-center justify-center rounded-2xl"
+        >
           <LockKeyhole size={22} color="var(--mantine-color-edr-green-6)" />
         </Box>
         <Box>
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/SignupPage.tsx b/apps/edr-freight-web/portal/src/pages/accounts/SignupPage.tsx
index 5746eefd5..72dafe9f7 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/SignupPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/SignupPage.tsx
@@ -1,50 +1,38 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
   Alert,
   Button,
   PasswordInput,
-  PinInput,
-  SegmentedControl,
   SimpleGrid,
   Stack,
-  Text,
   TextInput,
 } from "@mantine/core";
-import {
-  AlertCircle,
-  ArrowLeft,
-  ArrowRight,
-  Check,
-  Mail,
-  RotateCw,
-  ShieldCheck,
-  Smartphone,
-  X,
-} from "lucide-react";
+import { AlertCircle, ArrowRight } from "lucide-react";
 import { useForm } from "react-hook-form";
 import { useNavigate } from "react-router-dom";
 import { z } from "zod";
 
 import { userType } from "@/enums/userType";
 import useAuth from "@/hooks/useAuth";
+import { useResendCooldown } from "@/hooks/useResendCooldown";
 import type { SignupPayload } from "@/types/auth";
 import AuthShell from "@/components/auth/AuthShell";
+import OtpChannelStep, {
+  OTP_LENGTH,
+  OtpChannelSelect,
+  type OtpChannel,
+} from "@/components/auth/OtpChannelStep";
+import PasswordChecklist from "@/components/auth/PasswordChecklist";
 import { ControlledPhoneField, isValidPhone } from "@/components/PhoneField";
 import { api } from "@/services/api";
+import {
+  confirmPasswordField,
+  passwordField,
+  samePassword,
+} from "@/utils/passwordSchema";
 import { extractApiError } from "@/utils/result";
 
-const passwordRequirements = [
-  { label: "At least 8 characters", test: (v: string) => v.length >= 8 },
-  { label: "One uppercase letter", test: (v: string) => /[A-Z]/.test(v) },
-  { label: "One lowercase letter", test: (v: string) => /[a-z]/.test(v) },
-  { label: "One number", test: (v: string) => /\d/.test(v) },
-  {
-    label: "One special character",
-    test: (v: string) => /[^A-Za-z0-9]/.test(v),
-  },
-] as const;
-
 const userSchema = z
   .object({
     email: z.string().email("Invalid email address"),
@@ -61,43 +49,23 @@ const userSchema = z
       en: z.string().min(2, "Name is required"),
       am: z.string().nullable(),
     }),
-    password: z
-      .string()
-      .min(8, "Password must be at least 8 characters")
-      .regex(/[A-Z]/, "Password must include an uppercase letter")
-      .regex(/[a-z]/, "Password must include a lowercase letter")
-      .regex(/\d/, "Password must include a number")
-      .regex(/[^A-Za-z0-9]/, "Password must include a special character"),
-    confirmPassword: z.string().min(1, "Please confirm your password"),
+    password: passwordField,
+    confirmPassword: confirmPasswordField,
   })
-  .refine((data) => data.password === data.confirmPassword, {
+  .refine(samePassword, {
     message: "Passwords do not match",
     path: ["confirmPassword"],
   });
 
 type FormData = z.infer<typeof userSchema>;
 
-/** Mask all but the first 7 chars of an E.164 phone for display. */
-const maskPhone = (p: string) =>
-  p.length > 4 ? `${p.slice(0, 7)}${"*".repeat(Math.max(0, p.length - 7))}` : p;
-
-/** Mask the local part of an email for display (j***e@example.com). */
-const maskEmail = (email: string) => {
-  const [local, domain] = email.split("@");
-  if (!local || !domain) return email;
-  if (local.length <= 2) return `${local[0] ?? ""}***@${domain}`;
-  return `${local[0]}***${local[local.length - 1]}@${domain}`;
-};
-
-type OtpChannel = "phone" | "email";
-
 export default function SignupPage() {
   const navigate = useNavigate();
   const { signup } = useAuth();
   const [error, setError] = useState<string | null>(null);
 
-  // Two-stage signup: fill the form, then a mandatory SMS OTP challenge on the
-  // phone number before the account is actually created. The account is only
+  // Two-stage signup: fill the form, then a mandatory OTP challenge on the
+  // chosen channel before the account is actually created. The account is only
   // created after the code is verified — the OTP is a hard requirement.
   const [stage, setStage] = useState<"form" | "otp">("form");
   const [pendingData, setPendingData] = useState<FormData | null>(null);
@@ -109,14 +77,7 @@ export default function SignupPage() {
   const [verifying, setVerifying] = useState(false);
   const [otpCode, setOtpCode] = useState("");
   const [otpError, setOtpError] = useState<string | null>(null);
-  const [resendIn, setResendIn] = useState(0);
-
-  // Resend cooldown countdown (pure setTimeout ticks — no Date.now needed).
-  useEffect(() => {
-    if (resendIn <= 0) return;
-    const t = setTimeout(() => setResendIn((s) => s - 1), 1000);
-    return () => clearTimeout(t);
-  }, [resendIn]);
+  const resendCooldown = useResendCooldown();
 
   const {
     register,
@@ -170,7 +131,7 @@ export default function SignupPage() {
       setOtpChannel(channel);
       setOtpCode("");
       setOtpError(null);
-      setResendIn(60);
+      resendCooldown.start();
       setStage("otp");
     } catch (err) {
       setError(extractApiError(err).message);
@@ -190,7 +151,7 @@ export default function SignupPage() {
           : { phone: pendingData.phone },
       );
       setOtpCode("");
-      setResendIn(60);
+      resendCooldown.start();
     } catch (err) {
       setOtpError(extractApiError(err).message);
     } finally {
@@ -202,8 +163,8 @@ export default function SignupPage() {
   const confirmOtp = async () => {
     if (!pendingData) return;
     setOtpError(null);
-    if (otpCode.trim().length !== 6) {
-      setOtpError("Enter the 6-digit code we sent you.");
+    if (otpCode.trim().length !== OTP_LENGTH) {
+      setOtpError(`Enter the ${OTP_LENGTH}-digit code we sent you.`);
       return;
     }
     setVerifying(true);
@@ -298,35 +259,11 @@ export default function SignupPage() {
                 disabled={sending}
               />
 
-              <div className="space-y-1.5">
-                <Text size="sm" fw={500} c="edr-text">
-                  Send verification code via
-                </Text>
-                <SegmentedControl
-                  fullWidth
-                  disabled={sending}
-                  value={channel}
-                  onChange={(v) => setChannel(v as OtpChannel)}
-                  data={[
-                    {
-                      value: "phone",
-                      label: (
-                        <span className="flex items-center justify-center gap-1.5">
-                          <Smartphone size={14} /> Phone
-                        </span>
-                      ),
-                    },
-                    {
-                      value: "email",
-                      label: (
-                        <span className="flex items-center justify-center gap-1.5">
-                          <Mail size={14} /> Email
-                        </span>
-                      ),
-                    },
-                  ]}
-                />
-              </div>
+              <OtpChannelSelect
+                value={channel}
+                onChange={setChannel}
+                disabled={sending}
+              />
 
               <div>
                 <PasswordInput
@@ -337,37 +274,7 @@ export default function SignupPage() {
                   error={errors.password?.message}
                   {...register("password")}
                 />
-                {passwordValue.length > 0 ? (
-                  <div className="mt-2 space-y-1">
-                    {passwordRequirements.map((req) => {
-                      const met = req.test(passwordValue);
-                      return (
-                        <div
-                          key={req.label}
-                          className="flex items-center gap-2"
-                        >
-                          <span
-                            className={`flex h-4 w-4 shrink-0 items-center justify-center rounded-full ${met
-                                ? "bg-primary text-primary-foreground"
-                                : "bg-gray-200 text-gray-500"
-                              }`}
-                          >
-                            {met ? (
-                              <Check className="h-2.5 w-2.5" />
-                            ) : (
-                              <X className="h-2.5 w-2.5" />
-                            )}
-                          </span>
-                          <span
-                            className={`text-xs ${met ? "text-primary" : "text-gray-500"}`}
-                          >
-                            {req.label}
-                          </span>
-                        </div>
-                      );
-                    })}
-                  </div>
-                ) : null}
+                <PasswordChecklist value={passwordValue} />
               </div>
 
               <PasswordInput
@@ -412,87 +319,28 @@ export default function SignupPage() {
             </Stack>
           </form>
         ) : (
-          <Stack gap="md">
-            <div className="mb-1 flex justify-center">
-              <span className="flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 text-primary">
-                <ShieldCheck size={22} />
-              </span>
-            </div>
-            <div className="space-y-1.5 text-center">
-              <h1 className="text-xl font-bold tracking-tight text-gray-900 sm:text-2xl">
-                Verify your {otpChannel === "email" ? "email" : "phone"}
-              </h1>
-              <p className="text-sm leading-relaxed text-gray-500">
-                We sent a 6 - digit code to{" "}
-                <span className="font-medium text-gray-700">
-                  {otpChannel === "email"
-                    ? maskEmail(pendingData?.email ?? "")
-                    : maskPhone(pendingData?.phone ?? "")}
-                </span>
-                .Enter it to finish creating your account.
-              </p>
-            </div>
-
-            {otpError ? (
-              <Alert
-                color="red"
-                variant="light"
-                icon={<AlertCircle size={18} />}
-              >
-                {otpError}
-              </Alert>
-            ) : null}
-
-            <Stack gap={6} align="center">
-              <Text size="sm" fw={500} c="edr-text">
-                Verification code
-              </Text>
-              <PinInput
-                length={6}
-                type="number"
-                oneTimeCode
-                value={otpCode}
-                placeholder="0"
-                disabled={verifying}
-                styles={{ input: { textAlign: "center" } }}
-                onChange={setOtpCode}
-              />
-            </Stack>
-
-            <Button
-              color="edr-green"
-              fullWidth
-              loading={verifying}
-              disabled={verifying || otpCode.trim().length !== 6}
-              onClick={confirmOtp}
-            >
-              Verify & create account
-            </Button>
-
-            <div className="flex items-center justify-between">
-              <Button
-                variant="subtle"
-                color="gray"
-                leftSection={<ArrowLeft size={14} />}
-                disabled={sending || verifying}
-                onClick={() => {
-                  setStage("form");
-                  setOtpError(null);
-                }}
-              >
-                Back
-              </Button>
-              <Button
-                variant="subtle"
-                color="edr-green"
-                leftSection={<RotateCw size={14} />}
-                disabled={resendIn > 0 || sending || verifying}
-                onClick={resendOtp}
-              >
-                {resendIn > 0 ? `Resend in ${resendIn}s` : "Resend code"}
-              </Button>
-            </div>
-          </Stack>
+          <OtpChannelStep
+            channel={otpChannel}
+            target={
+              otpChannel === "email"
+                ? (pendingData?.email ?? "")
+                : (pendingData?.phone ?? "")
+            }
+            value={otpCode}
+            onChange={setOtpCode}
+            onVerify={confirmOtp}
+            onBack={() => {
+              setStage("form");
+              setOtpError(null);
+            }}
+            onResend={resendOtp}
+            resendIn={resendCooldown.secondsLeft}
+            sending={sending}
+            verifying={verifying}
+            error={otpError}
+            description="Enter it to finish creating your account."
+            submitLabel="Verify & create account"
+          />
         )}
       </div>
     </AuthShell>
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx
index 7384bbc4d..f135078c1 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx
@@ -107,10 +107,12 @@ export function ReadonlyBookingView({
     (isGeneralContract
       ? status === "FULLY_EXECUTED"
       : status === "SELECTED_FOR_BATCH");
-  const canApproveDelivery =
-    status === "COMPLETED" ||
-    Boolean(booking.handoverAwaitingSignature) ||
-    (status === "TRUCK_ASSIGNED" && Boolean(booking.customerTruckArrivedAt));
+  // Approve delivery tracks the handover lifecycle exactly: the button appears
+  // the moment a handover is generated (truck arrival, or an operator's
+  // signature request) and disappears the moment the customer signs it. The
+  // backend flag counts only unsigned SELF_HAUL handovers, so no status
+  // heuristics are needed here.
+  const canApproveDelivery = Boolean(booking.handoverAwaitingSignature);
   const usesCustomerTruck =
     booking.tradeDirection === "IMPORT"
       ? !booking.lastMileDeliveryAddress
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/StatusHero.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/StatusHero.tsx
index 13404f8f6..82c692a90 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/StatusHero.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/StatusHero.tsx
@@ -142,7 +142,7 @@ function ProgressTracker({
   const activeRing = tone === "ink" ? "#D9E0E7" : "#BFE8D4";
 
   return (
-    /* Scrollable on mobile so 5 stages never overflow */
+    /* Scrollable on mobile so the stages never overflow */
     <Box
       className="overflow-x-auto pt-2"
       style={
@@ -152,7 +152,7 @@ function ProgressTracker({
         } as React.CSSProperties
       }
     >
-      <div className="flex items-start" style={{ minWidth: 520 }}>
+      <div className="flex items-start" style={{ minWidth: 640 }}>
         {PROGRESS_STAGES.map((stage, idx) => {
           const state =
             idx < current ? "done" : idx === current ? "active" : "idle";
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/constants.ts b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/constants.ts
index 4b32a059c..7b91f8250 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/constants.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/constants.ts
@@ -3,6 +3,7 @@ import {
   FileText,
   MapPin,
   PackageCheck,
+  PackageOpen,
   ShieldCheck,
   Ship,
   Train,
@@ -54,12 +55,22 @@ export const PROGRESS_STAGES = [
     statuses: ["EXPIRED", "IN_TRANSIT"],
   },
   {
-    // ARRIVED: cargo unloaded at the booking's own destination yard (segment
-    // corridor journeys). Legacy bookings stay IN_TRANSIT until delivery, so
-    // this stage also lights up from the assigned train's own status
-    // (trainScheduleStatus === "ARRIVED") — see resolveStage.
+    // The train reached the booking's destination yard — cargo may still be
+    // on board. No booking status of its own: it lights up from the assigned
+    // train's status (trainScheduleStatus === "ARRIVED") while the booking is
+    // still IN_TRANSIT — see resolveStage. Bookings unloaded mid-corridor (or
+    // auto-unloaded on a checkpoint) jump straight past it to Unloading.
     label: "Arrival",
     icon: MapPin,
+    statuses: [],
+  },
+  {
+    // ARRIVED: cargo unloaded off the train at the booking's own destination
+    // yard. Unloading is automatic — the API alights the booking the moment a
+    // checkpoint is recorded at its destination yard (or, as a fallback, when
+    // the train's final arrival is logged).
+    label: "Unloading",
+    icon: PackageOpen,
     statuses: ["ARRIVED"],
   },
   {
@@ -69,17 +80,17 @@ export const PROGRESS_STAGES = [
   },
 ];
 
-/** Stage index of the Arrival step (train ARRIVED, cargo not yet delivered). */
+/** Stage index of the Arrival step (train ARRIVED, cargo not yet unloaded). */
 export const ARRIVAL_STAGE = PROGRESS_STAGES.findIndex(
   (s) => s.label === "Arrival",
 );
 
 /**
  * Stage for a booking, factoring in the assigned train's operational status:
- * a booking with per-booking journey data reaches ARRIVED when it is unloaded
- * at its own destination yard; a legacy booking is stuck at IN_TRANSIT between
- * dispatch and delivery, so once its train has ARRIVED the tracker advances to
- * the Arrival stage.
+ * a booking with per-booking journey data reaches ARRIVED (the Unloading
+ * stage) when it is unloaded at its own destination yard; a legacy booking is
+ * stuck at IN_TRANSIT between dispatch and delivery, so once its train has
+ * ARRIVED the tracker advances to the Arrival stage.
  */
 export function resolveStage(booking: {
   status: string;
@@ -181,10 +192,10 @@ export const STATUS_MAP: Record<
     stage: 6,
   },
   ARRIVED: {
-    title: "Arrived at destination",
+    title: "Unloaded at destination",
     description:
       "Your cargo has been unloaded at its destination yard and is being prepared for release.",
-    stage: 7,
+    stage: 8,
   },
   OPERATION_REQUEST_PENDING: {
     title: "Operation request under review",
@@ -251,7 +262,7 @@ export const STATUS_MAP: Record<
     title: "Contract closed",
     description:
       "This general contract is closed — its reserved quantity has been used or its window has elapsed.",
-    stage: 8,
+    stage: 9,
   },
   PRICE_CHANGED_PENDING_CONFIRM: {
     title: "Price changed — confirm to proceed",
@@ -277,12 +288,12 @@ export const STATUS_MAP: Record<
   COMPLETED: {
     title: "Service complete",
     description: "Cargo delivered and service successfully terminated.",
-    stage: 8,
+    stage: 9,
   },
   DELIVERED: {
     title: "Service complete",
     description: "Cargo delivered and service successfully terminated.",
-    stage: 8,
+    stage: 9,
   },
   REJECTED: {
     title: "Booking rejected",
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionModal.tsx b/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionModal.tsx
index 23676efe8..0cabf0878 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionModal.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionModal.tsx
@@ -42,7 +42,7 @@ function BookingActionModalBody({
   const flow = useClearanceFlow(booking);
   const reference = booking.reference;
 
-  const handleSubmit = () => flow.submitDocuments();
+  const handleSubmit = () => flow.submitDocuments({ onSuccess: onClose });
   const handleProceed = () => flow.proceedToOperation({ onSuccess: onClose });
 
   return (
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/resubmit/resubmitDocs.ts b/apps/edr-freight-web/portal/src/pages/bookings/resubmit/resubmitDocs.ts
index d8b660413..0a2f1a30f 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/resubmit/resubmitDocs.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/resubmit/resubmitDocs.ts
@@ -10,7 +10,7 @@ const LABEL_BY_CODE = new Map<string, string>([
   ...REQUIRED_DOC_FIELDS.map((d) => [d.key, d.label] as const),
   // Company onboarding document codes (see file-upload-settings seeder).
   ["tin_certificate", "TIN Certificate"],
-  ["commercial_license", "Commercial License"],
+  ["commercial_license", "Commercial Registration"],
   ["business_license", "Business License / Trade License"],
   ["investment_license", "Investment License"],
   ["national_id", "National ID"],
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/ContractClearancePanel.tsx b/apps/edr-freight-web/portal/src/pages/contracts/ContractClearancePanel.tsx
index 6fc88c678..67b3fead8 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/ContractClearancePanel.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/ContractClearancePanel.tsx
@@ -39,6 +39,8 @@ export interface ContractClearancePanelProps {
   tradeDirection?: string;
   /** Show the loading state without the surrounding Paper (e.g. inside a modal). */
   bare?: boolean;
+  /** Called after a successful document submission (e.g. to close the host modal). */
+  onSubmitted?: () => void;
 }
 
 /**
@@ -52,6 +54,7 @@ export function ContractClearancePanel({
   contractId,
   tradeDirection = "IMPORT",
   bare,
+  onSubmitted,
 }: ContractClearancePanelProps) {
   const queryClient = useQueryClient();
   const [pending, setPending] = useState<Record<string, File>>({});
@@ -77,6 +80,13 @@ export function ContractClearancePanel({
       queryClient.invalidateQueries({
         queryKey: api.contracts.get.queryKey({ id: contractId }),
       });
+      // Submitting moves the contract to CLEARANCE_UNDER_REVIEW — refresh every
+      // contracts-list query (prefix key) so the /contracts table row and its
+      // action button update without a page reload.
+      queryClient.invalidateQueries({
+        queryKey: api.contracts.list.queryKey(),
+      });
+      onSubmitted?.();
     },
   });
 
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx b/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
index 2bb3561cb..784fa6bf5 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
@@ -241,8 +241,12 @@ export default function ContractDetailPage() {
   });
   // Intercity contracts are never window-gated: the shipment rides a passing
   // import/export train that staff assign later, so booking is always open.
+  // GENERAL contracts are also not gated at creation — the booking enters the
+  // per-booking clearance gate first and picks its shipment day at proceed time.
   const bookingWindowOpen =
-    contract?.tradeDirection === "DOMESTIC" || hasOpenWindow(bookingWindows);
+    contract?.tradeDirection === "DOMESTIC" ||
+    contract?.contractKind === "GENERAL" ||
+    hasOpenWindow(bookingWindows);
 
   // Draw-down capacity per cargo line (GENERAL contracts only). The backend
   // excludes CANCELLED/REJECTED/EXPIRED bookings, so a shipment that never ships
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/ContractsList.tsx b/apps/edr-freight-web/portal/src/pages/contracts/ContractsList.tsx
index d2bd8b88f..30f241e40 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/ContractsList.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/ContractsList.tsx
@@ -9,6 +9,7 @@ import {
   Group,
   Loader,
   Paper,
+  Popover,
   Select,
   Stack,
   Table,
@@ -17,6 +18,7 @@ import {
   Title,
 } from "@mantine/core";
 import {
+  AlertTriangle,
   CheckCircle2,
   ChevronDown,
   ChevronLeft,
@@ -31,6 +33,8 @@ import {
   X,
 } from "lucide-react";
 
+// import { PROFILE_TYPE_LABELS } from "@/constants/profileMode";
+import useAuth from "@/hooks/useAuth";
 import { api } from "@/services/api";
 import { ContractCustomerAction } from "@/components/customer-actions/ContractCustomerAction";
 import type { ContractListFilter } from "@/services/contracts.service";
@@ -58,14 +62,26 @@ function primaryRoute(contract: Freight.IContract) {
 
 export default function ContractsList() {
   const navigate = useNavigate();
+  const { company } = useAuth();
   const { pagination, setPagination } = usePagination({ pageSize: 10 });
   const [query, setQuery] = useState("");
+  const [disclaimerOpen, setDisclaimerOpen] = useState(false);
   const [freightFilter, setFreightFilter] = useState<string | null>(null);
   const [kindFilter, setKindFilter] = useState<string | null>(null);
   const [createdFrom, setCreatedFrom] = useState<string>("");
   const [createdTo, setCreatedTo] = useState<string>("");
   const [expanded, setExpanded] = useState<Set<string>>(new Set());
 
+  // A contract can only be created under an approved profile — NewContractPage
+  // blocks every operation whose profile isn't "active". With none approved the
+  // page is reachable but unusable, so warn before sending the user there.
+  const profiles = company?.company?.companyProfiles ?? [];
+  const noActiveProfile =
+    profiles.length > 0 && !profiles.some((p) => p.status === "active");
+
+  const openNewContract = () =>
+    navigate("/contracts/new", { state: { fresh: true } });
+
   const toggleExpanded = (id: string) =>
     setExpanded((prev) => {
       const nextSet = new Set(prev);
@@ -137,9 +153,11 @@ export default function ContractsList() {
   const stats = useMemo(() => {
     const items = data?.items ?? [];
     const active = items.filter((c) =>
-      ["CONTRACT_ACTIVE", "FULLY_EXECUTED", "ACTIVE_SHIPMENT_IN_PROGRESS"].includes(
-        c.status,
-      ),
+      [
+        "CONTRACT_ACTIVE",
+        "FULLY_EXECUTED",
+        "ACTIVE_SHIPMENT_IN_PROGRESS",
+      ].includes(c.status),
     ).length;
     const pending = items.filter((c) =>
       [
@@ -158,7 +176,7 @@ export default function ContractsList() {
     return { active, pending, total };
   }, [data]);
 
-  const total = data?.meta?.total ?? (data?.items?.length ?? 0);
+  const total = data?.meta?.total ?? data?.items?.length ?? 0;
   const pageCount = Math.max(1, Math.ceil(total / pagination.pageSize));
   const pageIndex = pagination.pageIndex;
   const start = total === 0 ? 0 : pageIndex * pagination.pageSize + 1;
@@ -175,19 +193,63 @@ export default function ContractsList() {
       <Stack gap="lg">
         {/* Header */}
         <Group justify="space-between" align="center" wrap="wrap" gap="md">
-          <Title order={1} fw={800} fz={26} style={{ letterSpacing: "-0.01em" }}>
+          <Title
+            order={1}
+            fw={800}
+            fz={26}
+            style={{ letterSpacing: "-0.01em" }}
+          >
             Contracts
           </Title>
-          <Button
-            color="edr-green"
+          <Popover
+            opened={disclaimerOpen}
+            onChange={setDisclaimerOpen}
+            position="bottom-end"
+            width={340}
             radius="md"
-            size="md"
-            leftSection={<Plus size={16} />}
-            onClick={() => navigate("/contracts/new", { state: { fresh: true } })}
-            styles={{ root: { fontWeight: 600, height: 42, paddingInline: 18 } }}
+            shadow="md"
+            withArrow
+            trapFocus
           >
-            New Contract
-          </Button>
+            <Popover.Target>
+              <Button
+                color="edr-green"
+                radius="md"
+                size="md"
+                leftSection={<Plus size={16} />}
+                onClick={() =>
+                  noActiveProfile
+                    ? setDisclaimerOpen((o) => !o)
+                    : openNewContract()
+                }
+                styles={{
+                  root: { fontWeight: 600, height: 42, paddingInline: 18 },
+                }}
+              >
+                New Contract
+              </Button>
+            </Popover.Target>
+            <Popover.Dropdown>
+              <Stack gap="sm">
+                <Group gap={8} wrap="nowrap" align="flex-start">
+                  <AlertTriangle
+                    size={18}
+                    color="var(--mantine-color-edr-accent-6)"
+                    style={{ flexShrink: 0, marginTop: 1 }}
+                  />
+                  <Text fz={14} fw={700} style={{ color: INK }}>
+                    None of your profiles are active yet
+                  </Text>
+                </Group>
+
+                <Text fz={13} c="dimmed">
+                  Contracts can only be created under a profile EDR has
+                  approved. You can continue, but every operation stays locked
+                  until at least one profile is approved.
+                </Text>
+              </Stack>
+            </Popover.Dropdown>
+          </Popover>
         </Group>
 
         {/* Summary strip */}
@@ -378,7 +440,11 @@ export default function ContractsList() {
                   <Table.Tr>
                     <Table.Td colSpan={11}>
                       <Stack align="center" gap={8} py={48}>
-                        <Inbox size={26} color={MUTED} style={{ opacity: 0.5 }} />
+                        <Inbox
+                          size={26}
+                          color={MUTED}
+                          style={{ opacity: 0.5 }}
+                        />
                         <Text fz={13} c="dimmed">
                           No contracts yet. Create one from New Contract.
                         </Text>
@@ -400,154 +466,159 @@ export default function ContractsList() {
                     const isOpen = expanded.has(c.id);
                     return (
                       <Fragment key={c.id}>
-                      <Table.Tr
-                        style={{
-                          cursor: "pointer",
-                          background: isOpen ? "#F4FBF8" : undefined,
-                        }}
-                        onClick={() => navigate(`/contracts/${c.id}`)}
-                      >
-                        <Table.Td>
-                          <Box
-                            component="button"
-                            aria-label={isOpen ? "Hide progress" : "Show progress"}
-                            aria-expanded={isOpen}
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              toggleExpanded(c.id);
-                            }}
-                            style={{
-                              display: "flex",
-                              alignItems: "center",
-                              justifyContent: "center",
-                              width: 28,
-                              height: 28,
-                              borderRadius: 8,
-                              border: `1px solid ${BORDER}`,
-                              background: isOpen ? GREEN : "#FFFFFF",
-                              color: isOpen ? "#FFFFFF" : MUTED,
-                              cursor: "pointer",
-                              transition: "all 140ms ease",
-                            }}
-                          >
-                            <ChevronDown
-                              size={16}
-                              style={{
-                                transform: isOpen ? "rotate(180deg)" : "none",
-                                transition: "transform 160ms ease",
+                        <Table.Tr
+                          style={{
+                            cursor: "pointer",
+                            background: isOpen ? "#F4FBF8" : undefined,
+                          }}
+                          onClick={() => navigate(`/contracts/${c.id}`)}
+                        >
+                          <Table.Td>
+                            <Box
+                              component="button"
+                              aria-label={
+                                isOpen ? "Hide progress" : "Show progress"
+                              }
+                              aria-expanded={isOpen}
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                toggleExpanded(c.id);
                               }}
-                            />
-                          </Box>
-                        </Table.Td>
-                        <Table.Td>
-                          <Text fz={14} fw={700} style={{ color: INK }}>
-                            {c.reference}
-                          </Text>
-                          <Text fz={12} c="dimmed">
-                            {isContainer ? "Containerised" : "Bulk"}
-                          </Text>
-                        </Table.Td>
-                        <Table.Td>
-                          <Badge
-                            variant="light"
-                            color={isGeneral ? "edr-green" : "gray"}
-                            radius="sm"
-                          >
-                            {isGeneral ? "General" : "One-Time"}
-                          </Badge>
-                        </Table.Td>
-                        <Table.Td>
-                          <Group gap={7} wrap="nowrap" align="center">
-                            {isContainer ? (
-                              <Package size={15} color={MUTED} />
-                            ) : (
-                              <Weight size={15} color={MUTED} />
-                            )}
-                            <Text fz={13} style={{ color: INK }}>
-                              {isContainer ? "Container" : "Bulk"}
+                              style={{
+                                display: "flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                                width: 28,
+                                height: 28,
+                                borderRadius: 8,
+                                border: `1px solid ${BORDER}`,
+                                background: isOpen ? GREEN : "#FFFFFF",
+                                color: isOpen ? "#FFFFFF" : MUTED,
+                                cursor: "pointer",
+                                transition: "all 140ms ease",
+                              }}
+                            >
+                              <ChevronDown
+                                size={16}
+                                style={{
+                                  transform: isOpen ? "rotate(180deg)" : "none",
+                                  transition: "transform 160ms ease",
+                                }}
+                              />
+                            </Box>
+                          </Table.Td>
+                          <Table.Td>
+                            <Text fz={14} fw={700} style={{ color: INK }}>
+                              {c.reference}
                             </Text>
-                          </Group>
-                        </Table.Td>
-                        <Table.Td>
-                          <Text fz={13} style={{ color: INK }}>
-                            {origin}{" "}
-                            <Text span c="dimmed">
-                              →
-                            </Text>{" "}
-                            {destination}
-                            {count > 1 && (
-                              <Text span c="dimmed" fz={12}>
-                                {" "}
-                                +{count - 1}
+                            <Text fz={12} c="dimmed">
+                              {isContainer ? "Containerised" : "Bulk"}
+                            </Text>
+                          </Table.Td>
+                          <Table.Td>
+                            <Badge
+                              variant="light"
+                              color={isGeneral ? "edr-green" : "gray"}
+                              radius="sm"
+                            >
+                              {isGeneral ? "General" : "One-Time"}
+                            </Badge>
+                          </Table.Td>
+                          <Table.Td>
+                            <Group gap={7} wrap="nowrap" align="center">
+                              {isContainer ? (
+                                <Package size={15} color={MUTED} />
+                              ) : (
+                                <Weight size={15} color={MUTED} />
+                              )}
+                              <Text fz={13} style={{ color: INK }}>
+                                {isContainer ? "Container" : "Bulk"}
                               </Text>
-                            )}
-                          </Text>
-                        </Table.Td>
-                        <Table.Td>
-                          <Text
-                            fz={13}
-                            c={dir ? undefined : "dimmed"}
-                            style={{ color: dir ? INK : undefined }}
-                          >
-                            {tradeLabel}
-                          </Text>
-                        </Table.Td>
-                        <Table.Td>
-                          <Text fz={13} style={{ color: INK }}>
-                            {c.paymentCurrency ?? "—"}
-                          </Text>
-                        </Table.Td>
-                        <Table.Td>
-                          <Text
-                            fz={13}
-                            c={c.createdAt ? undefined : "dimmed"}
-                            style={{ color: c.createdAt ? INK : undefined }}
-                          >
-                            {c.createdAt
-                              ? new Date(c.createdAt).toLocaleDateString()
-                              : "—"}
-                          </Text>
-                        </Table.Td>
-                        <Table.Td>
-                          <Text
-                            fz={13}
-                            c={c.contractValidUntil ? undefined : "dimmed"}
-                            style={{
-                              color: c.contractValidUntil ? INK : undefined,
-                            }}
-                          >
-                            {c.contractValidUntil
-                              ? new Date(
+                            </Group>
+                          </Table.Td>
+                          <Table.Td>
+                            <Text fz={13} style={{ color: INK }}>
+                              {origin}{" "}
+                              <Text span c="dimmed">
+                                →
+                              </Text>{" "}
+                              {destination}
+                              {count > 1 && (
+                                <Text span c="dimmed" fz={12}>
+                                  {" "}
+                                  +{count - 1}
+                                </Text>
+                              )}
+                            </Text>
+                          </Table.Td>
+                          <Table.Td>
+                            <Text
+                              fz={13}
+                              c={dir ? undefined : "dimmed"}
+                              style={{ color: dir ? INK : undefined }}
+                            >
+                              {tradeLabel}
+                            </Text>
+                          </Table.Td>
+                          <Table.Td>
+                            <Text fz={13} style={{ color: INK }}>
+                              {c.paymentCurrency ?? "—"}
+                            </Text>
+                          </Table.Td>
+                          <Table.Td>
+                            <Text
+                              fz={13}
+                              c={c.createdAt ? undefined : "dimmed"}
+                              style={{ color: c.createdAt ? INK : undefined }}
+                            >
+                              {c.createdAt
+                                ? new Date(c.createdAt).toLocaleDateString()
+                                : "—"}
+                            </Text>
+                          </Table.Td>
+                          <Table.Td>
+                            <Text
+                              fz={13}
+                              c={c.contractValidUntil ? undefined : "dimmed"}
+                              style={{
+                                color: c.contractValidUntil ? INK : undefined,
+                              }}
+                            >
+                              {c.contractValidUntil
+                                ? new Date(
                                   c.contractValidUntil,
                                 ).toLocaleDateString()
-                              : "—"}
-                          </Text>
-                        </Table.Td>
-                        <Table.Td>
-                          <ContractStatusBadge status={c.status} />
-                        </Table.Td>
-                        <Table.Td>
-                          <Group justify="flex-end" gap={8} wrap="nowrap">
-                            <ContractDocButton
-                              contract={c}
-                              onClick={(e) => e.stopPropagation()}
-                            />
-                            <ContractCustomerAction
-                              contract={c}
-                              bookings={bookings}
-                              size="sm"
-                              listStyle
-                            />
-                          </Group>
-                        </Table.Td>
-                      </Table.Tr>
-                      {isOpen && (
-                        <Table.Tr style={{ background: "#F4FBF8" }}>
-                          <Table.Td colSpan={11} style={{ padding: "6px 20px 18px" }}>
-                            <ContractStepBanner contract={c} />
+                                : "—"}
+                            </Text>
+                          </Table.Td>
+                          <Table.Td>
+                            <ContractStatusBadge status={c.status} />
+                          </Table.Td>
+                          <Table.Td>
+                            <Group justify="flex-end" gap={8} wrap="nowrap">
+                              <ContractDocButton
+                                contract={c}
+                                onClick={(e) => e.stopPropagation()}
+                              />
+                              <ContractCustomerAction
+                                contract={c}
+                                bookings={bookings}
+                                size="sm"
+                                listStyle
+                              />
+                            </Group>
                           </Table.Td>
                         </Table.Tr>
-                      )}
+                        {isOpen && (
+                          <Table.Tr style={{ background: "#F4FBF8" }}>
+                            <Table.Td
+                              colSpan={11}
+                              style={{ padding: "6px 20px 18px" }}
+                            >
+                              <ContractStepBanner contract={c} />
+                            </Table.Td>
+                          </Table.Tr>
+                        )}
                       </Fragment>
                     );
                   })}
@@ -564,7 +635,10 @@ export default function ContractsList() {
               gap="md"
               px={20}
               py={14}
-              style={{ borderTop: `1px solid ${BORDER}`, background: "#FCFDFE" }}
+              style={{
+                borderTop: `1px solid ${BORDER}`,
+                background: "#FCFDFE",
+              }}
             >
               <Group gap={10} align="center">
                 <Text fz={13} c="dimmed">
@@ -574,8 +648,7 @@ export default function ContractsList() {
                   data={["10", "25", "50"]}
                   value={String(pagination.pageSize)}
                   onChange={(v) =>
-                    v &&
-                    setPagination({ pageIndex: 0, pageSize: Number(v) })
+                    v && setPagination({ pageIndex: 0, pageSize: Number(v) })
                   }
                   radius="md"
                   size="xs"
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx b/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx
index 9b24d3b8b..33a89e3e1 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx
@@ -59,6 +59,7 @@ import {
   ContractDocsEditor,
   documentSettingCode,
   missingRequiredDocKeys,
+  useCompanyDocuments,
 } from "./new-contract-form/ContractDocsEditor";
 import { PROFILE_TYPE_LABELS } from "@/constants/profileMode";
 import type { ProfileTypeValue } from "@/services/companies.service";
@@ -116,6 +117,9 @@ export default function NewContractPage({
     }),
     enabled: isEdit,
   });
+  // Profile documents (TIN, licenses, IDs) satisfy requirements too — the API
+  // carries them onto the contract on save.
+  const companyDocs = useCompanyDocuments();
 
   // Contract creation is gated on profile approval, same as bookings.
   if (!auth.isPending && auth.company && !auth.canBook) {
@@ -526,6 +530,7 @@ export default function NewContractPage({
         editDocSettingQuery.data,
         editContract,
         editDocuments,
+        companyDocs,
       );
       if (missing.length > 0) {
         setShowDocErrors(true);
@@ -643,6 +648,7 @@ export default function NewContractPage({
           editDocSettingQuery.data,
           editContract,
           editDocuments,
+          companyDocs,
         );
         if (missing.length > 0) {
           setShowDocErrors(true);
@@ -846,6 +852,7 @@ export default function NewContractPage({
                         editDocSettingQuery.data,
                         editContract,
                         editDocuments,
+                        companyDocs,
                       ).map((k) => [k, "Required"]),
                     )
                     : {}
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx b/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
index c36a74255..4a073a59a 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
@@ -9,6 +9,7 @@ import {
   Button,
   Center,
   Divider,
+  FileButton,
   Group,
   Loader,
   Modal,
@@ -26,6 +27,8 @@ import {
   CalendarDays,
   CheckCircle2,
   ChevronLeft,
+  FileDown,
+  FileUp,
   MapPin,
   Package,
   Receipt,
@@ -51,6 +54,10 @@ import {
   initialShipmentFormValues,
 } from "./new-shipment-form/schema";
 import { computeShipmentTotal } from "./new-shipment-form/total";
+import {
+  downloadContainerImportTemplate,
+  parseContainerExcel,
+} from "./new-shipment-form/container-excel";
 import { ContractCapacityNotice } from "./new-shipment-form/ContractCapacityNotice";
 import { closedWindowMessage, hasOpenWindow } from "./booking-window";
 
@@ -139,8 +146,14 @@ export default function NewShipmentPage() {
   // open, show the same closed-state notice as the contract page instead of the
   // form. Still allowed the moment any window isOpenNow. Intercity contracts
   // are never window-gated — the shipment rides a passing train that staff
-  // pick at finalize time, so booking is always open.
-  if (contract.tradeDirection !== "DOMESTIC" && !hasOpenWindow(bookingWindows)) {
+  // pick at finalize time, so booking is always open. GENERAL contracts are not
+  // gated at creation either: the booking enters per-booking clearance first
+  // and picks its shipment day at proceed time.
+  if (
+    contract.tradeDirection !== "DOMESTIC" &&
+    contract.contractKind !== "GENERAL" &&
+    !hasOpenWindow(bookingWindows)
+  ) {
     return (
       <Box style={{ padding: "28px 0 0" }}>
         <Group
@@ -925,6 +938,60 @@ function CargoStep({
 
   const lines = form.watch("containers") ?? [];
 
+  // Excel import: one row per container. All-or-nothing — a file with any bad
+  // row is rejected with row-numbered errors so nothing is silently dropped.
+  const [importErrors, setImportErrors] = useState<string[]>([]);
+  const [importSummary, setImportSummary] = useState<string | null>(null);
+  const importResetRef = useRef<(() => void) | null>(null);
+  const excelOpts = {
+    allowedSizes: sizes,
+    includeHazardous: contract.isHazardous ?? false,
+    includeReefer: contract.isReefer ?? false,
+  };
+
+  const handleImportFile = async (file: File | null) => {
+    // Reset the hidden input so re-picking the same (fixed) file re-fires.
+    importResetRef.current?.();
+    if (!file) return;
+    const { rows, errors } = await parseContainerExcel(file, excelOpts);
+    if (errors.length > 0) {
+      setImportSummary(null);
+      setImportErrors(errors);
+      return;
+    }
+    // Replace only the lines for sizes present in the file; a contracted size
+    // the file omits keeps whatever was already entered for it.
+    const current = form.getValues("containers") ?? [];
+    const next = sizes.map((size) => {
+      const imported = rows.filter((r) => r.containerSize === size);
+      if (imported.length === 0) {
+        return (
+          current.find((l) => l.containerSize === size) ?? {
+            containerSize: size,
+            quantity: "1",
+            hazardousQuantity: "0",
+            reeferQuantity: "0",
+            units: [{ containerNumber: "", sealNumber: "", vgmTons: "" }],
+          }
+        );
+      }
+      return {
+        containerSize: size,
+        quantity: String(imported.length),
+        hazardousQuantity: String(imported.filter((r) => r.hazardous).length),
+        reeferQuantity: String(imported.filter((r) => r.reefer).length),
+        units: imported.map((r) => ({
+          containerNumber: r.containerNumber,
+          sealNumber: r.sealNumber,
+          vgmTons: r.vgmTons,
+        })),
+      };
+    });
+    form.setValue("containers", next, { shouldValidate: true, shouldDirty: true });
+    setImportErrors([]);
+    setImportSummary(`Imported ${rows.length} container(s) from ${file.name}.`);
+  };
+
   if (isContainer) {
     return (
       <StepCard>
@@ -934,6 +1001,83 @@ function CargoStep({
           description="Enter the quantity and per-container details for each size in your contract scope."
         />
         <Stack gap={18}>
+          {sizes.length > 0 && (
+            <Paper withBorder radius="md" p="md" style={{ borderColor: "#E6ECF2" }}>
+              <Group justify="space-between" wrap="wrap" gap="sm">
+                <Box>
+                  <Text fz={13} fw={600} c="#10202F">
+                    Import containers from Excel
+                  </Text>
+                  <Text fz={12} c="dimmed">
+                    One row per container. Importing fills the lines below for
+                    the sizes in your file.
+                  </Text>
+                </Box>
+                <Group gap="sm">
+                  <Button
+                    variant="default"
+                    size="xs"
+                    radius="md"
+                    leftSection={<FileDown size={14} />}
+                    onClick={() => downloadContainerImportTemplate(excelOpts)}
+                  >
+                    Download template
+                  </Button>
+                  <FileButton
+                    resetRef={importResetRef}
+                    accept=".xlsx,.xls"
+                    onChange={handleImportFile}
+                  >
+                    {(props) => (
+                      <Button
+                        {...props}
+                        size="xs"
+                        radius="md"
+                        color="edr-green"
+                        leftSection={<FileUp size={14} />}
+                      >
+                        Import Excel
+                      </Button>
+                    )}
+                  </FileButton>
+                </Group>
+              </Group>
+              {importErrors.length > 0 && (
+                <Alert
+                  color="red"
+                  variant="light"
+                  radius="md"
+                  icon={<AlertCircle size={16} />}
+                  title="Import failed — fix the file and try again"
+                  mt="sm"
+                >
+                  <Stack gap={4}>
+                    {importErrors.slice(0, 8).map((msg, i) => (
+                      <Text key={i} fz="xs">
+                        {msg}
+                      </Text>
+                    ))}
+                    {importErrors.length > 8 && (
+                      <Text fz="xs" c="dimmed">
+                        …and {importErrors.length - 8} more.
+                      </Text>
+                    )}
+                  </Stack>
+                </Alert>
+              )}
+              {importSummary && (
+                <Alert
+                  color="edr-green"
+                  variant="light"
+                  radius="md"
+                  icon={<CheckCircle2 size={16} />}
+                  mt="sm"
+                >
+                  <Text fz="xs">{importSummary}</Text>
+                </Alert>
+              )}
+            </Paper>
+          )}
           <ContractCapacityNotice contractId={contract.id} isContainer />
           {lines.map((line, index) => (
             <ContainerLineEditor
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/ContractDocsEditor.tsx b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/ContractDocsEditor.tsx
index e491cd88a..649cb8320 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/ContractDocsEditor.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/ContractDocsEditor.tsx
@@ -7,6 +7,7 @@ import type { Freight } from "@edr/types";
 import { useQuery } from "@tanstack/react-query";
 import useAuth from "@/hooks/useAuth";
 import { api } from "@/services/api";
+import type { CompanyDocument } from "@/services/companies.service";
 import { fileViewUrl } from "@/constants/apiConfig";
 import { labelForDocCode } from "@/pages/bookings/resubmit/resubmitDocs";
 import { BORDER, GREEN, INK } from "../contract-ui";
@@ -38,6 +39,38 @@ function dedupeLatestByCode(files: ContractFile[]): ContractFile[] {
   return order.map((c) => latest.get(c)!);
 }
 
+/**
+ * The company's onboarding documents (TIN certificate, commercial license,
+ * national ID, …) from the profile. Contracts carry these automatically on
+ * save; the edit page also shows them directly so they are always visible even
+ * on contracts created before the carry-over existed.
+ */
+export function useCompanyDocuments(): CompanyDocument[] {
+  const auth = useAuth();
+  const companyId = auth.company?.company?.id as string | undefined;
+  const query = useQuery({
+    ...api.companies.documents.queryOptions({
+      input: { companyId: companyId ?? "" },
+    }),
+    enabled: Boolean(companyId),
+  });
+  return query.data ?? [];
+}
+
+/** Latest company document per code, excluding codes already on the contract. */
+function profileFallbackDocs(
+  companyDocs: CompanyDocument[],
+  contractFiles: ContractFile[],
+): CompanyDocument[] {
+  const onContract = new Set(contractFiles.map((f) => f.code));
+  const latest = new Map<string, CompanyDocument>();
+  for (const d of companyDocs) {
+    const prev = latest.get(d.code);
+    if (!prev || d.uploadedAt > prev.uploadedAt) latest.set(d.code, d);
+  }
+  return [...latest.values()].filter((d) => !onContract.has(d.code));
+}
+
 /**
  * Document replace/upload block for an existing contract. Lists the documents
  * already on file (latest upload per code) and renders the onboarding-driven
@@ -72,8 +105,25 @@ export function ContractDocsEditor({
     }),
   );
 
+  const companyDocs = useCompanyDocuments();
   const files = contract.files ?? [];
-  const onFile = useMemo(() => dedupeLatestByCode(files), [files]);
+  const onFile = useMemo(() => {
+    const contractRows = dedupeLatestByCode(files).map((f) => ({
+      id: f.id,
+      code: f.code,
+      name: f.name,
+      fromProfile: false,
+    }));
+    // Profile documents not yet carried onto the contract still show — they are
+    // attached automatically on the next save.
+    const profileRows = profileFallbackDocs(companyDocs, files).map((d) => ({
+      id: d.id,
+      code: d.code,
+      name: d.name,
+      fromProfile: true,
+    }));
+    return [...contractRows, ...profileRows];
+  }, [files, companyDocs]);
 
   return (
     <Stack gap="md">
@@ -115,12 +165,21 @@ export function ContractDocsEditor({
                 </Text>
               </Box>
               <Group gap={8} wrap="nowrap">
-                <Group gap={5} c={GREEN}>
-                  <CheckCircle2 size={14} />
-                  <Text fz="11.5px" fw={600} c={GREEN}>
-                    On file
-                  </Text>
-                </Group>
+                {file.fromProfile ? (
+                  <Group gap={5} style={{ color: "#2E5B96" }}>
+                    <CheckCircle2 size={14} />
+                    <Text fz="11.5px" fw={600} style={{ color: "#2E5B96" }}>
+                      From profile
+                    </Text>
+                  </Group>
+                ) : (
+                  <Group gap={5} c={GREEN}>
+                    <CheckCircle2 size={14} />
+                    <Text fz="11.5px" fw={600} c={GREEN}>
+                      On file
+                    </Text>
+                  </Group>
+                )}
                 <Button
                   component="a"
                   href={fileViewUrl(file.id, true)}
@@ -170,16 +229,21 @@ export function ContractDocsEditor({
 
 /**
  * Keys of the documents the onboarding setting marks required that are neither
- * already on the contract nor freshly attached in `documents`. Empty means the
- * customer may resubmit.
+ * already on the contract, nor on the company profile (the API carries those
+ * onto the contract on save), nor freshly attached in `documents`. Empty means
+ * the customer may resubmit.
  */
 export function missingRequiredDocKeys(
   setting: Freight.IFileUploadSetting | undefined,
   contract: Freight.IContract,
   documents: DocumentsValue,
+  companyDocs: CompanyDocument[] = [],
 ): string[] {
   const fields = setting?.fields ?? [];
-  const existingCodes = new Set((contract.files ?? []).map((f) => f.code));
+  const existingCodes = new Set([
+    ...(contract.files ?? []).map((f) => f.code),
+    ...companyDocs.map((d) => d.code),
+  ]);
   return fields
     .filter((f) => f.isRequired)
     .filter(
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/container-excel.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/container-excel.ts
new file mode 100644
index 000000000..bbd3acf90
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/container-excel.ts
@@ -0,0 +1,200 @@
+import * as XLSX from "xlsx";
+
+// Excel import for container shipments: one spreadsheet row per physical
+// container, mirroring the manual per-unit fields (number, seal, VGM) plus the
+// hazardous/reefer flags when the contract allows them. The parser is
+// all-or-nothing — any bad row rejects the file with row-numbered errors so a
+// partial import can never silently drop containers.
+
+// ISO 6346: 3-letter owner code + category id (U/J/Z) + 6-digit serial + check digit.
+const ISO_CONTAINER_NUMBER_REGEX = /^[A-Z]{4}\d{7}$/;
+
+export interface ContainerExcelOptions {
+  /** Container sizes the contract scope allows (e.g. ["20ft", "40ft"]). */
+  allowedSizes: string[];
+  includeHazardous: boolean;
+  includeReefer: boolean;
+}
+
+export interface ImportedContainerRow {
+  containerSize: string;
+  containerNumber: string;
+  sealNumber: string;
+  vgmTons: string;
+  hazardous: boolean;
+  reefer: boolean;
+}
+
+export interface ContainerExcelResult {
+  rows: ImportedContainerRow[];
+  errors: string[];
+}
+
+type ColumnKey =
+  | "containerSize"
+  | "containerNumber"
+  | "sealNumber"
+  | "vgmTons"
+  | "hazardous"
+  | "reefer";
+
+/** Match a header cell to a known column, tolerant of casing/spacing/units. */
+function headerKey(raw: string): ColumnKey | null {
+  const h = raw.toLowerCase().replace(/[^a-z]/g, "");
+  if (!h) return null;
+  if (h.includes("size")) return "containerSize";
+  if (h.includes("seal")) return "sealNumber";
+  if (h.includes("vgm") || h.includes("weight")) return "vgmTons";
+  if (h.includes("hazard")) return "hazardous";
+  if (h.includes("reefer") || h.includes("refrigerat")) return "reefer";
+  // After the more specific matches: "Container Number", "Container No", …
+  if (h.includes("container") || h.includes("number")) return "containerNumber";
+  return null;
+}
+
+/** "20", "20ft", "20 FT" … → the matching contracted size, or null. */
+function normalizeSize(raw: string, allowed: string[]): string | null {
+  const digits = raw.replace(/[^0-9]/g, "");
+  if (!digits) return null;
+  return allowed.find((s) => s.replace(/[^0-9]/g, "") === digits) ?? null;
+}
+
+function parseFlag(raw: string): boolean {
+  const v = raw.trim().toLowerCase();
+  return v === "yes" || v === "y" || v === "true" || v === "1" || v === "x";
+}
+
+/**
+ * Parse an uploaded workbook into one row per container. Returns either the
+ * full row set or the list of row-numbered problems (never both).
+ */
+export async function parseContainerExcel(
+  file: File,
+  opts: ContainerExcelOptions,
+): Promise<ContainerExcelResult> {
+  let sheet: XLSX.WorkSheet | undefined;
+  try {
+    const workbook = XLSX.read(await file.arrayBuffer(), { type: "array" });
+    sheet = workbook.Sheets[workbook.SheetNames[0]];
+  } catch {
+    return { rows: [], errors: ["Could not read the file — is it a valid Excel file?"] };
+  }
+  if (!sheet) {
+    return { rows: [], errors: ["The file has no sheets."] };
+  }
+
+  const grid = XLSX.utils.sheet_to_json<string[]>(sheet, {
+    header: 1,
+    raw: false,
+    defval: "",
+  });
+
+  // First row with a recognizable column is the header; everything above
+  // (titles, blank rows) is ignored.
+  let headerRowIdx = -1;
+  let columns: Array<ColumnKey | null> = [];
+  for (let i = 0; i < grid.length; i++) {
+    const mapped = (grid[i] ?? []).map((c) => headerKey(String(c ?? "")));
+    if (mapped.includes("containerNumber") && mapped.includes("containerSize")) {
+      headerRowIdx = i;
+      columns = mapped;
+      break;
+    }
+  }
+  if (headerRowIdx < 0) {
+    return {
+      rows: [],
+      errors: [
+        'Could not find the expected columns. The sheet needs at least "Container Size" and "Container Number" headers — download the template to see the format.',
+      ],
+    };
+  }
+  if (!columns.includes("vgmTons")) {
+    return {
+      rows: [],
+      errors: ['Missing a "VGM (Tons)" column — download the template to see the format.'],
+    };
+  }
+
+  const rows: ImportedContainerRow[] = [];
+  const errors: string[] = [];
+  const numberCounts = new Map<string, number>();
+
+  for (let i = headerRowIdx + 1; i < grid.length; i++) {
+    const cells = grid[i] ?? [];
+    if (cells.every((c) => String(c ?? "").trim() === "")) continue;
+    const rowNo = i + 1; // 1-based, as shown in Excel
+
+    const cell = (key: ColumnKey) => {
+      const idx = columns.indexOf(key);
+      return idx >= 0 ? String(cells[idx] ?? "").trim() : "";
+    };
+
+    const size = normalizeSize(cell("containerSize"), opts.allowedSizes);
+    if (!size) {
+      errors.push(
+        `Row ${rowNo}: container size "${cell("containerSize") || "—"}" is not in this contract's scope (allowed: ${opts.allowedSizes.join(", ")}).`,
+      );
+    }
+
+    const containerNumber = cell("containerNumber").toUpperCase();
+    if (!ISO_CONTAINER_NUMBER_REGEX.test(containerNumber)) {
+      errors.push(
+        `Row ${rowNo}: "${cell("containerNumber") || "—"}" is not a valid ISO container number (e.g. MSCU1234567).`,
+      );
+    } else {
+      numberCounts.set(containerNumber, (numberCounts.get(containerNumber) ?? 0) + 1);
+    }
+
+    const vgmRaw = cell("vgmTons");
+    const vgm = Number(vgmRaw);
+    if (!vgmRaw || Number.isNaN(vgm) || vgm <= 0) {
+      errors.push(`Row ${rowNo}: VGM "${vgmRaw || "—"}" must be a number greater than 0.`);
+    }
+
+    rows.push({
+      containerSize: size ?? "",
+      containerNumber,
+      sealNumber: cell("sealNumber"),
+      vgmTons: vgmRaw,
+      hazardous: opts.includeHazardous && parseFlag(cell("hazardous")),
+      reefer: opts.includeReefer && parseFlag(cell("reefer")),
+    });
+  }
+
+  numberCounts.forEach((count, num) => {
+    if (count > 1) errors.push(`Container number ${num} appears ${count} times — numbers must be unique.`);
+  });
+
+  if (rows.length === 0 && errors.length === 0) {
+    errors.push("The sheet has no container rows below the header.");
+  }
+
+  return errors.length > 0 ? { rows: [], errors } : { rows, errors: [] };
+}
+
+/** Generate and download the simple import template with one sample row per size. */
+export function downloadContainerImportTemplate(opts: ContainerExcelOptions) {
+  const headers = ["Container Size", "Container Number", "Seal Number", "VGM (Tons)"];
+  if (opts.includeHazardous) headers.push("Hazardous (YES/NO)");
+  if (opts.includeReefer) headers.push("Reefer (YES/NO)");
+
+  const sizes = opts.allowedSizes.length > 0 ? opts.allowedSizes : ["20ft"];
+  const sampleRows = sizes.map((size, i) => {
+    const row: Array<string | number> = [
+      size,
+      `MSCU${String(1234567 + i).padStart(7, "0")}`,
+      `SL${String(482910 + i)}`,
+      size.startsWith("40") ? 28 : 24.5,
+    ];
+    if (opts.includeHazardous) row.push("NO");
+    if (opts.includeReefer) row.push("NO");
+    return row;
+  });
+
+  const sheet = XLSX.utils.aoa_to_sheet([headers, ...sampleRows]);
+  sheet["!cols"] = headers.map((h) => ({ wch: Math.max(h.length + 2, 16) }));
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, sheet, "Containers");
+  XLSX.writeFile(workbook, "container-import-template.xlsx");
+}
diff --git a/apps/edr-freight-web/portal/src/pages/settings/NationalitySelect.tsx b/apps/edr-freight-web/portal/src/pages/settings/NationalitySelect.tsx
index 5b779847a..2115ec083 100644
--- a/apps/edr-freight-web/portal/src/pages/settings/NationalitySelect.tsx
+++ b/apps/edr-freight-web/portal/src/pages/settings/NationalitySelect.tsx
@@ -26,7 +26,7 @@ export default function NationalitySelect({
     <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="md">
       <RoleCard
         label="Ethiopian Company"
-        description="Registered in Ethiopia. You'll provide a TIN certificate, commercial license and national ID."
+        description="Registered in Ethiopia. You'll provide a TIN certificate, commercial registration and national ID."
         icon={<MapPin size={22} />}
         selected={value === "ethiopian"}
         onClick={() => onChange("ethiopian")}
diff --git a/apps/edr-freight-web/portal/src/services/api.ts b/apps/edr-freight-web/portal/src/services/api.ts
index bad712689..04aaf4153 100644
--- a/apps/edr-freight-web/portal/src/services/api.ts
+++ b/apps/edr-freight-web/portal/src/services/api.ts
@@ -77,6 +77,9 @@ import type {
   SetPasswordPayload,
   SignupPayload,
   SignupResponse,
+  ForgotPasswordRequestPayload,
+  ForgotPasswordVerifyPayload,
+  ResetTicket,
 } from "@/types/auth";
 
 // ---------------------------------------------------------------------------
@@ -110,6 +113,21 @@ export const api = {
       "setPassword",
       authService.setPassword,
     ),
+    requestPasswordReset: endpoint<ForgotPasswordRequestPayload, void>(
+      "auth",
+      "requestPasswordReset",
+      authService.requestPasswordReset,
+    ),
+    verifyPasswordResetOtp: endpoint<ForgotPasswordVerifyPayload, ResetTicket>(
+      "auth",
+      "verifyPasswordResetOtp",
+      authService.verifyPasswordResetOtp,
+    ),
+    resetPassword: endpoint<SetPasswordPayload, void>(
+      "auth",
+      "resetPassword",
+      authService.resetPassword,
+    ),
     checkAvailability: endpoint<CheckAvailabilityPayload, CheckAvailabilityResponse>(
       "auth",
       "checkAvailability",
diff --git a/apps/edr-freight-web/portal/src/services/auth.service.ts b/apps/edr-freight-web/portal/src/services/auth.service.ts
index 3f9ef4e53..3b113878d 100644
--- a/apps/edr-freight-web/portal/src/services/auth.service.ts
+++ b/apps/edr-freight-web/portal/src/services/auth.service.ts
@@ -3,11 +3,14 @@ import type {
   AuthUser,
   CheckAvailabilityPayload,
   CheckAvailabilityResponse,
+  ForgotPasswordRequestPayload,
+  ForgotPasswordVerifyPayload,
   GenerateVerificationCodePayload,
   LoginPayload,
   LoginResponse,
   OtpPayload,
   OtpResponse,
+  ResetTicket,
   SetPasswordPayload,
   SignupPayload,
   SignupResponse,
@@ -53,6 +56,31 @@ export const authService = {
     return res.data.data;
   },
 
+  // The three calls below drive the unauthenticated forgot-password flow.
+  // Responses under /api/auth are *flattened* by the API's response
+  // interceptor ({ success, ...payload }), so there is no `.data.data` here.
+
+  requestPasswordReset: async (body: ForgotPasswordRequestPayload) => {
+    await client.post(URL_CONSTANTS.AUTH.FORGOT_PASSWORD_REQUEST, body);
+  },
+
+  verifyPasswordResetOtp: async (body: ForgotPasswordVerifyPayload) => {
+    const res = await client.post<ResetTicket>(
+      URL_CONSTANTS.AUTH.FORGOT_PASSWORD_VERIFY,
+      body,
+    );
+    return { userId: res.data.userId, verificationCode: res.data.verificationCode };
+  },
+
+  /**
+   * Spend the reset ticket. Distinct from `setPassword` above, which the
+   * authenticated post-signup flow drives through `useAuth` — this one carries
+   * its own userId/verificationCode and never touches the session.
+   */
+  resetPassword: async (body: SetPasswordPayload) => {
+    await client.patch(URL_CONSTANTS.USERS.SET_PASSWORD, body);
+  },
+
   checkAvailability: async (params: CheckAvailabilityPayload) => {
     const res = await client.get<CheckAvailabilityResponse>(
       URL_CONSTANTS.USERS.CHECK_AVAILABILITY,
diff --git a/apps/edr-freight-web/portal/src/types/auth.ts b/apps/edr-freight-web/portal/src/types/auth.ts
index 04357a9ca..2e9a0b611 100644
--- a/apps/edr-freight-web/portal/src/types/auth.ts
+++ b/apps/edr-freight-web/portal/src/types/auth.ts
@@ -63,6 +63,25 @@ export interface SetPasswordPayload {
   verificationCode: string;
 }
 
+/** The channel a password-reset code is delivered over. */
+export type ResetChannel = "email" | "phone";
+
+export interface ForgotPasswordRequestPayload {
+  /** Email, username, or E.164 phone — whatever the user typed, normalised. */
+  identifier: string;
+  channel: ResetChannel;
+}
+
+export interface ForgotPasswordVerifyPayload extends ForgotPasswordRequestPayload {
+  otp: string;
+}
+
+/** Single-use ticket to spend on `PATCH /api/auth/set-password`. */
+export interface ResetTicket {
+  userId: string;
+  verificationCode: string;
+}
+
 export interface GenerateVerificationCodePayload {
   email: string;
   phoneNumber: string;
diff --git a/apps/edr-freight-web/portal/src/utils/identifier.ts b/apps/edr-freight-web/portal/src/utils/identifier.ts
new file mode 100644
index 000000000..72677f73c
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/utils/identifier.ts
@@ -0,0 +1,22 @@
+/** Normalise Ethiopian local phone (09…/07…) to E.164; pass email through unchanged. */
+export function normaliseIdentifier(raw: string): string {
+  const v = raw.trim();
+  const digits = v.replace(/\D/g, "");
+  if (digits.length >= 9 && (v.startsWith("0") || v.startsWith("+251"))) {
+    const local = digits.startsWith("251") ? digits.slice(3) : digits.replace(/^0/, "");
+    return `+251${local}`;
+  }
+  return v.toLowerCase();
+}
+
+/** Mask all but the first 7 chars of an E.164 phone for display. */
+export const maskPhone = (p: string) =>
+  p.length > 4 ? `${p.slice(0, 7)}${"*".repeat(Math.max(0, p.length - 7))}` : p;
+
+/** Mask the local part of an email for display (j***e@example.com). */
+export const maskEmail = (email: string) => {
+  const [local, domain] = email.split("@");
+  if (!local || !domain) return email;
+  if (local.length <= 2) return `${local[0] ?? ""}***@${domain}`;
+  return `${local[0]}***${local[local.length - 1]}@${domain}`;
+};
diff --git a/apps/edr-freight-web/portal/src/utils/passwordSchema.ts b/apps/edr-freight-web/portal/src/utils/passwordSchema.ts
new file mode 100644
index 000000000..207d9dc2b
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/utils/passwordSchema.ts
@@ -0,0 +1,38 @@
+import { z } from "zod";
+
+/** Live checklist shown under the password field. Mirrors {@link passwordField}. */
+export const passwordRequirements = [
+  { label: "At least 8 characters", test: (v: string) => v.length >= 8 },
+  { label: "One uppercase letter", test: (v: string) => /[A-Z]/.test(v) },
+  { label: "One lowercase letter", test: (v: string) => /[a-z]/.test(v) },
+  { label: "One number", test: (v: string) => /\d/.test(v) },
+  {
+    label: "One special character",
+    test: (v: string) => /[^A-Za-z0-9]/.test(v),
+  },
+] as const;
+
+/**
+ * Must stay in step with IAM's `@IsStrongPassword()` on `InitialResetPasswordDto`
+ * — a password this accepts but the API rejects surfaces as an opaque 400.
+ */
+export const passwordField = z
+  .string()
+  .min(8, "Password must be at least 8 characters")
+  .regex(/[A-Z]/, "Password must include an uppercase letter")
+  .regex(/[a-z]/, "Password must include a lowercase letter")
+  .regex(/\d/, "Password must include a number")
+  .regex(/[^A-Za-z0-9]/, "Password must include a special character");
+
+export const confirmPasswordField = z
+  .string()
+  .min(1, "Please confirm your password");
+
+export const samePassword = (data: {
+  password: string;
+  confirmPassword: string;
+}) => data.password === data.confirmPassword;
+
+/** Every requirement in {@link passwordRequirements} is satisfied. */
+export const meetsAllRequirements = (value: string) =>
+  passwordRequirements.every((r) => r.test(value));
diff --git a/apps/edr-passenger-api/src/modules/agents/agents.controller.ts b/apps/edr-passenger-api/src/modules/agents/agents.controller.ts
index d8be18e74..1f7fcd288 100644
--- a/apps/edr-passenger-api/src/modules/agents/agents.controller.ts
+++ b/apps/edr-passenger-api/src/modules/agents/agents.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Patch, Post, Query, Request, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Patch, Post, Query, Request, UseGuards } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
 import { AgentsService } from './agents.service';
 import { CreateAgentDto, CreateAgentBookingDto, OpenShiftDto, CloseShiftDto } from './agents.dto';
@@ -34,6 +34,12 @@ export class AgentsController {
   updateAgent(@Param('id') id: string, @Body() dto: Partial<CreateAgentDto> & { active?: boolean }) {
     return this.service.updateAgent(id, dto);
   }
+
+  @Delete(':id')
+  @ApiOperation({ summary: 'Delete agent profile' })
+  deleteAgent(@Param('id') id: string) {
+    return this.service.deleteAgent(id);
+  }
   @Post('bookings')
   @ApiOperation({ summary: 'Create agent booking with cash payment' })
   createBooking(@Body() dto: CreateAgentBookingDto) {
diff --git a/apps/edr-passenger-api/src/modules/agents/agents.service.ts b/apps/edr-passenger-api/src/modules/agents/agents.service.ts
index cd17da441..4ba7afcf1 100644
--- a/apps/edr-passenger-api/src/modules/agents/agents.service.ts
+++ b/apps/edr-passenger-api/src/modules/agents/agents.service.ts
@@ -210,4 +210,11 @@ export class AgentsService {
       },
     });
   }
+
+  async deleteAgent(id: string) {
+    const agent = await this.prisma.agent.findUnique({ where: { id } });
+    if (!agent) throw new NotFoundException('Agent not found');
+    await this.prisma.agent.delete({ where: { id } });
+    return { deleted: true };
+  }
 }
diff --git a/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.controller.ts b/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.controller.ts
index 8d01e7113..551cc8881 100644
--- a/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.controller.ts
+++ b/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, Param, Patch, Post, Query, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Patch, Post, Query, Request, UseGuards } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
 import { IsInt, IsPositive, IsString } from 'class-validator';
 import { ExcessBaggageService } from './excess-baggage.service';
@@ -26,7 +26,8 @@ export class ExcessBaggageAgentController {
 
   @Post()
   @ApiOperation({ summary: 'Log excess baggage charge and optionally collect cash' })
-  logCharge(@Body() dto: LogExcessBaggageDto) {
+  logCharge(@Request() req: any, @Body() dto: LogExcessBaggageDto) {
+    dto.agentId = req.user?.id ?? req.user?.sub ?? dto.agentId;
     return this.service.logCharge(dto);
   }
 
@@ -50,24 +51,6 @@ export class ExcessBaggageAgentController {
     });
   }
 
-  @Get(':id')
-  @ApiOperation({ summary: 'Get a single charge by ID (agent polling)' })
-  getCharge(@Param('id') id: string) {
-    return this.service.getCharge(id);
-  }
-
-  @Post(':id/resend')
-  @ApiOperation({ summary: 'Resend payment link (extends expiry by 30 min)' })
-  resendLink(@Param('id') id: string) {
-    return this.service.resendLink(id);
-  }
-
-  @Patch(':id/waive')
-  @ApiOperation({ summary: 'Waive a charge (supervisor only)' })
-  waiveCharge(@Param('id') id: string, @Body() dto: WaiveChargeDto) {
-    return this.service.waiveCharge(id, dto);
-  }
-
   @Get('allowances')
   @ApiOperation({ summary: 'List all baggage allowance rules' })
   getAllowances() {
@@ -92,6 +75,24 @@ export class ExcessBaggageAgentController {
     return this.service.deleteAllowance(id);
   }
 
+  @Get(':id')
+  @ApiOperation({ summary: 'Get a single charge by ID (agent polling)' })
+  getCharge(@Param('id') id: string) {
+    return this.service.getCharge(id);
+  }
+
+  @Post(':id/resend')
+  @ApiOperation({ summary: 'Resend payment link (extends expiry by 30 min)' })
+  resendLink(@Param('id') id: string) {
+    return this.service.resendLink(id);
+  }
+
+  @Patch(':id/waive')
+  @ApiOperation({ summary: 'Waive a charge (supervisor only)' })
+  waiveCharge(@Param('id') id: string, @Body() dto: WaiveChargeDto) {
+    return this.service.waiveCharge(id, dto);
+  }
+
   @Delete(':id')
   @ApiOperation({ summary: 'Delete excess baggage charge (admin only)' })
   deleteCharge(@Param('id') id: string) {
diff --git a/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.dto.ts b/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.dto.ts
index 58bf2bf84..4379ae28d 100644
--- a/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.dto.ts
+++ b/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.dto.ts
@@ -3,7 +3,8 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 
 export class LogExcessBaggageDto {
   @ApiProperty({ example: 'booking-uuid' }) @IsString() bookingId: string;
-  @ApiProperty({ example: 'agent-uuid' }) @IsString() agentId: string;
+  @ApiPropertyOptional({ example: 'agent-uuid', description: 'Injected from IAM token; optional override' })
+  @IsOptional() @IsString() agentId?: string;
   @ApiProperty({ example: 7, description: 'Excess weight in kg above the free allowance' })
   @IsInt() @IsPositive() excessWeightKg: number;
   @ApiPropertyOptional({ description: 'Collect cash now instead of sending a payment link' })
diff --git a/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.service.ts b/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.service.ts
index 24e09b87c..30ab0fd5e 100644
--- a/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.service.ts
+++ b/apps/edr-passenger-api/src/modules/excess-baggage/excess-baggage.service.ts
@@ -75,7 +75,7 @@ export class ExcessBaggageService {
     const charge = await this.prisma.excessBaggageCharge.create({
       data: {
         bookingId: dto.bookingId,
-        agentId: dto.agentId,
+        agentId: dto.agentId ?? '',
         excessWeightKg: dto.excessWeightKg,
         feePerKgMinor,
         totalMinor,
diff --git a/apps/edr-passenger-api/src/modules/search/search.service.ts b/apps/edr-passenger-api/src/modules/search/search.service.ts
index 4de0f0d21..a28be295e 100644
--- a/apps/edr-passenger-api/src/modules/search/search.service.ts
+++ b/apps/edr-passenger-api/src/modules/search/search.service.ts
@@ -154,43 +154,54 @@ export class SearchService {
   ) {
     const [y, m, d] = dateStr.split('-').map(Number);
     const requestedDate = new Date(y, m - 1, d, 0, 0, 0, 0);
-
-    const now = new Date();
-    const daysBefore = Math.min(7, Math.floor(requestedDate.getTime() / 86_400_000));
-    const daysAfter = 14 - daysBefore;
-
-    const windowStart = new Date(requestedDate);
-    windowStart.setDate(windowStart.getDate() - daysBefore);
-    if (windowStart < now) windowStart.setTime(now.getTime());
-
-    const windowEnd = new Date(requestedDate);
-    windowEnd.setDate(windowEnd.getDate() + daysAfter + 1);
-
-    const totalPassengers = adultCount + (childCount ?? 0);
-
     const requestedNextDay = new Date(y, m - 1, d + 1, 0, 0, 0, 0);
+    const now = new Date();
+    const totalPassengers = adultCount + (childCount ?? 0);
+    const NEEDED = 3;
 
-    const schedules = await this.prisma.trainSchedule.findMany({
-      where: {
-        status: 'SCHEDULED',
-        isPackageOnly: false,
-        OR: [
-          { departureAt: { gte: windowStart, lt: requestedDate } },
-          { departureAt: { gte: requestedNextDay < now ? now : requestedNextDay, lt: windowEnd } },
-        ],
-        stopTimes: { some: { stationId: originStationId } },
-        coachAssignments: { some: {} },
-      },
-      include: SCHEDULE_INCLUDE,
-      orderBy: { departureAt: 'asc' },
-    });
+    const baseWhere = {
+      status: 'SCHEDULED',
+      isPackageOnly: false,
+      stopTimes: { some: { stationId: originStationId } },
+      coachAssignments: { some: {} },
+    } as const;
 
-    const results = await Promise.all(
-      schedules.map(schedule =>
-        this.buildScheduleResult(schedule as any, originStationId, destinationStationId, totalPassengers, nationality)
-      )
-    );
-    return results.filter((r): r is NonNullable<typeof r> => !!r && r.hasAvailability);
+    // Fetch candidates before and after in parallel; take more than needed to
+    // account for routes that don't serve the destination or have no availability.
+    const FETCH_LIMIT = NEEDED * 5;
+
+    const [beforeCandidates, afterCandidates] = await Promise.all([
+      this.prisma.trainSchedule.findMany({
+        where: { ...baseWhere, departureAt: { gte: now < requestedDate ? now : new Date(0), lt: requestedDate } },
+        include: SCHEDULE_INCLUDE,
+        orderBy: { departureAt: 'desc' },
+        take: FETCH_LIMIT,
+      }),
+      this.prisma.trainSchedule.findMany({
+        where: { ...baseWhere, departureAt: { gte: requestedNextDay > now ? requestedNextDay : now } },
+        include: SCHEDULE_INCLUDE,
+        orderBy: { departureAt: 'asc' },
+        take: FETCH_LIMIT,
+      }),
+    ]);
+
+    const pickN = async (candidates: typeof beforeCandidates, limit: number) => {
+      const out: NonNullable<Awaited<ReturnType<typeof this.buildScheduleResult>>>[] = [];
+      for (const schedule of candidates) {
+        if (out.length >= limit) break;
+        const r = await this.buildScheduleResult(schedule as any, originStationId, destinationStationId, totalPassengers, nationality);
+        if (r?.hasAvailability) out.push(r);
+      }
+      return out;
+    };
+
+    const [before, after] = await Promise.all([
+      pickN(beforeCandidates, NEEDED),
+      pickN(afterCandidates, NEEDED),
+    ]);
+
+    // before was fetched desc (closest first); reverse so result is chronological
+    return [...before.reverse(), ...after];
   }
 
   private async searchSchedules(
@@ -415,7 +426,7 @@ export class SearchService {
       }
     }
 
-    const coachTypes   = this.buildCoachTypeDetails(schedule, faresByClass);
+    const coachTypes   = this.buildCoachTypeDetails(schedule, faresByClass, nationality);
     const legDepartureAt = originStop.plannedDepartureAt ?? schedule.departureAt;
     const legArrivalAt   = destStop.plannedArrivalAt   ?? schedule.arrivalAt;
 
@@ -638,6 +649,10 @@ export class SearchService {
   ): Promise<Array<{ seatClassName: string; baseFareMinor: number; displayCurrency: Currency; displayAmountMinor: number }>> {
     const displayCurrency = resolveCurrencyFromNationality(nationality);
 
+    const nationalityUpper = (nationality ?? '').toUpperCase();
+    const nationalityType = (nationalityUpper === 'ETHIOPIAN' || nationalityUpper === 'DJIBOUTIAN')
+      ? 'LOCAL' : 'INTERNATIONAL';
+
     // Collect seat class IDs from the schedule include for the ID set,
     // but fetch fresh records from DB so updated baseFareMinor is always current
     const seatClassIdSet = new Set<string>();
@@ -647,7 +662,14 @@ export class SearchService {
       }
     }
     const freshSeatClasses = await this.prisma.seatClass.findMany({
-      where: { id: { in: Array.from(seatClassIdSet) }, isActive: true },
+      where: {
+        id: { in: Array.from(seatClassIdSet) },
+        isActive: true,
+        OR: [
+          { nationalityType: null },
+          { nationalityType: nationalityType },
+        ],
+      },
     });
     const seatClassMap = new Map(freshSeatClasses.map(sc => [sc.id, sc]));
     const seatClasses = freshSeatClasses.sort((a, b) => a.baseFareMinor - b.baseFareMinor);
@@ -725,6 +747,7 @@ export class SearchService {
   private buildCoachTypeDetails(
     schedule: ScheduleWithIncludes,
     faresByClass: Array<{ seatClassName: string; baseFareMinor: number; displayCurrency: Currency; displayAmountMinor: number }>,
+    nationality?: string,
   ): Array<{
     coachTypeId: string;
     coachTypeName: string;
@@ -749,8 +772,16 @@ export class SearchService {
         });
       }
 
+      const nationalityUpper = (nationality ?? '').toUpperCase();
+      const resolvedNationalityType = (nationalityUpper === 'ETHIOPIAN' || nationalityUpper === 'DJIBOUTIAN')
+        ? 'LOCAL' : 'INTERNATIONAL';
+
       const entry = coachTypeMap.get(coachType.id)!;
-      coachType.seatClasses?.forEach((sc: any) => entry.classNames.add(sc.name));
+      coachType.seatClasses?.forEach((sc: any) => {
+        // Exclude classes that belong to the wrong nationality type
+        if (sc.nationalityType && sc.nationalityType !== resolvedNationalityType) return;
+        if (faresByClass.some(f => f.seatClassName === sc.name)) entry.classNames.add(sc.name);
+      });
     }
 
     const result = [];
@@ -769,6 +800,7 @@ export class SearchService {
         .filter((c): c is { name: string; baseFareMinor: number; displayCurrency: Currency; displayAmountMinor: number } => c !== null)
         .sort((a, b) => a.baseFareMinor - b.baseFareMinor);
 
+      if (classes.length === 0) continue;
       result.push({
         coachTypeId: coachType.id,
         coachTypeName: coachType.name,
diff --git a/apps/edr-passenger-web/backoffice/src/app/agents/page.tsx b/apps/edr-passenger-web/backoffice/src/app/agents/page.tsx
index 39e02dc3c..9efd7ab19 100644
--- a/apps/edr-passenger-web/backoffice/src/app/agents/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/agents/page.tsx
@@ -2,11 +2,12 @@
 
 import { useState } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { Plus, Edit, Eye } from 'lucide-react';
+import { Plus, Edit, Eye, Trash2 } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
 import ActionButton from '@/components/ui/ActionButton';
 import Badge from '@/components/ui/Badge';
 import Modal from '@/components/ui/Modal';
+import ConfirmDialog from '@/components/ui/ConfirmDialog';
 import { agentsApi, apiClient } from '@/lib/api';
 import { formatCurrency, formatDateTime } from '@/lib/utils';
 import { useAuthStore } from '@/lib/auth-store';
@@ -48,6 +49,19 @@ export default function AgentsPage() {
   const [editingAgent, setEditingAgent] = useState<any>(null);
   const [editError, setEditError] = useState<string | null>(null);
 
+  const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; agent: any | null }>({ isOpen: false, agent: null });
+  const [deleteError, setDeleteError] = useState<string | null>(null);
+
+  const deleteMutation = useMutation({
+    mutationFn: (id: string) => agentsApi.delete(id),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['agents'] });
+      setDeleteConfirm({ isOpen: false, agent: null });
+      setDeleteError(null);
+    },
+    onError: (e: any) => setDeleteError(e?.response?.data?.message || e?.message || 'Failed to delete agent'),
+  });
+
   const editMutation = useMutation({
     mutationFn: ({ id, ...data }: any) => apiClient.patch(`/agents/${id}`, data),
     onSuccess: () => {
@@ -122,6 +136,12 @@ export default function AgentsPage() {
       variant: 'secondary' as const,
       icon: Eye,
     },
+    {
+      label: 'Delete',
+      onClick: (agent: any) => { setDeleteError(null); setDeleteConfirm({ isOpen: true, agent }); },
+      variant: 'danger' as const,
+      icon: Trash2,
+    },
   ];
 
   return (
@@ -169,6 +189,18 @@ export default function AgentsPage() {
         emptyMessage="No agents found"
       />
 
+      <ConfirmDialog
+        isOpen={deleteConfirm.isOpen}
+        onClose={() => { setDeleteConfirm({ isOpen: false, agent: null }); setDeleteError(null); }}
+        onConfirm={async () => { if (deleteConfirm.agent) await deleteMutation.mutateAsync(deleteConfirm.agent.id); }}
+        title="Delete Agent"
+        message={`Are you sure you want to delete agent ${deleteConfirm.agent?.agentCode}? This action cannot be undone.`}
+        confirmText="Delete"
+        isDanger
+        isLoading={deleteMutation.isPending}
+        error={deleteError ?? undefined}
+      />
+
       {/* Agent Details Modal */}
       <Modal isOpen={!!selected} onClose={() => setSelected(null)} title="Agent Details" size="xl">
         {selected && (() => {
diff --git a/apps/edr-passenger-web/backoffice/src/app/excess-baggage/page.tsx b/apps/edr-passenger-web/backoffice/src/app/excess-baggage/page.tsx
index 7b5db209a..3c13e952b 100644
--- a/apps/edr-passenger-web/backoffice/src/app/excess-baggage/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/excess-baggage/page.tsx
@@ -2,13 +2,14 @@
 
 import { useState } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { RefreshCw, Send, Trash2 } from 'lucide-react';
+import { Plus, RefreshCw, Send, Trash2 } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
 import Badge from '@/components/ui/Badge';
 import ActionButton from '@/components/ui/ActionButton';
 import Modal from '@/components/ui/Modal';
 import { excessBaggageApi } from '@/lib/api';
 import { formatDateTime, formatCurrency } from '@/lib/utils';
+import { useAuthStore } from '@/lib/auth-store';
 
 const STATUS_VARIANT: Record<string, any> = {
   PENDING: 'PENDING',
@@ -22,9 +23,16 @@ export default function ExcessBaggagePage() {
   const queryClient = useQueryClient();
   const [filters, setFilters] = useState({ status: '', bookingRef: '', dateFrom: '', dateTo: '', page: '1' });
   const [showExtraFilters, setShowExtraFilters] = useState(false);
+  const user = useAuthStore((s) => s.user);
   const [waiveModal, setWaiveModal] = useState<any>(null);
   const [waiveReason, setWaiveReason] = useState('');
   const [waiveError, setWaiveError] = useState<string | null>(null);
+  const [logModal, setLogModal] = useState(false);
+  const [logForm, setLogForm] = useState({ bookingId: '', excessWeightKg: '', collectCash: false });
+  const [logError, setLogError] = useState<string | null>(null);
+  const [resendModal, setResendModal] = useState<any>(null);
+  const [resendSuccess, setResendSuccess] = useState(false);
+  const [resendError, setResendError] = useState<string | null>(null);
 
   const { data, isLoading } = useQuery({
     queryKey: ['excess-baggage', filters],
@@ -37,6 +45,17 @@ export default function ExcessBaggagePage() {
     }),
   });
 
+  const logMutation = useMutation({
+    mutationFn: (data: any) => excessBaggageApi.logCharge(data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['excess-baggage'] });
+      setLogModal(false);
+      setLogForm({ bookingId: '', excessWeightKg: '', collectCash: false });
+      setLogError(null);
+    },
+    onError: (e: any) => setLogError(e?.response?.data?.message || e?.message || 'Failed to log charge'),
+  });
+
   const waiveMutation = useMutation({
     mutationFn: ({ id, reason }: { id: string; reason: string }) =>
       excessBaggageApi.waive(id, { waivedBy: 'supervisor', waivedReason: reason }),
@@ -51,7 +70,12 @@ export default function ExcessBaggagePage() {
 
   const resendMutation = useMutation({
     mutationFn: (id: string) => excessBaggageApi.resendLink(id),
-    onSuccess: () => queryClient.invalidateQueries({ queryKey: ['excess-baggage'] }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['excess-baggage'] });
+      setResendSuccess(true);
+      setResendError(null);
+    },
+    onError: (e: any) => setResendError(e?.response?.data?.message || e?.message || 'Failed to resend link'),
   });
 
   const deleteMutation = useMutation({
@@ -115,7 +139,7 @@ export default function ExcessBaggagePage() {
       label: 'Resend Link',
       icon: Send,
       variant: 'secondary' as const,
-      onClick: (c: any) => resendMutation.mutate(c.id),
+      onClick: (c: any) => { setResendModal(c); setResendSuccess(false); setResendError(null); },
       show: (c: any) => c.status === 'PENDING',
     },
     {
@@ -145,6 +169,9 @@ export default function ExcessBaggagePage() {
           <h1 className="text-2xl font-bold text-foreground">Excess Lugagge</h1>
           <p className="text-muted-foreground">Track and manage excess luggage charges at boarding</p>
         </div>
+        <ActionButton icon={Plus} onClick={() => { setLogModal(true); setLogError(null); setLogForm({ bookingId: '', excessWeightKg: '', collectCash: false }); }}>
+          Log Excess Luggage
+        </ActionButton>
       </div>
 
       <div className="card">
@@ -194,6 +221,104 @@ export default function ExcessBaggagePage() {
         emptyMessage="No excess baggage charges found"
       />
 
+      {/* Log Excess Luggage Modal */}
+      <Modal isOpen={logModal} onClose={() => setLogModal(false)} title="Log Excess Luggage" size="sm">
+        <div className="space-y-4">
+          {user && (
+            <div className="text-sm text-muted-foreground">
+              Logging as agent: <span className="font-semibold text-foreground">{user.fullName}</span>
+            </div>
+          )}
+          <div>
+            <label className="label">Booking ID</label>
+            <input
+              className="input"
+              placeholder="Booking UUID"
+              value={logForm.bookingId}
+              onChange={(e) => setLogForm({ ...logForm, bookingId: e.target.value })}
+            />
+          </div>
+          <div>
+            <label className="label">Excess Weight (kg)</label>
+            <input
+              type="number"
+              min="1"
+              className="input"
+              placeholder="e.g. 5"
+              value={logForm.excessWeightKg}
+              onChange={(e) => setLogForm({ ...logForm, excessWeightKg: e.target.value })}
+            />
+          </div>
+          <label className="flex items-center gap-2 text-sm cursor-pointer">
+            <input
+              type="checkbox"
+              checked={logForm.collectCash}
+              onChange={(e) => setLogForm({ ...logForm, collectCash: e.target.checked })}
+            />
+            Collect cash now (no payment link sent)
+          </label>
+          {!logForm.collectCash && (
+            <p className="text-xs text-muted-foreground">
+              A payment link will be sent to the passenger's email and phone on file.
+            </p>
+          )}
+          {logError && <p className="text-sm text-red-600 dark:text-red-400">{logError}</p>}
+          <div className="flex justify-end gap-2 pt-2">
+            <ActionButton variant="secondary" onClick={() => setLogModal(false)}>Cancel</ActionButton>
+            <ActionButton
+              loading={logMutation.isPending}
+              onClick={() => {
+                if (!logForm.bookingId.trim() || !logForm.excessWeightKg) {
+                  setLogError('Booking ID and excess weight are required');
+                  return;
+                }
+                logMutation.mutate({
+                  bookingId: logForm.bookingId.trim(),
+                  excessWeightKg: parseInt(logForm.excessWeightKg),
+                  collectCash: logForm.collectCash,
+                });
+              }}
+            >
+              {logForm.collectCash ? 'Log & Collect Cash' : 'Log & Send Payment Link'}
+            </ActionButton>
+          </div>
+        </div>
+      </Modal>
+
+      {/* Resend Link Modal */}
+      <Modal isOpen={!!resendModal} onClose={() => setResendModal(null)} title="Resend Payment Link" size="sm">
+        {resendModal && (
+          <div className="space-y-4">
+            {resendSuccess ? (
+              <div className="rounded-lg bg-green-50 dark:bg-green-900/20 p-4 text-sm text-green-800 dark:text-green-200">
+                ✓ Payment link resent successfully. Expiry extended by 20 minutes.
+              </div>
+            ) : (
+              <>
+                <p className="text-sm text-muted-foreground">
+                  Resend payment link for booking{' '}
+                  <span className="font-mono font-semibold text-foreground">{resendModal.booking?.bookingRef}</span>?
+                </p>
+                <div className="text-sm space-y-1">
+                  {resendModal.contactPhone && <div className="text-muted-foreground">📱 {resendModal.contactPhone}</div>}
+                  {resendModal.contactEmail && <div className="text-muted-foreground">✉ {resendModal.contactEmail}</div>}
+                </div>
+                <p className="text-xs text-muted-foreground">Amount: <span className="font-semibold">{formatCurrency(resendModal.totalMinor, resendModal.currency)}</span>. Expiry will be extended by 20 minutes.</p>
+                {resendError && <p className="text-sm text-red-600 dark:text-red-400">{resendError}</p>}
+              </>
+            )}
+            <div className="flex justify-end gap-2 pt-2">
+              <ActionButton variant="secondary" onClick={() => setResendModal(null)}>Close</ActionButton>
+              {!resendSuccess && (
+                <ActionButton icon={Send} loading={resendMutation.isPending} onClick={() => resendMutation.mutate(resendModal.id)}>
+                  Resend
+                </ActionButton>
+              )}
+            </div>
+          </div>
+        )}
+      </Modal>
+
       {/* Waive Modal */}
       <Modal
         isOpen={!!waiveModal}
diff --git a/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx b/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx
index cff41ede2..e2c0fefb5 100644
--- a/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/passengers/page.tsx
@@ -140,7 +140,7 @@ export default function PassengersPage() {
         </div>
       ),
     },
-    { key: 'phone', label: 'Phone', sortable: true, render: (p: any) => p.phone || 'N/A'  },
+    { key: 'phone', label: 'Phone', sortable: true, render: (p: any) => p.phone || p.passenger?.user?.phone || '—' },
     { key: 'nationality', label: 'Nationality', sortable: true, render: (p: any) => p.nationality || 'N/A' },
     { key: 'gender', label: 'Gender', sortable: true, render: (p: any) => p.gender || 'N/A' },
     { key: 'dateOfBirth', label: 'Date of Birth', sortable: true, render: (p: any) => p.dateOfBirth ? formatDate(p.dateOfBirth) : 'N/A' },
diff --git a/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx b/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
index a90add7f1..4ef9b97ed 100644
--- a/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
@@ -9,6 +9,7 @@ import Modal from '@/components/ui/Modal';
 import ConfirmDialog from '@/components/ui/ConfirmDialog';
 import { apiClient } from '@/lib/api-client';
 import { routeCoachTemplatesApi } from '@/lib/api';
+import { formatDateTime } from '@/lib/utils';
 
 interface Schedule {
   id: string;
@@ -440,7 +441,7 @@ export default function SchedulesPage() {
       label: 'Departure',
       sortable: true,
       render: (schedule: Schedule) => (
-        <span className="font-mono text-sm">{new Date(schedule.departureAt).toLocaleString()}</span>
+        <span className="font-mono text-sm">{formatDateTime(schedule.departureAt)}</span>
       ),
     },
     {
@@ -448,7 +449,7 @@ export default function SchedulesPage() {
       label: 'Arrival',
       sortable: true,
       render: (schedule: Schedule) => (
-        <span className="font-mono text-sm">{new Date(schedule.arrivalAt).toLocaleString()}</span>
+        <span className="font-mono text-sm">{formatDateTime(schedule.arrivalAt)}</span>
       ),
     },
     {
@@ -641,7 +642,7 @@ export default function SchedulesPage() {
           }
         }}
         title="Cancel Schedule"
-        message={`Cancel the schedule departing ${cancelConfirm.item ? new Date(cancelConfirm.item.departureAt).toLocaleString() : ''}? Passengers with bookings will need to be notified separately.`}
+        message={`Cancel the schedule departing ${cancelConfirm.item ? formatDateTime(cancelConfirm.item.departureAt) : ''}? Passengers with bookings will need to be notified separately.`}
         confirmText="Cancel Schedule"
         isDanger={true}
         isLoading={cancelScheduleMutation.isPending}
@@ -656,7 +657,7 @@ export default function SchedulesPage() {
           deleteConfirm.isBulk
             ? `Are you sure you want to delete ${Array.isArray(deleteConfirm.item) ? deleteConfirm.item.length : 0} schedule(s)? This action cannot be undone.`
             : `Are you sure you want to delete this schedule departing on ${
-                deleteConfirm.item ? new Date(deleteConfirm.item.departureAt).toLocaleString() : ''
+                deleteConfirm.item ? formatDateTime(deleteConfirm.item.departureAt) : ''
               }?`
         }
         confirmText="Delete"
diff --git a/apps/edr-passenger-web/backoffice/src/app/tariff-rates/page.tsx b/apps/edr-passenger-web/backoffice/src/app/tariff-rates/page.tsx
index 653ffddc3..ad10052fd 100644
--- a/apps/edr-passenger-web/backoffice/src/app/tariff-rates/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/tariff-rates/page.tsx
@@ -166,10 +166,13 @@ export default function TariffRatesPage() {
     },
     {
       key: 'coachType', label: 'Coach Type',
-      render: (c: any) => <span className="text-sm">{c.coachType?.name || c.coachTypeId}</span>,
+      render: (c: any) => {
+        const ct = coachTypesArray.find((t: any) => t.id === c.coachTypeId);
+        return <span className="text-sm">{ct ? `${ct.code} — ${ct.name}` : c.coachTypeId}</span>;
+      },
     },
     {
-      key: 'bedPosition', label: 'Berth Position',
+      key: 'bedPosition', label: 'Bed Position',
       render: (c: any) => c.bedPosition
         ? <span className="font-mono text-sm">{c.bedPosition}</span>
         : <span className="text-muted-foreground text-xs">Standard</span>,
@@ -215,8 +218,9 @@ export default function TariffRatesPage() {
     },
   ];
 
-  const selectedCoachType = coachTypesArray.find((c: any) => c.id === selectedCoachTypeId);
-  const isBedCoach = selectedCoachType?.code === 'HBC' || selectedCoachType?.code === 'SBC';
+  const selectedCoachType = coachTypesArray.find((c: any) => c.id === selectedCoachTypeId)
+    ?? editingClass?.coachType;
+  const isBedCoach = selectedCoachType?.name?.toLowerCase().includes('bed') || selectedCoachType?.code?.toLowerCase().includes('bed');
 
   return (
     <div className="space-y-6">
@@ -224,7 +228,7 @@ export default function TariffRatesPage() {
         <div>
           <h1 className="text-2xl font-bold text-foreground">Tariff Rates</h1>
           <p className="text-muted-foreground">
-            Manage per-km fare rates by nationality, coach type, and berth position per the official EDR tariff policy
+            Manage per-km fare rates by nationality, coach type, and bed position per the official EDR tariff policy
           </p>
         </div>
         <ActionButton icon={Plus} onClick={() => { setEditingClass(null); setFormError(null); setShowModal(true); }}>
@@ -237,7 +241,7 @@ export default function TariffRatesPage() {
           <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
           <input
             type="text"
-            placeholder="Search by name, nationality, berth position..."
+            placeholder="Search by name, nationality, bed position..."
             className="input pl-10 w-full"
             value={search}
             onChange={(e) => setSearch(e.target.value)}
@@ -311,17 +315,17 @@ export default function TariffRatesPage() {
 
             {isBedCoach && (
               <div>
-                <label className="label">Berth Position *</label>
+                <label className="label">Bed Position *</label>
                 <select
                   className="input"
                   value={selectedBedPosition}
                   onChange={(e) => setSelectedBedPosition(e.target.value)}
                   required={isBedCoach}
                 >
-                  <option value="">Select berth position</option>
+                  <option value="">Select bed position</option>
                   {(selectedCoachType?.code === 'HBC'
                     ? BED_POSITIONS
-                    : (['UPPER', 'LOWER'] as const)
+                    : (['Upper','Middle',  'Lower'] as const)
                   ).map((pos) => (
                     <option key={pos} value={pos}>{pos}</option>
                   ))}
diff --git a/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx b/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
index 275291415..c737da4de 100644
--- a/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
@@ -38,13 +38,6 @@ export default function TicketsPage() {
   const [excessError, setExcessError] = useState<string | null>(null);
   const [excessResult, setExcessResult] = useState<any>(null);
 
-  const { data: agentData } = useQuery({
-    queryKey: ['agent-me'],
-    queryFn: () => apiClient.get<any>('/agents/me'),
-    enabled: !!user,
-    retry: false,
-  });
-
   const Field = ({ label, value, mono = false, truncate = false }: { label: string; value: string; mono?: boolean; truncate?: boolean }) => (
     <div className="bg-muted/40 rounded-lg p-3">
       <p className="text-xs text-muted-foreground mb-1">{label}</p>
@@ -133,11 +126,8 @@ export default function TicketsPage() {
   const handleExcessSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     if (!excessTicket) return;
-    const agentId = agentData?.id;
-    if (!agentId) { setExcessError('No agent profile found for your account'); return; }
     await excessMutation.mutateAsync({
       bookingId: excessTicket.booking?.id ?? excessTicket.bookingId,
-      agentId,
       excessWeightKg: parseInt(excessKg),
       collectCash: excessCollectCash,
     });
@@ -353,15 +343,12 @@ export default function TicketsPage() {
       key: 'contact',
       label: 'Contact',
       render: (ticket: any) => {
-        const phone = ticket.booking?.passenger?.phone || 'N/A';
-        const email = ticket.booking?.passenger?.email || 'N/A';
-        
+        const phone = ticket.booking?.contactPhone || ticket.booking?.passenger?.phone || '—';
+        const email = ticket.booking?.contactEmail || ticket.booking?.passenger?.email || '—';
         return (
           <div>
             <div className="font-medium">{phone}</div>
-            <div className="text-sm text-muted-foreground">
-              <div className="text-xs text-muted-foreground truncate" title={email}>{email}</div>
-            </div>
+            <div className="text-xs text-muted-foreground truncate" title={email}>{email}</div>
           </div>
         );
       },
@@ -486,7 +473,7 @@ export default function TicketsPage() {
 
   const actions = [
     {
-      label: 'Baggage',
+      label: 'Luggage',
       onClick: openExcessModal,
       variant: 'secondary' as const,
       icon: Package,
@@ -912,14 +899,9 @@ export default function TicketsPage() {
             <div className="text-sm text-muted-foreground">
               Booking: <span className="font-semibold text-foreground">{excessTicket?.booking?.bookingRef}</span>
             </div>
-            {agentData && (
+            {user && (
               <div className="text-sm text-muted-foreground">
-                Agent: <span className="font-semibold text-foreground">{agentData.agentCode}</span>
-              </div>
-            )}
-            {!agentData && (
-              <div className="text-sm text-amber-600 dark:text-amber-400">
-                ⚠ No agent profile linked to your account.
+                Agent: <span className="font-semibold text-foreground">{user.fullName}</span>
               </div>
             )}
             <div>
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/index.ts b/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
index 7824cef07..28ede1126 100644
--- a/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
@@ -216,6 +216,7 @@ export const agentsApi = {
   getById: (id: string) => apiClient.get<any>(`/agents/${id}`),
   create: (data: any) => apiClient.post<any>('/agents', data),
   update: (id: string, data: any) => apiClient.patch<any>(`/agents/${id}`, data),
+  delete: (id: string) => apiClient.delete(`/agents/${id}`),
   getShifts: (agentId: string) => apiClient.get<any[]>(`/agents/${agentId}/shifts`),
   openShift: (agentId: string, data: any) => apiClient.post<any>(`/agents/${agentId}/shifts/open`, data),
   closeShift: (shiftId: string, data: any) => apiClient.post<any>(`/agents/shifts/${shiftId}/close`, data),
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts b/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts
index f7191e83b..f94e3d05f 100644
--- a/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/passengers.ts
@@ -10,7 +10,10 @@ export const passengersApi = {
     if (filters?.role) params.append('role', filters.role);
     if (filters?.page) params.append('page', filters.page.toString());
     if (filters?.pageSize) params.append('pageSize', filters.pageSize.toString());
-    
+    if ((filters as any)?.gender) params.append('gender', (filters as any).gender);
+    if ((filters as any)?.nationality) params.append('nationality', (filters as any).nationality);
+    if ((filters as any)?.dateFrom) params.append('dateFrom', (filters as any).dateFrom);
+    if ((filters as any)?.dateTo) params.append('dateTo', (filters as any).dateTo);
     return apiClient.get<PaginatedResponse<Passenger.IPassenger>>(`/passengers?${params.toString()}`);
   },
 
@@ -21,4 +24,8 @@ export const passengersApi = {
   update: (id: string, data: Partial<Passenger.IPassenger>) => {
     return apiClient.patch<Passenger.IPassenger>(`/passengers/${id}`, data);
   },
+
+  delete: (id: string, cascade = false) => {
+    return apiClient.delete(`/passengers/${id}${cascade ? '?cascade=true' : ''}`);
+  },
 };
diff --git a/apps/edr-passenger-web/backoffice/src/lib/utils.ts b/apps/edr-passenger-web/backoffice/src/lib/utils.ts
index 7a8f8704f..40131d2c7 100644
--- a/apps/edr-passenger-web/backoffice/src/lib/utils.ts
+++ b/apps/edr-passenger-web/backoffice/src/lib/utils.ts
@@ -19,21 +19,21 @@ export const formatDateTime = (date?: string | Date | null): string => {
   if (!date) return 'N/A';
   const d = new Date(date);
   if (isNaN(d.getTime())) return 'N/A';
-  return format(d, 'MMM dd, yyyy HH:mm');
+  return format(d, 'MMM dd, yyyy h:mm a');
 };
 
 export const formatDateTimeShort = (date?: string | Date | null): string => {
   if (!date) return 'N/A';
   const d = new Date(date);
   if (isNaN(d.getTime())) return 'N/A';
-  return format(d, 'dd MMM yy HH:mm');
+  return format(d, 'dd MMM yy h:mm a');
 };
 
 export const formatDateTimeLocal = (date?: string | Date | null): string => {
   if (!date) return 'N/A';
   const d = new Date(date);
   if (isNaN(d.getTime())) return 'N/A';
-  return format(d, 'MMM dd, yyyy HH:mm');
+  return format(d, 'MMM dd, yyyy h:mm a');
 };
 
 export const getStatusColor = (status: string): string => {
diff --git a/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx
index 515eb4449..719e80f18 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx
@@ -188,7 +188,7 @@ export default function ConfirmationPage() {
   if (!bookingId || !pnr) return null;
 
   return (
-    <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12">
+    <div className="booking-page">
       <div className="container mx-auto px-4">
         <div className="max-w-6xl mx-auto">
           {/* Success Header */}
@@ -456,26 +456,29 @@ export default function ConfirmationPage() {
             </div>
           </div>
 
-          {/* Action Buttons */}
-          <div className="mb-6">
-            <button
-              onClick={handleDownloadVoucher}
-              disabled={isGeneratingVoucher}
-              className="btn-primary w-full flex items-center justify-center gap-2 relative"
-            >
-              {isGeneratingVoucher ? (
-                <>
-                  <div className="w-4 h-4 border-2 border-white border-t-transparent rounded-full animate-spin" />
-                  <span>Generating...</span>
-                </>
-              ) : (
-                <>
-                  <FileText className="w-4 h-4" />
-                  <span>Download Voucher</span>
-                </>
-              )}
-            </button>
-          </div>
+          {/* Action Buttons — voucher/ticket only makes sense once the booking is
+              actually confirmed; a pending-payment booking has no real ticket yet. */}
+          {isConfirmed && (
+            <div className="mb-6">
+              <button
+                onClick={handleDownloadVoucher}
+                disabled={isGeneratingVoucher}
+                className="btn-primary w-full flex items-center justify-center gap-2 relative"
+              >
+                {isGeneratingVoucher ? (
+                  <>
+                    <div className="w-4 h-4 border-2 border-white border-t-transparent rounded-full animate-spin" />
+                    <span>Generating...</span>
+                  </>
+                ) : (
+                  <>
+                    <FileText className="w-4 h-4" />
+                    <span>Download Voucher</span>
+                  </>
+                )}
+              </button>
+            </div>
+          )}
 
           {/* New Booking Button */}
           <button 
diff --git a/apps/edr-passenger-web/portal/src/app/booking/layout.tsx b/apps/edr-passenger-web/portal/src/app/booking/layout.tsx
index dd01d4d49..ec67ec56a 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/layout.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/layout.tsx
@@ -2,6 +2,7 @@
 
 import { usePathname } from 'next/navigation';
 import { ProgressIndicator } from '@/components/ProgressIndicator';
+import { PageTransition } from '@/components/PageTransition';
 
 export default function BookingLayout({
   children,
@@ -31,7 +32,7 @@ export default function BookingLayout({
           <ProgressIndicator currentStep={currentStep} />
         </div>
       )}
-      {children}
+      <PageTransition>{children}</PageTransition>
     </div>
   );
 }
diff --git a/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
index 814a5009e..da81c5cd8 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
@@ -13,6 +13,30 @@ import { gregorianToEthiopian, ethiopianToGregorian, ETHIOPIAN_MONTHS, getDaysIn
 
 const GC_MONTHS = ['January','February','March','April','May','June','July','August','September','October','November','December'];
 
+const COUNTRIES = [
+  'Afghanistan','Albania','Algeria','Andorra','Angola','Antigua and Barbuda','Argentina','Armenia','Australia','Austria',
+  'Azerbaijan','Bahamas','Bahrain','Bangladesh','Barbados','Belarus','Belgium','Belize','Benin','Bhutan',
+  'Bolivia','Bosnia and Herzegovina','Botswana','Brazil','Brunei','Bulgaria','Burkina Faso','Burundi','Cabo Verde','Cambodia',
+  'Cameroon','Canada','Central African Republic','Chad','Chile','China','Colombia','Comoros','Congo','Costa Rica',
+  'Croatia','Cuba','Cyprus','Czech Republic','Denmark','Dominica','Dominican Republic','Ecuador','Egypt',
+  'El Salvador','Equatorial Guinea','Eritrea','Estonia','Eswatini','Fiji','Finland','France','Gabon',
+  'Gambia','Georgia','Germany','Ghana','Greece','Grenada','Guatemala','Guinea','Guinea-Bissau','Guyana',
+  'Haiti','Honduras','Hungary','Iceland','India','Indonesia','Iran','Iraq','Ireland','Israel',
+  'Italy','Jamaica','Japan','Jordan','Kazakhstan','Kenya','Kiribati','Kuwait','Kyrgyzstan','Laos',
+  'Latvia','Lebanon','Lesotho','Liberia','Libya','Liechtenstein','Lithuania','Luxembourg','Madagascar','Malawi',
+  'Malaysia','Maldives','Mali','Malta','Marshall Islands','Mauritania','Mauritius','Mexico','Micronesia','Moldova',
+  'Monaco','Mongolia','Montenegro','Morocco','Mozambique','Myanmar','Namibia','Nauru','Nepal','Netherlands',
+  'New Zealand','Nicaragua','Niger','Nigeria','North Korea','North Macedonia','Norway','Oman','Pakistan','Palau',
+  'Palestine','Panama','Papua New Guinea','Paraguay','Peru','Philippines','Poland','Portugal','Qatar','Romania',
+  'Russia','Rwanda','Saint Kitts and Nevis','Saint Lucia','Saint Vincent and the Grenadines','Samoa','San Marino',
+  'Sao Tome and Principe','Saudi Arabia','Senegal','Serbia','Seychelles','Sierra Leone','Singapore','Slovakia',
+  'Slovenia','Solomon Islands','Somalia','South Africa','South Korea','South Sudan','Spain','Sri Lanka','Sudan',
+  'Suriname','Sweden','Switzerland','Syria','Taiwan','Tajikistan','Tanzania','Thailand','Timor-Leste','Togo',
+  'Tonga','Trinidad and Tobago','Tunisia','Turkey','Turkmenistan','Tuvalu','Uganda','Ukraine','United Arab Emirates',
+  'United Kingdom','United States','Uruguay','Uzbekistan','Vanuatu','Vatican City','Venezuela','Vietnam',
+  'Yemen','Zambia','Zimbabwe',
+] as const;
+
 function daysInGCMonth(y: number, m: number) {
   return new Date(y, m, 0).getDate();
 }
@@ -554,6 +578,12 @@ const passengerSchema = z.object({
     if (!data.passportCountry || data.passportCountry.trim().length === 0) {
       ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Issuing country is required', path: ['passportCountry'] });
     }
+    if (data.passportExpiryDate) {
+      const expiry = new Date(data.passportExpiryDate);
+      if (!isNaN(expiry.getTime()) && expiry <= new Date()) {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Passport expiry date must be in the future', path: ['passportExpiryDate'] });
+      }
+    }
   }
 });
 
@@ -994,7 +1024,7 @@ export default function PassengersPage() {
 
   if (!formInitialized || faydaCompleting) {
     return (
-      <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12">
+      <div className="booking-page">
         <div className="container mx-auto px-4">
           <div className="max-w-lg mx-auto text-center">
             <Loader2 className="w-8 h-8 animate-spin mx-auto text-blue-600" />
@@ -1013,7 +1043,7 @@ export default function PassengersPage() {
     <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12">
       <div className="container mx-auto px-4">
         <div className="max-w-6xl mx-auto">
-          <h1 className="text-3xl font-bold mb-6 text-gray-900 dark:text-gray-100">Passenger details</h1>
+          <h1 className="section-title">Passenger details</h1>
 
           <form onSubmit={handleSubmit(onSubmit, onInvalid)} className="space-y-6">
             {fields.map((field, index) => {
@@ -1312,11 +1342,15 @@ export default function PassengersPage() {
 
                               <div>
                                 <label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">Issuing Country *</label>
-                                <input
+                                <select
                                   {...register(`passengers.${index}.passportCountry`)}
                                   className={`input-field ${errors.passengers?.[index]?.passportCountry ? 'border-red-500' : ''}`}
-                                  placeholder="e.g., Djibouti"
-                                />
+                                >
+                                  <option value="">Select country</option>
+                                  {COUNTRIES.map((c) => (
+                                    <option key={c} value={c}>{c}</option>
+                                  ))}
+                                </select>
                                 {errors.passengers?.[index]?.passportCountry && (
                                   <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.passportCountry?.message}</p>
                                 )}
@@ -1336,8 +1370,12 @@ export default function PassengersPage() {
                                 <input
                                   type="date"
                                   {...register(`passengers.${index}.passportExpiryDate`)}
-                                  className="input-field"
+                                  className={`input-field ${errors.passengers?.[index]?.passportExpiryDate ? 'border-red-500' : ''}`}
+                                  min={new Date().toISOString().split('T')[0]}
                                 />
+                                {errors.passengers?.[index]?.passportExpiryDate && (
+                                  <p className="text-red-500 text-xs mt-1">{errors.passengers[index]?.passportExpiryDate?.message}</p>
+                                )}
                               </div>
                             </div>
                           </div>
diff --git a/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx
index ceb54acd9..6ce8b5f66 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx
@@ -72,10 +72,10 @@ export default function PaymentPage() {
   // split equally across both legs. This guarantees leg totals are consistent with the
   // per-passenger breakdown rows and the overall reviewed total.
   const outboundBaseFare = isRoundTrip
-    ? (reviewedPassengerFares ?? []).reduce((sum, f) => sum + (f.isFree ? 0 : Math.round(f.fareMinor / 2)), 0)
+    ? (reviewedPassengerFares ?? []).reduce((sum, f) => sum + (f.isFree ? 0 : (f.outboundFareMinor ?? Math.round(f.fareMinor / 2))), 0)
     : 0;
   const inboundBaseFare = isRoundTrip
-    ? (reviewedPassengerFares ?? []).reduce((sum, f) => sum + (f.isFree ? 0 : Math.round(f.fareMinor / 2)), 0)
+    ? (reviewedPassengerFares ?? []).reduce((sum, f) => sum + (f.isFree ? 0 : (f.inboundFareMinor ?? Math.round(f.fareMinor / 2))), 0)
     : 0;
 
   // reviewedPassengerFares / reviewedTotalMinor are the single source of truth for display
@@ -188,10 +188,10 @@ export default function PaymentPage() {
 
   if (!bookingId && !pnr) {
     return (
-      <div className="min-h-screen bg-gray-50 py-12 flex items-center justify-center">
+      <div className="booking-page flex items-center justify-center">
         <div className="text-center">
           <Loader2 className="w-12 h-12 text-primary animate-spin mx-auto mb-4" />
-          <p className="text-gray-600">Loading payment details...</p>
+          <p className="text-gray-600 dark:text-gray-400">Loading payment details...</p>
         </div>
       </div>
     );
@@ -307,11 +307,11 @@ export default function PaymentPage() {
                 <div className="pl-3 space-y-0.5 text-xs text-gray-500 dark:text-gray-400">
                   <div className="flex justify-between">
                     <span>Outbound</span>
-                    <span>{formatFare(Math.round((reviewed?.fareMinor ?? 0) / 2), displayCurrency)}</span>
+                    <span>{formatFare(reviewed?.outboundFareMinor ?? Math.round((reviewed?.fareMinor ?? 0) / 2), displayCurrency)}</span>
                   </div>
                   <div className="flex justify-between">
                     <span>Return</span>
-                    <span>{formatFare(Math.round((reviewed?.fareMinor ?? 0) / 2), displayCurrency)}</span>
+                    <span>{formatFare(reviewed?.inboundFareMinor ?? Math.round((reviewed?.fareMinor ?? 0) / 2), displayCurrency)}</span>
                   </div>
                 </div>
               )}
@@ -372,10 +372,10 @@ export default function PaymentPage() {
   );
 
   return (
-    <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-6 pb-28 lg:pb-10">
+    <div className="booking-page pb-28 lg:pb-10">
       <div className="container mx-auto px-4">
         <div className="max-w-6xl mx-auto">
-          <h1 className="text-2xl font-bold mb-4 text-gray-900 dark:text-gray-100">Complete payment</h1>
+          <h1 className="section-title">Complete payment</h1>
 
           {/* Reservation confirmation banner */}
           <div className="card bg-green-50 dark:bg-green-900/20 border border-green-200 dark:border-green-800 mb-4 flex items-start gap-3">
diff --git a/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
index 0f8ac2004..fb44dce41 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
@@ -197,17 +197,12 @@ export default function ResultsPage() {
   // Alternatives are surfaced whenever a leg returns no exact-date results.
   const alternativeOutbound: Schedule[] =
     !!results && outboundSchedules.length === 0
-      ? results?.alternativeOutbound || []
+      ? results?.alternativeOutbound || results?.outboundAlternatives || []
       : [];
   const alternativeInbound: Schedule[] =
     isRoundTrip && !!results && inboundSchedules.length === 0
-      ? results?.alternativeInbound || []
+      ? results?.alternativeInbound || results?.inboundAlternatives || []
       : [];
-  const requestedDate: string =
-    (results && results.requestedDate) || searchData.date;
-  const requestedReturnDate: string =
-    (results && results.requestedReturnDate) || searchData.returnDate || "";
-
   const isOneWayNoOutbound =
     !isRoundTrip && !!results && outboundSchedules.length === 0;
   // Round-trip: show results view if either leg has exact results OR alternatives.
@@ -298,7 +293,17 @@ export default function ResultsPage() {
 
     // For round trip inbound, proceed with both schedules
     if (isRoundTrip && !isOutbound) {
-      setInboundSchedule(scheduleData);
+      // Mirror the outbound's coachTypes (fares) onto the inbound schedule so the
+      // return seat selection page shows the same prices as the outbound leg.
+      const inboundScheduleData = outboundScheduleData
+        ? {
+            ...scheduleData,
+            baseFareAdult: outboundScheduleData.baseFareAdult,
+            baseFareChild: outboundScheduleData.baseFareChild,
+            coachTypes: outboundScheduleData.coachTypes,
+          }
+        : scheduleData;
+      setInboundSchedule(inboundScheduleData);
       setSelectedSchedule(outboundScheduleData); // Set primary as outbound
     } else {
       // For one-way
@@ -529,7 +534,7 @@ export default function ResultsPage() {
                               e.stopPropagation();
                               handleSelect(classModal, isOutbound);
                             }}
-                            className="mt-3 w-full flex items-center justify-center gap-2 px-4 py-2.5 bg-gradient-to-r from-[rgb(20,113,76)] to-[rgb(16,95,65)] hover:from-[rgb(16,89,60)] hover:to-[rgb(12,75,50)] text-white font-bold text-sm rounded-xl transition-all shadow-md shadow-primary/30 hover:shadow-lg active:scale-[0.98]"
+                            className="btn-primary w-full mt-3 text-sm active:scale-[0.98]"
                           >
                             <span>
                               {isRoundTrip && isOutbound
@@ -647,9 +652,9 @@ export default function ResultsPage() {
               </div>
             </div>
 
-            <div className="flex items-center gap-4">
+            <div className="flex items-center gap-2 md:gap-4">
               <div className="text-center">
-                <div className="text-3xl font-bold text-gray-900 dark:text-gray-100">
+                <div className="text-xl md:text-3xl font-bold text-gray-900 dark:text-gray-100 whitespace-nowrap">
                   {schedule.departureAt
                     ? formatTime(schedule.departureAt)
                     : "--:--"}
@@ -664,9 +669,9 @@ export default function ResultsPage() {
                 </div>
               </div>
 
-              <div className="flex-1 flex flex-col items-center">
-                <div className="flex items-center gap-2 mb-2 text-sm text-gray-600 dark:text-gray-400">
-                  <Clock className="w-4 h-4" />
+              <div className="flex-1 min-w-0 flex flex-col items-center">
+                <div className="flex items-center gap-1 md:gap-2 mb-2 text-xs md:text-sm text-gray-600 dark:text-gray-400 whitespace-nowrap">
+                  <Clock className="w-3.5 h-3.5 md:w-4 md:h-4 flex-shrink-0" />
                   <span>{durationStr}</span>
                 </div>
                 <div className="w-full h-0.5 bg-gray-200 dark:bg-gray-700 relative">
@@ -674,15 +679,15 @@ export default function ResultsPage() {
                   <div className="absolute right-0 top-1/2 -translate-y-1/2 w-2 h-2 bg-primary rounded-full" />
                 </div>
                 {schedule.stops && schedule.stops.length > 0 && (
-                  <div className="flex items-center gap-1 mt-2 text-sm text-gray-600 dark:text-gray-400">
-                    <MapPin className="w-4 h-4" />
+                  <div className="flex items-center gap-1 mt-2 text-xs md:text-sm text-gray-600 dark:text-gray-400 whitespace-nowrap">
+                    <MapPin className="w-3.5 h-3.5 md:w-4 md:h-4 flex-shrink-0" />
                     <span>{schedule.stops.length - 2} stops</span>
                   </div>
                 )}
               </div>
 
               <div className="text-center">
-                <div className="text-3xl font-bold text-gray-900 dark:text-gray-100">
+                <div className="text-xl md:text-3xl font-bold text-gray-900 dark:text-gray-100 whitespace-nowrap">
                   {schedule.arrivalAt
                     ? formatTime(schedule.arrivalAt)
                     : "--:--"}
@@ -744,7 +749,7 @@ export default function ResultsPage() {
 
   if (isLoading) {
     return (
-      <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-4 md:py-6">
+      <div className="booking-page">
         <div className="container mx-auto px-4">
           <div className="max-w-6xl mx-auto">
             {/* Progress Header */}
@@ -943,28 +948,19 @@ export default function ResultsPage() {
       !!results &&
       outboundSchedules.length === 0 &&
       inboundSchedules.length === 0 &&
-      alternativeOutbound.length === 0 &&
-      alternativeInbound.length === 0;
+      (results?.alternativeOutbound || []).length === 0 &&
+      (results?.alternativeInbound || []).length === 0;
     if (isRoundTripNoResults) {
       return (
-        <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12">
+        <div className="booking-page">
           <div className="container mx-auto px-4">
-            <div className="max-w-2xl mx-auto">
-              <div className="card text-center">
-                <div className="hidden sm:flex w-20 h-20 bg-gray-100 dark:bg-gray-800 rounded-full items-center justify-center mx-auto mb-6">
-                  <Calendar className="w-10 h-10 text-gray-400 dark:text-gray-500" />
+            <div className="max-w-6xl mx-auto">
+              <div className="flex items-center justify-between gap-4 px-4 py-3 rounded-xl bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800">
+                <div className="flex items-center gap-2.5 text-sm text-red-800 dark:text-red-300">
+                  <Calendar className="w-4 h-4 flex-shrink-0" />
+                  <span>No trains found for your selected dates or route.</span>
                 </div>
-                <h2 className="text-2xl font-bold mb-3 text-gray-900 dark:text-gray-100">
-                  No trains found
-                </h2>
-                <p className="text-gray-600 dark:text-gray-400 mb-8">
-                  We couldn&apos;t find any trains for your trip. Try adjusting
-                  your dates or route.
-                </p>
-                <button
-                  onClick={() => router.push(buildSearchUrl())}
-                  className="btn-primary"
-                >
+                <button onClick={() => router.push(buildSearchUrl())} className="text-sm font-semibold text-primary hover:underline flex-shrink-0">
                   Modify search
                 </button>
               </div>
@@ -975,34 +971,20 @@ export default function ResultsPage() {
     }
 
     if (isOneWayNoOutbound) {
-      const requestedDateLabel = requestedDate
-        ? format(new Date(`${requestedDate}T00:00:00`), "EEEE, MMMM d, yyyy")
-        : "your selected date";
       const hasAlternatives = alternativeOutbound.length > 0;
 
       return (
-        <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12">
+        <div className="booking-page">
           {renderClassModal()}
           <div className="container mx-auto px-4">
             <div className="max-w-6xl mx-auto">
-              <div className="card text-center mb-8 max-w-3xl mx-auto">
-                <div className="hidden sm:flex w-20 h-20 bg-amber-100 dark:bg-amber-900/30 rounded-full items-center justify-center mx-auto mb-6">
-                  <Calendar className="w-10 h-10 text-amber-500" />
+              <div className="flex items-center justify-between gap-4 px-4 py-3 rounded-xl bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 mb-8">
+                <div className="flex items-center gap-2.5 text-sm text-red-800 dark:text-red-300">
+                  <Calendar className="w-4 h-4 flex-shrink-0" />
+                  <span>No trains available on <span className="font-semibold">{searchData.date ? format(new Date(`${searchData.date}T00:00:00`), "EEEE, MMMM d, yyyy") : "your selected date"}</span>.</span>
                 </div>
-                <h2 className="text-2xl font-bold mb-3 text-gray-900 dark:text-gray-100">
-                  No trains available
-                </h2>
-                <p className="text-gray-600 dark:text-gray-400 mb-8">
-                  No trains are available on{" "}
-                  <span className="font-semibold text-gray-900 dark:text-gray-100">
-                    {requestedDateLabel}
-                  </span>
-                </p>
-                <button
-                  onClick={() => router.push(buildSearchUrl())}
-                  className="btn-primary"
-                >
-                  Change travel date
+                <button onClick={() => router.push(buildSearchUrl())} className="text-sm font-semibold text-primary hover:underline flex-shrink-0">
+                  Change date
                 </button>
               </div>
 
@@ -1031,24 +1013,15 @@ export default function ResultsPage() {
     }
 
     return (
-      <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12">
+      <div className="booking-page">
         <div className="container mx-auto px-4">
-          <div className="max-w-2xl mx-auto">
-            <div className="card text-center">
-              <div className="hidden sm:flex w-20 h-20 bg-gray-100 dark:bg-gray-800 rounded-full items-center justify-center mx-auto mb-6">
-                <Calendar className="w-10 h-10 text-gray-400 dark:text-gray-500" />
+          <div className="max-w-6xl mx-auto">
+            <div className="flex items-center justify-between gap-4 px-4 py-3 rounded-xl bg-gray-100 dark:bg-gray-800 border border-gray-200 dark:border-gray-700">
+              <div className="flex items-center gap-2.5 text-sm text-gray-600 dark:text-gray-400">
+                <Calendar className="w-4 h-4 flex-shrink-0 text-gray-400" />
+                <span>No trains found matching your search. Try adjusting your dates or route.</span>
               </div>
-              <h2 className="text-2xl font-bold mb-3 text-gray-900 dark:text-gray-100">
-                No trains found
-              </h2>
-              <p className="text-gray-600 dark:text-gray-400 mb-8">
-                We couldn&apos;t find any trains matching your search criteria.{" "}
-                <br /> Try adjusting your dates or route.
-              </p>
-              <button
-                onClick={() => router.push(buildSearchUrl())}
-                className="btn-primary"
-              >
+              <button onClick={() => router.push(buildSearchUrl())} className="text-sm font-semibold text-primary hover:underline flex-shrink-0">
                 Modify search
               </button>
             </div>
@@ -1059,7 +1032,7 @@ export default function ResultsPage() {
   }
 
   return (
-    <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-4 md:py-6">
+    <div className="booking-page">
       <div className="container mx-auto px-4">
         <div className="max-w-6xl mx-auto">
           {renderClassModal()}
@@ -1172,29 +1145,13 @@ export default function ResultsPage() {
                   {outboundSchedules.length === 0 &&
                     alternativeOutbound.length > 0 && (
                       <div className="mt-6">
-                        <div className="card text-center mb-6 max-w-3xl mx-auto">
-                          <div className="hidden sm:flex w-16 h-16 bg-amber-100 dark:bg-amber-900/30 rounded-full items-center justify-center mx-auto mb-4">
-                            <Calendar className="w-8 h-8 text-amber-500" />
+                        <div className="flex items-center justify-between gap-4 px-4 py-3 rounded-xl bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 mb-6">
+                          <div className="flex items-center gap-2.5 text-sm text-red-800 dark:text-red-300">
+                            <Calendar className="w-4 h-4 flex-shrink-0" />
+                            <span>No trains on <span className="font-semibold">{searchData.date ? format(new Date(`${searchData.date}T00:00:00`), "EEEE, MMMM d") : "your selected date"}</span>.</span>
                           </div>
-                          <h2 className="text-xl font-bold mb-2 text-gray-900 dark:text-gray-100">
-                            No trains available
-                          </h2>
-                          <p className="text-gray-600 dark:text-gray-400 mb-6">
-                            No trains are available on{" "}
-                            <span className="font-semibold text-gray-900 dark:text-gray-100">
-                              {requestedDate
-                                ? format(
-                                    new Date(`${requestedDate}T00:00:00`),
-                                    "EEEE, MMMM d, yyyy",
-                                  )
-                                : "your selected date"}
-                            </span>
-                          </p>
-                          <button
-                            onClick={() => router.push(buildSearchUrl())}
-                            className="btn-primary"
-                          >
-                            Change travel dates
+                          <button onClick={() => router.push(buildSearchUrl())} className="text-sm font-semibold text-primary hover:underline flex-shrink-0">
+                            Change dates
                           </button>
                         </div>
                         <div className="mb-3">
@@ -1272,29 +1229,13 @@ export default function ResultsPage() {
                   {inboundSchedules.length === 0 &&
                     alternativeInbound.length > 0 && (
                       <div className="mt-6">
-                        <div className="card text-center mb-6 max-w-3xl mx-auto">
-                          <div className="hidden sm:flex w-16 h-16 bg-amber-100 dark:bg-amber-900/30 rounded-full items-center justify-center mx-auto mb-4">
-                            <Calendar className="w-8 h-8 text-amber-500" />
+                        <div className="flex items-center justify-between gap-4 px-4 py-3 rounded-xl bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 mb-6">
+                          <div className="flex items-center gap-2.5 text-sm text-red-800 dark:text-red-300">
+                            <Calendar className="w-4 h-4 flex-shrink-0" />
+                            <span>No trains on <span className="font-semibold">{searchData.returnDate ? format(new Date(`${searchData.returnDate}T00:00:00`), "EEEE, MMMM d") : "your selected return date"}</span>.</span>
                           </div>
-                          <h2 className="text-xl font-bold mb-2 text-gray-900 dark:text-gray-100">
-                            No trains available
-                          </h2>
-                          <p className="text-gray-600 dark:text-gray-400 mb-6">
-                            No trains are available on{" "}
-                            <span className="font-semibold text-gray-900 dark:text-gray-100">
-                              {requestedReturnDate
-                                ? format(
-                                    new Date(`${requestedReturnDate}T00:00:00`),
-                                    "EEEE, MMMM d, yyyy",
-                                  )
-                                : "your selected return date"}
-                            </span>
-                          </p>
-                          <button
-                            onClick={() => router.push(buildSearchUrl())}
-                            className="btn-primary"
-                          >
-                            Change travel dates
+                          <button onClick={() => router.push(buildSearchUrl())} className="text-sm font-semibold text-primary hover:underline flex-shrink-0">
+                            Change dates
                           </button>
                         </div>
                         <div className="mb-3">
diff --git a/apps/edr-passenger-web/portal/src/app/booking/review/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/review/page.tsx
index cf14cc87c..251f8ae8b 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/review/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/review/page.tsx
@@ -445,7 +445,9 @@ export default function ReviewPage() {
         const fareMinor = isPackageBooking
           ? (isFreeChild ? 0 : (seatFare ?? pkgFallback))
           : (isFreeChild ? 0 : (seatFare ?? line?.fareMinor ?? 0));
-        return { fareMinor, isFree: isFreeChild };
+        const outboundFareMinor = isRoundTrip ? ((p as any).outboundSeatFareMinor ?? undefined) : undefined;
+        const inboundFareMinor = isRoundTrip ? ((p as any).inboundSeatFareMinor ?? undefined) : undefined;
+        return { fareMinor, isFree: isFreeChild, outboundFareMinor, inboundFareMinor };
       });
       setReviewedTotal(computedTotal, passengerFares);
 
@@ -560,6 +562,14 @@ export default function ReviewPage() {
         const isFreeChild = isPackageBooking
           ? isPkgFreeChild(i)
           : (line?.isFree ?? (isChild(p) && isFirstChild(passengers, i)));
+
+        // Per-leg fares for round trips
+        const outboundFare: number | null = isRoundTrip
+          ? (isPackageBooking ? (packageTierPriceMinor ?? null) : ((p as any).outboundSeatFareMinor ?? null))
+          : null;
+        const inboundFare: number | null = isRoundTrip
+          ? (isPackageBooking ? (packageTierPriceMinor ?? null) : ((p as any).inboundSeatFareMinor ?? null))
+          : null;
         const seatFare = getPassengerSeatFare(p);
         const passengerTotal = isPackageBooking
           ? (isFreeChild ? 0 : (seatFare ?? (isChildPassenger ? pkgChildFare : pkgAdultFare)))
@@ -582,6 +592,19 @@ export default function ReviewPage() {
                 {formatFare(passengerTotal, displayCurrency)}
               </span>
             </div>
+            {/* Round-trip: show outbound + inbound breakdown */}
+            {isRoundTrip && !isFreeChild && (
+              <div className="mt-1 space-y-0.5 pl-2">
+                <div className="flex justify-between text-xs text-gray-500 dark:text-gray-400">
+                  <span>↗ Outbound</span>
+                  <span>{outboundFare != null ? formatFare(outboundFare, displayCurrency) : '—'}</span>
+                </div>
+                <div className="flex justify-between text-xs text-gray-500 dark:text-gray-400">
+                  <span>↙ Return</span>
+                  <span>{inboundFare != null ? formatFare(inboundFare, displayCurrency) : '—'}</span>
+                </div>
+              </div>
+            )}
           </div>
         );
       })}
@@ -613,10 +636,10 @@ export default function ReviewPage() {
   );
 
   return (
-    <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-6 pb-28 lg:pb-10">
+    <div className="booking-page pb-28 lg:pb-10">
       <div className="container mx-auto px-4">
         <div className="max-w-6xl mx-auto">
-          <h1 className="text-2xl font-bold mb-4 text-gray-900 dark:text-gray-100">
+          <h1 className="section-title">
             {packageName ? `Review your ${packageName} booking` : 'Review your booking'}
           </h1>
 
diff --git a/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
index 574b08487..02c1fcd35 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
@@ -608,6 +608,12 @@ export default function SearchPage() {
     reValidateMode: "onSubmit",
     defaultValues: {
       tripType: "ONE_WAY",
+      // originStationId/destinationStationId must default to "" rather than being omitted —
+      // Zod's base string type check runs before .min(1, "..."), so an `undefined` value hits
+      // its generic "Required" message instead of our custom one. An empty string is still a
+      // string, so .min() (and its custom message) is what actually fires.
+      originStationId: "",
+      destinationStationId: "",
       adultCount: 1,
       childCount: 0,
       // No default nationality — the user must explicitly pick one. Left blank (not a valid
@@ -827,19 +833,21 @@ export default function SearchPage() {
         />
       )}
 
-      {/* ── 90vh hero with banner image ── */}
-      {/* Round trip stacks an extra Return Date field into the widget on mobile, which grows
+      {/* ── 90vh hero with banner image (desktop) / top-aligned widget only (mobile) ── */}
+      {/* Round trip stacks an extra Return Date field into the widget on desktop, which grows
           upward from its bottom-anchored position — give the hero extra height there so the
-          widget's top edge doesn't creep up into the sticky header. */}
+          widget's top edge doesn't creep up into the sticky header. On mobile the widget is
+          in normal flow (not bottom-anchored), so this only applies at md: and up. */}
       <section
         className={`relative ${
           tripType === "ROUND_TRIP"
-            ? "h-[calc(90vh+60px)] min-h-[670px] md:h-[90vh] md:min-h-[560px]"
-            : "h-[94vh] min-h-[560px]"
+            ? "md:h-[90vh] md:min-h-[560px]"
+            : "md:h-[94vh] md:min-h-[560px]"
         }`}
       >
-        {/* Background image with zoom - fully isolated */}
-        <div className="absolute inset-0 overflow-hidden">
+        {/* Background image with zoom — desktop only; mobile drops the hero image entirely
+            so the booking widget can sit at the top and use the available space. */}
+        <div className="hidden md:block absolute inset-0 overflow-hidden">
           <div
             className="w-full h-full bg-cover bg-center animate-bg-zoom"
             style={{
@@ -852,12 +860,12 @@ export default function SearchPage() {
             }}
           />
         </div>
-        {/* Gradient overlay */}
-        <div className="absolute inset-0 bg-gradient-to-br from-black/70 via-black/40 to-transparent" />
-        <div className="absolute inset-0 bg-gradient-to-t from-black/80 via-transparent to-transparent" />
+        {/* Gradient overlay — desktop only (exists to keep the hero text readable over the image) */}
+        <div className="hidden md:block absolute inset-0 bg-gradient-to-br from-black/70 via-black/40 to-transparent" />
+        <div className="hidden md:block absolute inset-0 bg-gradient-to-t from-black/80 via-transparent to-transparent" />
 
-        {/* Hero headline — top area */}
-        <div className="relative z-10 pt-16 md:pt-20 px-6 md:px-12 max-w-6xl mx-auto">
+        {/* Hero headline — desktop only; removed on mobile along with the banner image */}
+        <div className="hidden md:block relative z-10 pt-16 md:pt-20 px-6 md:px-12 max-w-6xl mx-auto">
           <h1 className="text-4xl md:text-5xl lg:text-6xl font-extrabold text-white leading-tight drop-shadow-lg max-w-2xl animate-fade-in-up">
             Where are you
             <br className="hidden sm:block" /> headed today?
@@ -867,14 +875,28 @@ export default function SearchPage() {
           </p>
         </div>
 
-        {/* ── Widget — absolutely positioned at bottom with margin ── */}
+        {/* ── Widget — top-aligned, normal flow on mobile; absolutely positioned at
+            bottom on desktop over the hero image. z-[35] sits above the floating
+            support chat launcher (z-30) but below the sidebar/tab bar (z-40), so it
+            never covers either. Modals opened from inside the widget (date picker
+            etc.) are portaled to <body> — see ModernDatePicker — so they aren't
+            capped by this wrapper's own stacking context. ── */}
         <div
-          className="absolute bottom-8 left-0 right-0 z-[50] px-4 md:px-6"
+          className="relative pt-4 pb-4 md:pt-0 md:pb-0 md:absolute md:bottom-8 md:left-0 md:right-0 z-[35] px-4 md:px-6"
           ref={widgetRef}
         >
           <div className="max-w-6xl mx-auto">
+            {/* Mobile-only heading — desktop keeps the version overlaid on the hero image above */}
+            <div className="md:hidden mb-3">
+              <h1 className="text-2xl font-extrabold text-gray-900 dark:text-gray-100 leading-tight">
+                Where are you headed today?
+              </h1>
+              <p className="text-sm text-gray-500 dark:text-gray-400 mt-1">
+                Book your train journey across East Africa
+              </p>
+            </div>
             <form onSubmit={handleSubmit(onSubmit, onInvalid)}>
-              <div className="bg-white dark:bg-gray-900 rounded-2xl shadow-2xl border border-white/20 overflow-visible">
+              <div className="bg-white dark:bg-gray-900 rounded-2xl shadow-none md:shadow-2xl border border-white/20 overflow-visible">
                 {error && (
                   <div className="flex items-center gap-2 px-5 py-3 bg-red-50 text-red-600 text-sm border-b border-red-100 rounded-t-2xl">
                     <span>⚠️</span>
@@ -950,6 +972,11 @@ export default function SearchPage() {
                           </span>
                         </div>
                       </button>
+                      {hasInteracted && errors.originStationId && (
+                        <p className="text-xs text-red-500">
+                          {errors.originStationId.message}
+                        </p>
+                      )}
                     </div>
                     <div className="space-y-1.5">
                       <div className="flex items-center justify-between">
@@ -998,6 +1025,11 @@ export default function SearchPage() {
                           </span>
                         </div>
                       </button>
+                      {hasInteracted && errors.destinationStationId && (
+                        <p className="text-xs text-red-500">
+                          {errors.destinationStationId.message}
+                        </p>
+                      )}
                     </div>
                     <div className="space-y-1.5">
                       <label className="text-xs font-semibold text-gray-500 uppercase tracking-wide">
@@ -1019,8 +1051,14 @@ export default function SearchPage() {
                           }}
                           minDate={new Date()}
                           placeholder="Select date"
+                          error={!!errors.departureDate}
                         />
                       </div>
+                      {errors.departureDate && (
+                        <p className="text-xs text-red-500">
+                          {errors.departureDate.message}
+                        </p>
+                      )}
                     </div>
                     {tripType === "ROUND_TRIP" && (
                       <div className="space-y-1.5">
@@ -1047,6 +1085,7 @@ export default function SearchPage() {
                                 : new Date()
                             }
                             placeholder="Select return date"
+                            error={!!errors.returnDate}
                           />
                         </div>
                         {errors.returnDate && (
@@ -1079,7 +1118,7 @@ export default function SearchPage() {
                     <button
                       type="submit"
                       disabled={isLoading}
-                      className="w-full flex items-center justify-center gap-2 py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all shadow-lg disabled:opacity-50"
+                      className="btn-primary w-full text-sm"
                     >
                       <Search className="w-5 h-5" />
                       Search
@@ -1182,6 +1221,7 @@ export default function SearchPage() {
                               }}
                               minDate={new Date()}
                               placeholder="Departure"
+                              error={!!errors.departureDate}
                             />
                           </div>
                           {errors.departureDate && (
@@ -1219,7 +1259,7 @@ export default function SearchPage() {
                         <button
                           type="submit"
                           disabled={isLoading}
-                          className="flex-shrink-0 flex items-center justify-center gap-2 px-5 py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all shadow-lg hover:shadow-xl disabled:opacity-50"
+                          className="flex-shrink-0 flex items-center justify-center gap-2 px-5 py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all transform hover:-translate-y-0.5 shadow-lg hover:shadow-xl disabled:opacity-50"
                         >
                           <Search className="w-5 h-5" />
                           Search
@@ -1324,6 +1364,7 @@ export default function SearchPage() {
                                 }}
                                 minDate={new Date()}
                                 placeholder="Select date"
+                                error={!!errors.departureDate}
                               />
                             </div>
                             {errors.departureDate && (
@@ -1357,6 +1398,7 @@ export default function SearchPage() {
                                     : new Date()
                                 }
                                 placeholder="Select date"
+                                error={!!errors.returnDate}
                               />
                             </div>
                             {errors.returnDate && (
@@ -1482,7 +1524,7 @@ export default function SearchPage() {
                             <button
                               type="submit"
                               disabled={isLoading}
-                              className="flex items-center justify-center gap-2 px-6 py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all shadow-lg hover:shadow-xl disabled:opacity-50"
+                              className="flex items-center justify-center gap-2 px-6 py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all transform hover:-translate-y-0.5 shadow-lg hover:shadow-xl disabled:opacity-50"
                             >
                               <Search className="w-5 h-5" />
                               Search
diff --git a/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
index f8fd23609..1463b238a 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
@@ -11,6 +11,7 @@ import { Armchair, Bed, ChevronLeft, ChevronDown, Train, TrainFront, X } from "l
 import Image from "next/image";
 
 import CustomModal from "@/components/CustomModal";
+import { Skeleton } from "@/components/Skeleton";
 import { isChild } from "@/utils/fare-utils";
 
 const BED_POSITION_SUFFIX: Record<string, string> = { lower: 'L', middle: 'M', upper: 'U' };
@@ -451,16 +452,15 @@ export default function SeatsPage() {
   // the new seat map data has finished loading.
   const applyCoachTypeSwitch = (coach: any, matchedType: any) => {
     const newFare = getCoachTypeFare(matchedType.coachTypeId || matchedType.coachId);
-    const firstClass = matchedType.classes?.[0];
     const newCoachTypeId = matchedType.coachTypeId || matchedType.coachId;
     const updatedSchedule = {
       ...(currentSchedule as any),
       selectedCoachTypeId: newCoachTypeId,
       selectedCoachTypeCode: matchedType.coachTypeCode || coach.type || "",
       selectedCoachTypeName: matchedType.coachTypeName || coach.coachTypeName || coach.typeName || "",
-      selectedSeatClass: firstClass?.name || matchedType.coachTypeName || coach.coachTypeName || "",
-      selectedSeatClassName: firstClass?.name || matchedType.coachTypeName || coach.coachTypeName || "",
-      seatClassName: firstClass?.name || matchedType.coachTypeName || coach.coachTypeName || "",
+      selectedSeatClass: matchedType.coachTypeName || coach.coachTypeName || "",
+      selectedSeatClassName: matchedType.coachTypeName || coach.coachTypeName || "",
+      seatClassName: matchedType.coachTypeName || coach.coachTypeName || "",
       baseFareAdult: newFare ?? (currentSchedule as any)?.baseFareAdult,
       baseFareChild: newFare ?? (currentSchedule as any)?.baseFareChild,
     };
@@ -921,7 +921,7 @@ export default function SeatsPage() {
           const positionLabel = newSeat?.bedPosition
             ? `${newSeat.bedPosition.charAt(0).toUpperCase()}${newSeat.bedPosition.slice(1)} berth`
             : "This seat";
-          const legMultiplier = isRoundTrip ? 2 : 1;
+          const legMultiplier = isPackageBooking && isRoundTrip ? 2 : 1;
 
           setModalState({
             isOpen: true,
@@ -1328,15 +1328,16 @@ export default function SeatsPage() {
   useEffect(() => {
     if (isRoundTrip) {
       if (!outboundSchedule || !inboundSchedule || !passengers.length) {
-        router.push("/booking/search");
+        router.push(isPackageBooking ? "/booking/passengers" : "/booking/search");
       }
     } else {
       if (!selectedSchedule || !passengers.length) {
-        router.push("/booking/search");
+        router.push(isPackageBooking ? "/booking/passengers" : "/booking/search");
       }
     }
   }, [
     isRoundTrip,
+    isPackageBooking,
     selectedSchedule,
     outboundSchedule,
     inboundSchedule,
@@ -1712,7 +1713,7 @@ export default function SeatsPage() {
 
   if (
     isRoundTrip
-      ? !outboundSchedule || !inboundSchedule || !passengers.length
+      ? !outboundSchedule || (!isPackageBooking && !inboundSchedule) || !passengers.length
       : !selectedSchedule || !passengers.length
   )
     return null;
@@ -2187,11 +2188,16 @@ export default function SeatsPage() {
                   </button>
                 </div>
                 {isLoading ? (
-                  <div className="bg-white dark:bg-gray-800 rounded-2xl p-8 text-center">
-                    <div className="w-10 h-10 border-4 border-primary border-t-transparent rounded-full animate-spin mx-auto mb-3" />
-                    <p className="text-sm text-gray-500 dark:text-gray-400">
-                      Loading seat map...
-                    </p>
+                  <div className="bg-white dark:bg-gray-800 rounded-2xl p-6 space-y-4">
+                    <div className="flex items-center justify-between">
+                      <Skeleton className="h-5 w-32" />
+                      <Skeleton className="h-8 w-24 rounded-lg" />
+                    </div>
+                    <div className="grid grid-cols-4 gap-3">
+                      {Array.from({ length: 24 }).map((_, i) => (
+                        <Skeleton key={i} className="aspect-square rounded-xl" />
+                      ))}
+                    </div>
                   </div>
                 ) : error ? (
                   <div className="bg-white dark:bg-gray-800 rounded-2xl p-8 text-center">
diff --git a/apps/edr-passenger-web/portal/src/app/contact/page.tsx b/apps/edr-passenger-web/portal/src/app/contact/page.tsx
index f2c0f4296..669a99d0b 100644
--- a/apps/edr-passenger-web/portal/src/app/contact/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/contact/page.tsx
@@ -3,16 +3,18 @@
 import { useEffect, useState } from 'react';
 import { getTranslation, Language, useLanguage } from '@/lib/i18n';
 import { Phone, Mail, MapPin, Send, Loader } from 'lucide-react';
+import { Footer } from '@/components/Footer';
 
 const styles = `
   .contact-hero {
     padding: 60px 20px;
-    background: linear-gradient(to bottom right, rgb(20, 113, 76), transparent);
+    background: #ffffff;
     text-align: center;
     color: #111827;
   }
-  
+
   .dark .contact-hero {
+    background: #111827;
     color: #f3f4f6;
   }
   
@@ -370,6 +372,7 @@ export default function Contact() {
           </div>
         </section>
       </main>
+      <Footer />
     </>
   );
 }
diff --git a/apps/edr-passenger-web/portal/src/app/globals.css b/apps/edr-passenger-web/portal/src/app/globals.css
index 9714d54bc..9296f3030 100644
--- a/apps/edr-passenger-web/portal/src/app/globals.css
+++ b/apps/edr-passenger-web/portal/src/app/globals.css
@@ -26,19 +26,17 @@
   }
   
   .btn-ghost {
-    @apply text-[rgb(20_113_76)] font-medium py-2 px-4 rounded-lg transition-colors;
+    @apply text-[rgb(20_113_76)] font-medium py-2 px-4 rounded-lg transition-colors hover:bg-[rgba(20,113,76,0.1)] dark:hover:bg-[rgba(20,113,76,0.2)];
   }
-  
-  .btn-ghost:hover {
-    background-color: rgba(20, 113, 76, 0.1);
+
+  .booking-page {
+    @apply min-h-screen bg-gray-50 dark:bg-gray-900 py-6 md:py-8;
   }
-  
-  @media (prefers-color-scheme: dark) {
-    .btn-ghost:hover {
-      background-color: rgba(20, 113, 76, 0.2);
-    }
+
+  .booking-container {
+    @apply container mx-auto px-4 max-w-6xl;
   }
-  
+
   .input-field {
     @apply w-full px-4 py-3 border-2 border-gray-200 dark:border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-[rgb(20_113_76)] focus:border-transparent disabled:bg-gray-50 dark:disabled:bg-gray-800 disabled:cursor-not-allowed transition-all duration-200 text-base bg-white dark:bg-gray-800 text-gray-900 dark:text-gray-100;
   }
@@ -162,7 +160,18 @@
       opacity: 1;
     }
   }
-  
+
+  @keyframes fade-in-up {
+    from {
+      opacity: 0;
+      transform: translateY(8px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+
   .animate-bounce-in {
     animation: bounce-in 0.5s cubic-bezier(0.34, 1.56, 0.64, 1);
   }
@@ -188,6 +197,10 @@
     animation: slide-up 0.25s cubic-bezier(0.32, 0.72, 0, 1);
   }
 
+  .animate-fade-in-up {
+    animation: fade-in-up 0.35s ease-out;
+  }
+
   .scrollbar-hide {
     -ms-overflow-style: none;
     scrollbar-width: none;
diff --git a/apps/edr-passenger-web/portal/src/app/go/page.tsx b/apps/edr-passenger-web/portal/src/app/go/page.tsx
index d9f6f583f..feed05990 100644
--- a/apps/edr-passenger-web/portal/src/app/go/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/go/page.tsx
@@ -13,7 +13,7 @@ import { useSearchParams } from "next/navigation";
  * hop is browser-dependent and can be stripped) must NOT be used here.
  *
  * It fires immediately (no delay) and paints a bare white full-screen cover
- * above the sticky header (z-[60]) — no portal chrome, no text on the happy
+ * above the sidebar/tab bar (z-40) — no portal chrome, no text on the happy
  * path. A short message shows only when the link is missing/untrusted.
  *
  * `?url=` MUST be percent-encoded by the caller (Uri.encodeComponent() in the
diff --git a/apps/edr-passenger-web/portal/src/app/layout.tsx b/apps/edr-passenger-web/portal/src/app/layout.tsx
index 3c18f1c13..1128124e3 100644
--- a/apps/edr-passenger-web/portal/src/app/layout.tsx
+++ b/apps/edr-passenger-web/portal/src/app/layout.tsx
@@ -2,10 +2,11 @@ import type { Metadata } from 'next';
 import { headers } from 'next/headers';
 import './globals.css';
 import { Providers } from './providers';
-import AppHeader from '@/components/AppHeader';
-import { Footer } from '@/components/Footer';
+import AppSidebar from '@/components/AppSidebar';
+import MobileTopBar from '@/components/MobileTopBar';
+import BottomTabBar from '@/components/BottomTabBar';
 import { LoadingIndicator } from '@/components/LoadingIndicator';
-import SupportWidget from '@/features/support/SupportWidget';
+import SupportWidget from '@/features/support/SupportWidgetLazy';
 
 export const metadata: Metadata = {
   title: 'EDR Passenger Portal - Book your train journey',
@@ -21,7 +22,7 @@ export default function RootLayout({
   const nonce = headers().get('x-nonce') ?? undefined;
   return (
     <html lang="en" suppressHydrationWarning>
-      <body className="font-sans antialiased flex flex-col min-h-screen">
+      <body className="font-sans antialiased">
         <script
           nonce={nonce}
           dangerouslySetInnerHTML={{
@@ -47,11 +48,14 @@ export default function RootLayout({
         />
         <Providers>
           <LoadingIndicator />
-          <AppHeader />
-          <main className="flex-1">
-            {children}
-          </main>
-          <Footer />
+          <AppSidebar />
+          <div className="lg:pl-64 flex flex-col min-h-screen">
+            <MobileTopBar />
+            <main className="flex-1">
+              {children}
+            </main>
+            <BottomTabBar />
+          </div>
           <SupportWidget />
         </Providers>
       </body>
diff --git a/apps/edr-passenger-web/portal/src/app/packages/[id]/page.tsx b/apps/edr-passenger-web/portal/src/app/packages/[id]/page.tsx
index 32e3f1178..bb839906d 100644
--- a/apps/edr-passenger-web/portal/src/app/packages/[id]/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/packages/[id]/page.tsx
@@ -221,7 +221,7 @@ function groupTiersByCoachType(tiers: PriceTier[]): Array<{
     if (!map.has(key)) {
       map.set(key, {
         coachTypeId: ct?.id ?? key,
-        coachTypeName: ct?.name ?? tier.seatType,
+        coachTypeName: ct?.name ?? tier.label ?? tier.seatType,
         coachTypeCode: ct?.code ?? '',
         coachTypeType: ct?.type ?? 'passenger',
         tiers: [],
@@ -270,90 +270,121 @@ function PriceTiersPanel({
   }
 
   return (
-    <div className="bg-white dark:bg-gray-900 rounded-2xl p-5 border border-gray-100 dark:border-gray-800 space-y-3">
-      <h2 className="text-base font-bold text-gray-900 dark:text-white">Select Coach Type</h2>
-      {groups.map((group) => {
-        const CoachIcon = getCoachIcon(group.coachTypeType);
-        const allSoldOut = group.tiers.every((t) => t.availableSeats === 0);
-        const isSelected = selectedId === group.coachTypeId;
-        return (
-          <div
-            key={group.coachTypeId}
-            className={`rounded-xl border-2 overflow-hidden transition-colors ${
-              allSoldOut
-                ? 'border-gray-200 dark:border-gray-700 opacity-50'
-                : isSelected
-                  ? 'border-primary'
-                  : 'border-gray-200 dark:border-gray-700 cursor-pointer hover:border-primary/50'
-            }`}
-            onClick={() => !allSoldOut && setSelectedId(isSelected ? null : group.coachTypeId)}
-          >
-            {/* Coach type header */}
-            <div className="flex items-center gap-3 px-4 py-3 bg-gray-50 dark:bg-gray-800/60">
-              <div className={`w-9 h-9 rounded-lg flex items-center justify-center flex-shrink-0 ${
-                isSelected ? 'bg-primary' : 'bg-primary/10'
-              }`}>
-                <CoachIcon className={`w-5 h-5 ${isSelected ? 'text-white' : 'text-primary'}`} />
-              </div>
-              <div className="flex-1 min-w-0">
-                <p className="text-sm font-bold text-gray-900 dark:text-white">
-                  {formatCoachTypeLabel(group.coachTypeType)}
-                </p>
-                <p className="text-xs text-gray-500 dark:text-gray-400">
-                  From {formatPrice(group.minPrice * priceMultiplier, group.currency)}
-                  {allSoldOut && <span className="ml-2 text-red-500 font-semibold">· Sold out</span>}
-                </p>
-              </div>
+    <div className="bg-white dark:bg-gray-900 rounded-2xl p-5 border border-gray-100 dark:border-gray-800">
+      <h2 className="text-base font-bold text-gray-900 dark:text-white mb-4">Choose Coach Type</h2>
+      <div className="grid grid-cols-1 gap-4">
+        {groups.map((group, index) => {
+          const CoachIcon = getCoachIcon(group.coachTypeType);
+          const allSoldOut = group.tiers.every((t) => t.availableSeats === 0);
+          const isSelected = selectedId === group.coachTypeId;
+          return (
+            <div
+              key={group.coachTypeId}
+              role="button"
+              tabIndex={allSoldOut ? -1 : 0}
+              onClick={() => !allSoldOut && setSelectedId(isSelected ? null : group.coachTypeId)}
+              onKeyDown={(e) => {
+                if (!allSoldOut && (e.key === 'Enter' || e.key === ' ')) {
+                  e.preventDefault();
+                  setSelectedId(isSelected ? null : group.coachTypeId);
+                }
+              }}
+              className={`group relative w-full p-2 rounded-2xl border-2 text-left transition-all duration-200 ${allSoldOut
+                  ? 'border-gray-200 dark:border-gray-700 opacity-50 cursor-not-allowed'
+                  : isSelected
+                    ? 'border-primary bg-gradient-to-br from-primary/8 to-primary/3 dark:from-primary/15 dark:to-primary/5 shadow-lg shadow-primary/20 scale-[1.02] cursor-pointer'
+                    : 'border-gray-200 dark:border-gray-700 shadow-sm hover:border-primary/40 hover:shadow-md hover:scale-[1.01] bg-white dark:bg-gray-800/50 cursor-pointer'
+                }`}
+              style={{ animation: `fade-in-up 0.3s ease-out ${index * 0.08}s both` }}
+            >
+              {/* Radio indicator */}
               {!allSoldOut && (
-                <div className={`w-5 h-5 rounded-full border-2 flex-shrink-0 flex items-center justify-center ${
-                  isSelected ? 'border-primary bg-primary' : 'border-gray-300 dark:border-gray-600'
-                }`}>
-                  {isSelected && <Check className="w-3 h-3 text-white" />}
-                </div>
+                <span className={`absolute top-4 right-4 w-5 h-5 rounded-full border-2 flex items-center justify-center flex-shrink-0 transition-all ${isSelected ? 'border-primary' : 'border-gray-300 dark:border-gray-600 group-hover:border-primary/50'
+                  }`}>
+                  {isSelected && <span className="w-2.5 h-2.5 rounded-full bg-primary" />}
+                </span>
               )}
-            </div>
 
-            {/* All available classes for this coach type */}
-            <div className="px-4 py-3 space-y-2">
-              {group.tiers.map((tier) => {
-                const soldOut = tier.availableSeats === 0;
-                return (
-                  <div
-                    key={tier.id}
-                    className={`flex items-start gap-2 py-1.5 ${soldOut ? 'opacity-50' : ''}`}
-                  >
-                    <div className="w-1.5 h-1.5 rounded-full bg-primary flex-shrink-0 mt-1.5" />
-                    <div>
-                      <p className="text-sm text-gray-700 dark:text-gray-300">{tier.seatType.trim()}</p>
-                      <p className="text-xs">
-                        <span className="font-bold text-primary">{formatPrice(tier.priceMinor * priceMultiplier, tier.currency)}</span>
-                        {soldOut ? (
-                          <span className="ml-2 font-bold text-red-500">Sold out</span>
-                        ) : (
-                          <span className="ml-2 text-gray-400">{tier.availableSeats} left</span>
-                        )}
-                      </p>
+              <div className="flex flex-col">
+                <div className="flex items-start gap-2 pr-2">
+                  <div className={`w-10 h-10 rounded-xl flex items-center justify-center flex-shrink-0 transition-all ${isSelected
+                      ? 'bg-primary/15 dark:bg-primary/25 shadow-inner'
+                      : 'bg-gray-100 dark:bg-gray-700 group-hover:bg-primary/10'
+                    }`}>
+                    <CoachIcon className={`w-4 h-4 transition-colors ${isSelected ? 'text-primary' : 'text-gray-600 dark:text-gray-400 group-hover:text-primary'
+                      }`} />
+                  </div>
+
+                  <div className="flex-1 min-w-0">
+                    <p className="text-sm font-bold text-gray-700 dark:text-gray-300 tracking-wider">
+                      {formatCoachTypeLabel(group.coachTypeType)}
+                    </p>
+                    {allSoldOut && (
+                      <span className="text-xs font-bold text-red-500 mt-0.5 block">Sold out</span>
+                    )}
+                    <div className="mt-1 flex items-baseline gap-1">
+                      <span className="text-xs text-gray-500 dark:text-gray-400 font-medium">From</span>
+                      <span className={`text-sm font-bold tracking-tight ${isSelected ? 'text-primary' : 'text-gray-900 dark:text-white'
+                        }`}>
+                        {((group.minPrice * priceMultiplier) / 100).toFixed(2)}
+                      </span>
+                      <span className="text-sm font-semibold text-gray-600 dark:text-gray-400">{group.currency}</span>
                     </div>
                   </div>
-                );
-              })}
-            </div>
+                </div>
 
-            {/* Book Now — only when this group is selected */}
-            {isSelected && !allSoldOut && (
-              <div className="px-4 pb-4">
-                <button
-                  type="button"
-                  onClick={(e) => { e.stopPropagation(); onBookNow(group.coachTypeId); }}
-                  className="w-full py-2.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] text-white font-bold text-sm rounded-xl transition-all shadow-md flex items-center justify-center gap-2"
-                >
-                  Book Now <ArrowRight className="w-4 h-4" />
-                </button>
+                {/* Class options — always visible, matching results page style */}
+                {group.tiers.length > 0 && (
+                  <div className="mt-2 pt-2 border-t border-gray-200/60 dark:border-gray-700/60">
+                    <div className="space-y-1.5">
+                      {group.tiers.map((tier) => {
+                        const soldOut = tier.availableSeats === 0;
+                        return (
+                          <div
+                            key={tier.id}
+                            className={`flex flex-col py-1 px-1 rounded-lg bg-gray-50/80 dark:bg-gray-800/40 ${soldOut ? 'opacity-50' : ''}`}
+                          >
+                            <span className="text-sm font-medium text-gray-700 dark:text-gray-300">{tier.seatType.trim()}</span>
+                            {soldOut ? (
+                              <span className="text-xs font-bold text-red-500 mt-0.5">Sold out</span>
+                            ) : (
+                              <div className="flex items-baseline gap-1 mt-0.5">
+                                <span className="text-sm font-bold tabular-nums text-primary">
+                                  {((tier.priceMinor * priceMultiplier) / 100).toFixed(2)}
+                                </span>
+                                <span className="text-xs text-gray-500 dark:text-gray-400 font-medium">{tier.currency}</span>
+                              </div>
+                            )}
+                          </div>
+                        );
+                      })}
+                    </div>
+                  </div>
+                )}
+
+                {!isSelected && !allSoldOut && (
+                  <p className="mt-4 pt-3 border-t border-gray-200/60 dark:border-gray-700/60 text-xs text-gray-400 dark:text-gray-500 italic text-center">
+                    Click to select this coach
+                  </p>
+                )}
+
+                {isSelected && !allSoldOut && (
+                  <button
+                    type="button"
+                    onClick={(e) => { e.stopPropagation(); onBookNow(group.coachTypeId); }}
+                    className="mt-3 w-full flex items-center justify-center gap-2 px-4 py-2.5 bg-gradient-to-r from-[rgb(20,113,76)] to-[rgb(16,95,65)] hover:from-[rgb(16,89,60)] hover:to-[rgb(12,75,50)] text-white font-bold text-sm rounded-xl transition-all shadow-md shadow-primary/30 hover:shadow-lg active:scale-[0.98]"
+                  >
+                    Book Now <ArrowRight className="w-4 h-4" />
+                  </button>
+                )}
               </div>
-            )}
-          </div>
-        );
-      })}
+            </div>
+          );
+        })}
+      </div>
+      <style>{`
+        @keyframes fade-in-up{from{opacity:0;transform:translateY(10px)}to{opacity:1;transform:translateY(0)}}
+      `}</style>
     </div>
   );
 }
@@ -407,7 +438,7 @@ function PassengerCountModal({
 
           <div className="px-6 py-3 bg-primary/5 border-b border-primary/10">
             <p className="text-xs text-gray-400 uppercase tracking-wide font-semibold">Coach type</p>
-            <p className="text-sm font-bold text-gray-900 dark:text-white mt-0.5">{tier.seatClass?.coachType?.type ? formatCoachTypeLabel(tier.seatClass.coachType.type) : tier.label.trim()}</p>
+            <p className="text-sm font-bold text-gray-900 dark:text-white mt-0.5">{tier.seatClass?.coachType?.name ?? tier.label.trim()}</p>
             <p className="text-xs text-gray-400 mt-0.5">{remaining} seats remaining · from {formatPrice(minPriceMinor * priceMultiplier, tier.currency)} per adult · 1st child per adult free (no seat)</p>
           </div>
 
@@ -416,26 +447,26 @@ function PassengerCountModal({
               { label: "Adults", sub: `Age 5+ · max ${PKG_MAX_ADULTS}`, value: adultCount, min: 1, max: Math.min(PKG_MAX_ADULTS, remaining), set: (v: number) => { setAdultCount(v); const newMax = Math.min(v * PKG_CHILDREN_PER_ADULT, v + Math.max(0, remaining - v)); setChildCount(c => Math.min(c, newMax)); } },
               { label: "Children", sub: `Under 5 · max ${PKG_CHILDREN_PER_ADULT} per adult · 1st per adult FREE (no seat)`, value: childCount, min: 0, max: Math.min(adultCount * PKG_CHILDREN_PER_ADULT, adultCount + Math.max(0, remaining - adultCount)), set: setChildCount },
             ].map(({ label, sub, value, min, max, set }) => (
-                <div key={label} className="flex items-center justify-between">
-                  <div>
-                    <p className="text-sm font-semibold text-gray-900 dark:text-white">{label}</p>
-                    <p className="text-xs text-gray-400">{sub}</p>
-                  </div>
-                  <div className="flex items-center gap-3">
-                    <button type="button" onClick={() => set(Math.max(min, value - 1))}
-                      disabled={value <= min}
-                      className="w-8 h-8 rounded-full border-2 border-gray-200 dark:border-gray-700 flex items-center justify-center text-lg font-bold text-gray-600 dark:text-gray-300 disabled:opacity-30 hover:border-primary hover:text-primary transition-colors">
-                      −
-                    </button>
-                    <span className="w-6 text-center text-base font-bold text-gray-900 dark:text-white">{value}</span>
-                    <button type="button" onClick={() => set(value + 1)}
-                      disabled={value >= max}
-                      className="w-8 h-8 rounded-full border-2 border-gray-200 dark:border-gray-700 flex items-center justify-center text-lg font-bold text-gray-600 dark:text-gray-300 disabled:opacity-30 hover:border-primary hover:text-primary transition-colors">
-                      +
-                    </button>
-                  </div>
+              <div key={label} className="flex items-center justify-between">
+                <div>
+                  <p className="text-sm font-semibold text-gray-900 dark:text-white">{label}</p>
+                  <p className="text-xs text-gray-400">{sub}</p>
                 </div>
-              ))}
+                <div className="flex items-center gap-3">
+                  <button type="button" onClick={() => set(Math.max(min, value - 1))}
+                    disabled={value <= min}
+                    className="w-8 h-8 rounded-full border-2 border-gray-200 dark:border-gray-700 flex items-center justify-center text-lg font-bold text-gray-600 dark:text-gray-300 disabled:opacity-30 hover:border-primary hover:text-primary transition-colors">
+                    −
+                  </button>
+                  <span className="w-6 text-center text-base font-bold text-gray-900 dark:text-white">{value}</span>
+                  <button type="button" onClick={() => set(value + 1)}
+                    disabled={value >= max}
+                    className="w-8 h-8 rounded-full border-2 border-gray-200 dark:border-gray-700 flex items-center justify-center text-lg font-bold text-gray-600 dark:text-gray-300 disabled:opacity-30 hover:border-primary hover:text-primary transition-colors">
+                    +
+                  </button>
+                </div>
+              </div>
+            ))}
 
             {freeChildren > 0 && (
               <div className="flex items-center justify-between text-xs text-green-600 dark:text-green-400">
@@ -457,15 +488,14 @@ function PassengerCountModal({
 
             {/* Departure Station */}
             <div>
-              <label className="flex items-center gap-1.5 text-sm font-semibold text-gray-700 dark:text-gray-300 mb-1.5 border-t pt-3">                
+              <label className="flex items-center gap-1.5 text-sm font-semibold text-gray-700 dark:text-gray-300 mb-1.5 border-t pt-3">
                 Departure Station
               </label>
               <select
                 value={departureStationId}
                 onChange={(e) => { setDepartureStationId(e.target.value); setShowStationError(false); }}
-                className={`w-full rounded-xl border bg-white dark:bg-gray-800 text-sm text-gray-900 dark:text-white px-3 py-2.5 focus:outline-none focus:ring-2 focus:ring-primary/40 ${
-                  showStationError && !departureStationId ? 'border-red-400 dark:border-red-500' : 'border-gray-200 dark:border-gray-700'
-                }`}
+                className={`w-full rounded-xl border bg-white dark:bg-gray-800 text-sm text-gray-900 dark:text-white px-3 py-2.5 focus:outline-none focus:ring-2 focus:ring-primary/40 ${showStationError && !departureStationId ? 'border-red-400 dark:border-red-500' : 'border-gray-200 dark:border-gray-700'
+                  }`}
               >
                 <option value="">Select your boarding station</option>
                 {stations.map((s) => (
@@ -480,10 +510,10 @@ function PassengerCountModal({
             )}
 
             <button type="button" onClick={() => {
-                if (!departureStationId) { setShowStationError(true); return; }
-                const station = stations.find(s => s.id === departureStationId);
-                onConfirm(adultCount, childCount, departureStationId, station?.name ?? '');
-              }}
+              if (!departureStationId) { setShowStationError(true); return; }
+              const station = stations.find(s => s.id === departureStationId);
+              onConfirm(adultCount, childCount, departureStationId, station?.name ?? '');
+            }}
               disabled={loading || adultCount + childCount < 1}
               className="w-full py-3.5 bg-[rgb(20,113,76)] hover:bg-[rgb(16,89,60)] disabled:opacity-60 text-white font-bold text-sm rounded-xl transition-all shadow-lg flex items-center justify-center gap-2">
               {loading ? <><Loader2 className="w-4 h-4 animate-spin" /> Loading...</> : <>Continue <ArrowRight className="w-4 h-4" /></>}
@@ -523,8 +553,10 @@ export default function PackageDetailPage() {
   // For the passenger modal, use the cheapest available tier in the selected coach type group
   const groups = pkg ? groupTiersByCoachType(pkg.priceTiers) : [];
   const selectedGroup = groups.find((g) => g.coachTypeId === selectedCoachTypeId);
-  // Representative tier for the modal header (cheapest available)
-  const representativeTier = selectedGroup?.tiers.find((t) => t.availableSeats > 0) ?? selectedGroup?.tiers[0] ?? null;
+  // Representative tier for the modal: cheapest available in the selected group
+  const representativeTier = selectedGroup?.tiers
+    .filter((t) => t.availableSeats > 0)
+    .sort((a, b) => a.priceMinor - b.priceMinor)[0] ?? selectedGroup?.tiers[0] ?? null;
 
   const isRoundTripPkg = pkg?.journeyType === 'ROUND_TRIP';
 
@@ -745,9 +777,9 @@ export default function PackageDetailPage() {
                 <p className="text-xs font-bold text-gray-800 dark:text-white mt-0.5">
                   {pkg.priceTiers.length
                     ? formatPrice(
-                        Math.min(...pkg.priceTiers.map((t) => t.priceMinor)) * (isRoundTripPkg ? 2 : 1),
-                        pkg.priceTiers[0].currency,
-                      )
+                      Math.min(...pkg.priceTiers.map((t) => t.priceMinor)) * (isRoundTripPkg ? 2 : 1),
+                      pkg.priceTiers[0].currency,
+                    )
                     : "—"}
                 </p>
               </div>
diff --git a/apps/edr-passenger-web/portal/src/app/page.tsx b/apps/edr-passenger-web/portal/src/app/page.tsx
index 93bf02fc2..b9475fc81 100644
--- a/apps/edr-passenger-web/portal/src/app/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/page.tsx
@@ -1,9 +1,37 @@
 import { Suspense } from 'react';
+import dynamic from 'next/dynamic';
 import { dehydrate, HydrationBoundary, QueryClient } from '@tanstack/react-query';
 import SearchPage from '@/app/booking/search/page';
-import PackagesSection from '@/components/PackagesSection';
 
-export default async function Home() {
+// Below-the-fold on the landing page — code-split out of the initial bundle
+// needed to render/hydrate the (above-the-fold) search form.
+const PackagesSection = dynamic(() => import('@/components/PackagesSection'));
+
+// Skeleton for the search form while stations are prefetched server-side —
+// keeps first paint on a slow connection from being a blank page, and
+// approximates the real form's height to avoid layout shift once it streams in.
+function SearchFormSkeleton() {
+  return (
+    <div className="w-full max-w-4xl mx-auto animate-pulse">
+      <div className="rounded-2xl border border-gray-100 dark:border-gray-800 p-6 space-y-4">
+        <div className="h-8 bg-gray-200 dark:bg-gray-700 rounded w-1/3" />
+        <div className="grid md:grid-cols-2 gap-4">
+          <div className="h-12 bg-gray-200 dark:bg-gray-700 rounded-xl" />
+          <div className="h-12 bg-gray-200 dark:bg-gray-700 rounded-xl" />
+        </div>
+        <div className="h-12 bg-gray-200 dark:bg-gray-700 rounded-xl" />
+        <div className="h-12 bg-gray-300 dark:bg-gray-600 rounded-xl w-40" />
+      </div>
+    </div>
+  );
+}
+
+// Isolates the server-side stations prefetch behind its own Suspense boundary
+// (a real async Server Component, unlike a plain `await` in the page body) so
+// Next.js can stream: the shell flushes immediately with SearchFormSkeleton,
+// then the real search form + hydrated stations data stream in once ready —
+// instead of blocking the whole page's TTFB on that one fetch.
+async function StationsPrefetch({ children }: { children: React.ReactNode }) {
   const queryClient = new QueryClient();
   const apiUrl = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4000';
 
@@ -18,10 +46,18 @@ export default async function Home() {
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <Suspense>
-        <SearchPage />
-        <PackagesSection />
-      </Suspense>
+      {children}
     </HydrationBoundary>
   );
 }
+
+export default function Home() {
+  return (
+    <Suspense fallback={<SearchFormSkeleton />}>
+      <StationsPrefetch>
+        <SearchPage />
+        <PackagesSection />
+      </StationsPrefetch>
+    </Suspense>
+  );
+}
diff --git a/apps/edr-passenger-web/portal/src/components/AppHeader.tsx b/apps/edr-passenger-web/portal/src/components/AppHeader.tsx
deleted file mode 100644
index b1fc2ddf5..000000000
--- a/apps/edr-passenger-web/portal/src/components/AppHeader.tsx
+++ /dev/null
@@ -1,214 +0,0 @@
-"use client";
-
-import { Menu, X, Moon, Sun, HelpCircle, KeyRound, LogOut, ChevronDown } from "lucide-react";
-import Link from "next/link";
-import Image from "next/image";
-import { useEffect, useState } from "react";
-import { useAuthStore } from "@/lib/auth-store";
-import ChangePasswordModal from "@/components/ChangePasswordModal";
-
-export default function AppHeader() {
-  const [isOpen, setIsOpen] = useState(false);
-  const [isDark, setIsDark] = useState(false);
-  const [showUserMenu, setShowUserMenu] = useState(false);
-  const [showChangePassword, setShowChangePassword] = useState(false);
-  const { user, isAuthenticated, initialize, logout } = useAuthStore();
-
-  useEffect(() => {
-    const isDarkMode = document.documentElement.classList.contains("dark");
-    setIsDark(isDarkMode);
-    initialize();
-  }, [initialize]);
-
-  const toggleTheme = () => {
-    const html = document.documentElement;
-    const isDarkMode = html.classList.contains("dark");
-    if (isDarkMode) {
-      html.classList.remove("dark");
-      setIsDark(false);
-      localStorage.setItem("theme", "light");
-    } else {
-      html.classList.add("dark");
-      setIsDark(true);
-      localStorage.setItem("theme", "dark");
-    }
-  };
-
-
-
-  return (
-    <header className="sticky top-0 z-[60] bg-[rgb(20_113_76)] dark:bg-gray-900 border-b border-[rgb(16_89_60)] dark:border-gray-800 shadow-sm">
-      <div className="container mx-auto px-4">
-        <div className="max-w-6xl mx-auto">
-          <div className="flex items-center justify-between h-16">
-            {/* Logo */}
-            <Link
-              href="/"
-              className="flex items-center hover:opacity-80 transition-opacity"
-            >
-              <Image
-                src="/edr-logo.png"
-                alt="Ethio-Djibouti Railway"
-                width={140}
-                height={48}
-                className="h-14 w-auto"
-                priority
-              />
-            </Link>
-
-            {/* Desktop Menu */}
-            <div className="hidden md:flex items-center gap-8">
-              <Link
-                href="/booking/lookup"
-                className="text-sm font-medium text-gray-100 hover:text-white transition-colors"
-              >
-                My Booking
-              </Link>
-            </div>
-
-            {/* Right Actions */}
-            <div className="flex items-center gap-2">
-              {/* Help Link */}
-              <Link
-                href="/help"
-                className="hidden sm:flex items-center justify-center p-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                title="Help & FAQ"
-              >
-                <HelpCircle className="w-5 h-5" />
-              </Link>
-
-              {/* Theme Toggler */}
-              <button
-                onClick={toggleTheme}
-                className="p-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                title={isDark ? "Light mode" : "Dark mode"}
-              >
-                {isDark ? (
-                  <Sun className="w-5 h-5" />
-                ) : (
-                  <Moon className="w-5 h-5" />
-                )}
-              </button>
-
-              {/* Auth */}
-              {isAuthenticated && user ? (
-                <div className="relative">
-                  <button
-                    onClick={() => setShowUserMenu(!showUserMenu)}
-                    className="flex items-center gap-2 p-1.5 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                  >
-                    <div className="flex h-8 w-8 items-center justify-center rounded-full bg-white text-[rgb(20_113_76)] font-semibold text-sm">
-                      {user.fullName?.toUpperCase().charAt(0) || 'U'}
-                    </div>
-                    <ChevronDown className="hidden sm:block w-4 h-4 text-gray-100" />
-                  </button>
-
-                  {showUserMenu && (
-                    <div className="absolute right-0 top-full mt-2 w-56 z-50 rounded-lg border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 shadow-xl">
-                      <div className="p-3 border-b border-gray-200 dark:border-gray-700">
-                        <p className="text-sm font-medium text-gray-900 dark:text-gray-100 truncate">{user.fullName}</p>
-                        <p className="text-xs text-gray-500 dark:text-gray-400 truncate">{user.email}</p>
-                      </div>
-                      <div className="p-2">
-                        <button
-                          onClick={() => {
-                            setShowUserMenu(false);
-                            setShowChangePassword(true);
-                          }}
-                          className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"
-                        >
-                          <KeyRound className="h-4 w-4" />
-                          Change Password
-                        </button>
-                        <button
-                          onClick={() => {
-                            setShowUserMenu(false);
-                            logout();
-                          }}
-                          className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-[rgb(20_113_76)] dark:text-emerald-400 hover:bg-green-50 dark:hover:bg-green-900/20 transition-colors"
-                        >
-                          <LogOut className="h-4 w-4" />
-                          Sign out
-                        </button>
-                      </div>
-                    </div>
-                  )}
-                </div>
-              ) : (
-                <div className="hidden md:flex items-center gap-2">
-                  <Link
-                    href="/login"
-                    className="px-3 py-1.5 text-sm font-medium text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                  >
-                    Sign in
-                  </Link>
-                  <Link
-                    href="/register"
-                    className="px-3 py-1.5 text-sm font-medium bg-white text-[rgb(20_113_76)] hover:bg-gray-100 rounded-lg transition-colors"
-                  >
-                    Register
-                  </Link>
-                </div>
-              )}
-
-              {/* Mobile Menu Button */}
-              <button
-                onClick={() => setIsOpen(!isOpen)}
-                className="md:hidden p-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg"
-              >
-                {isOpen ? (
-                  <X className="w-5 h-5" />
-                ) : (
-                  <Menu className="w-5 h-5" />
-                )}
-              </button>
-            </div>
-          </div>
-
-          {/* Mobile Menu */}
-          {isOpen && (
-            <div className="md:hidden border-t border-white border-opacity-20 dark:border-gray-700 py-4 space-y-2 animate-in slide-in-from-top-2 duration-200">
-              <Link
-                href="/booking/lookup"
-                className="block px-4 py-2 text-gray-100 dark:text-gray-300 hover:bg-white hover:bg-opacity-10 dark:hover:bg-gray-800 rounded-lg transition-colors"
-                onClick={() => setIsOpen(false)}
-              >
-                My Booking
-              </Link>
-              <Link
-                href="/help"
-                className="block px-4 py-2 text-gray-100 dark:text-gray-300 hover:bg-white hover:bg-opacity-10 dark:hover:bg-gray-800 rounded-lg transition-colors"
-                onClick={() => setIsOpen(false)}
-              >
-                Help
-              </Link>
-              {!isAuthenticated && (
-                <>
-                  <Link
-                    href="/login"
-                    className="block px-4 py-2 text-gray-100 dark:text-gray-300 hover:bg-white hover:bg-opacity-10 dark:hover:bg-gray-800 rounded-lg transition-colors"
-                    onClick={() => setIsOpen(false)}
-                  >
-                    Sign in
-                  </Link>
-                  <Link
-                    href="/register"
-                    className="block px-4 py-2 text-gray-100 dark:text-gray-300 hover:bg-white hover:bg-opacity-10 dark:hover:bg-gray-800 rounded-lg transition-colors"
-                    onClick={() => setIsOpen(false)}
-                  >
-                    Register
-                  </Link>
-                </>
-              )}
-            </div>
-          )}
-        </div>
-      </div>
-
-      <ChangePasswordModal
-        isOpen={showChangePassword}
-        onClose={() => setShowChangePassword(false)}
-      />
-    </header>
-  );
-}
diff --git a/apps/edr-passenger-web/portal/src/components/AppSidebar.tsx b/apps/edr-passenger-web/portal/src/components/AppSidebar.tsx
new file mode 100644
index 000000000..6d47b8b5a
--- /dev/null
+++ b/apps/edr-passenger-web/portal/src/components/AppSidebar.tsx
@@ -0,0 +1,212 @@
+'use client';
+
+import {
+  Home,
+  Phone,
+  Ticket,
+  HelpCircle,
+  Moon,
+  Sun,
+  KeyRound,
+  LogOut,
+  ChevronDown,
+  Check,
+} from 'lucide-react';
+import Link from 'next/link';
+import Image from 'next/image';
+import { usePathname } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { useAuthStore } from '@/lib/auth-store';
+import ChangePasswordModal from '@/components/ChangePasswordModal';
+import { BOOKING_STEPS } from '@/components/ProgressIndicator';
+
+// Mirrors booking/layout.tsx's stepMap — the linear booking flow routes that
+// get a vertical step list instead of the standard nav highlighting.
+const BOOKING_STEP_MAP: Record<string, string> = {
+  '/booking/search': 'search',
+  '/booking/results': 'results',
+  '/booking/auth-check': 'passengers',
+  '/booking/passengers': 'passengers',
+  '/booking/seats': 'seats',
+  '/booking/review': 'review',
+  '/booking/payment': 'payment',
+  '/booking/confirmation': 'confirmation',
+};
+
+const NAV_LINKS = [
+  { href: '/', label: 'Home', icon: Home },
+  { href: '/booking/lookup', label: 'My Bookings', icon: Ticket },
+  { href: '/contact', label: 'Contact', icon: Phone },
+  { href: '/help', label: 'Help', icon: HelpCircle },
+];
+
+export default function AppSidebar() {
+  const pathname = usePathname();
+  const [isDark, setIsDark] = useState(false);
+  const [showUserMenu, setShowUserMenu] = useState(false);
+  const [showChangePassword, setShowChangePassword] = useState(false);
+  const { user, isAuthenticated, initialize, logout } = useAuthStore();
+
+  useEffect(() => {
+    setIsDark(document.documentElement.classList.contains('dark'));
+    initialize();
+  }, [initialize]);
+
+  const toggleTheme = () => {
+    const html = document.documentElement;
+    const nextDark = !html.classList.contains('dark');
+    html.classList.toggle('dark', nextDark);
+    localStorage.setItem('theme', nextDark ? 'dark' : 'light');
+    setIsDark(nextDark);
+  };
+
+  const currentStepId = BOOKING_STEP_MAP[pathname ?? ''];
+  const currentStepIndex = currentStepId ? BOOKING_STEPS.findIndex((s) => s.id === currentStepId) : -1;
+
+  return (
+    <aside className="hidden lg:flex w-64 fixed inset-y-0 left-0 z-40 flex-col bg-[rgb(20_113_76)] dark:bg-gray-900 border-r border-[rgb(16_89_60)] dark:border-gray-800">
+      <Link href="/" className="flex items-center px-5 h-20 flex-shrink-0 hover:opacity-80 transition-opacity">
+        <Image
+          src="/edr-logo.png"
+          alt="Ethio-Djibouti Railway"
+          width={140}
+          height={48}
+          className="h-16 w-auto"
+          priority
+        />
+      </Link>
+
+      <nav className="flex-1 overflow-y-auto px-3 py-4 space-y-1">
+        {NAV_LINKS.map(({ href, label, icon: Icon }) => {
+          const isActive = href === '/' ? pathname === '/' : pathname?.startsWith(href);
+          return (
+            <Link
+              key={href}
+              href={href}
+              className={`flex items-center gap-3 px-3 py-2.5 rounded-lg text-sm font-medium transition-colors ${
+                isActive
+                  ? 'bg-white/15 text-white'
+                  : 'text-gray-100 hover:bg-white/10 hover:text-white'
+              }`}
+            >
+              <Icon className="w-5 h-5" />
+              {label}
+            </Link>
+          );
+        })}
+
+        {currentStepIndex >= 0 && (
+          <div className="mt-6 pt-4 border-t border-white/15">
+            <p className="px-3 pb-2 text-xs font-semibold uppercase tracking-wide text-gray-200/80">
+              Your booking
+            </p>
+            <ol className="space-y-1">
+              {BOOKING_STEPS.map((step, index) => {
+                const isComplete = index < currentStepIndex;
+                const isCurrent = index === currentStepIndex;
+                return (
+                  <li key={step.id} className="flex items-center gap-2.5 px-3 py-1.5">
+                    <span
+                      className={`flex h-5 w-5 flex-shrink-0 items-center justify-center rounded-full text-[10px] font-bold transition-colors ${
+                        isComplete
+                          ? 'bg-white text-[rgb(20,113,76)]'
+                          : isCurrent
+                            ? 'border-2 border-white text-white'
+                            : 'border border-white/30 text-white/50'
+                      }`}
+                    >
+                      {isComplete ? <Check className="w-3 h-3" /> : index + 1}
+                    </span>
+                    <span
+                      className={`text-sm ${
+                        isCurrent ? 'text-white font-semibold' : isComplete ? 'text-gray-100' : 'text-white/50'
+                      }`}
+                    >
+                      {step.name}
+                    </span>
+                  </li>
+                );
+              })}
+            </ol>
+          </div>
+        )}
+      </nav>
+
+      <div className="flex-shrink-0 border-t border-white/15 p-3 space-y-1">
+        <button
+          onClick={toggleTheme}
+          className="flex w-full items-center gap-3 px-3 py-2.5 rounded-lg text-sm font-medium text-gray-100 hover:bg-white/10 hover:text-white transition-colors"
+        >
+          {isDark ? <Sun className="w-5 h-5" /> : <Moon className="w-5 h-5" />}
+          {isDark ? 'Light mode' : 'Dark mode'}
+        </button>
+
+        {isAuthenticated && user ? (
+          <div className="relative">
+            <button
+              onClick={() => setShowUserMenu((v) => !v)}
+              className="flex w-full items-center gap-3 px-3 py-2 rounded-lg hover:bg-white/10 transition-colors"
+            >
+              <div className="flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full bg-white text-[rgb(20_113_76)] font-semibold text-sm">
+                {user.fullName?.toUpperCase().charAt(0) || 'U'}
+              </div>
+              <span className="flex-1 text-left text-sm font-medium text-white truncate">{user.fullName}</span>
+              <ChevronDown className={`w-4 h-4 text-gray-200 transition-transform ${showUserMenu ? 'rotate-180' : ''}`} />
+            </button>
+
+            {showUserMenu && (
+              <div className="absolute bottom-full left-0 mb-2 w-full rounded-lg border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 shadow-xl overflow-hidden">
+                <div className="p-3 border-b border-gray-200 dark:border-gray-700">
+                  <p className="text-sm font-medium text-gray-900 dark:text-gray-100 truncate">{user.fullName}</p>
+                  <p className="text-xs text-gray-500 dark:text-gray-400 truncate">{user.email}</p>
+                </div>
+                <div className="p-2">
+                  <button
+                    onClick={() => {
+                      setShowUserMenu(false);
+                      setShowChangePassword(true);
+                    }}
+                    className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"
+                  >
+                    <KeyRound className="h-4 w-4" />
+                    Change Password
+                  </button>
+                  <button
+                    onClick={() => {
+                      setShowUserMenu(false);
+                      logout();
+                    }}
+                    className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-sm text-[rgb(20_113_76)] dark:text-emerald-400 hover:bg-green-50 dark:hover:bg-green-900/20 transition-colors"
+                  >
+                    <LogOut className="h-4 w-4" />
+                    Sign out
+                  </button>
+                </div>
+              </div>
+            )}
+          </div>
+        ) : (
+          <div className="flex items-center gap-2 px-1 pt-1">
+            <Link
+              href="/login"
+              className="flex-1 text-center px-3 py-2 text-sm font-medium text-gray-100 hover:bg-white/10 rounded-lg transition-colors"
+            >
+              Sign in
+            </Link>
+            <Link
+              href="/register"
+              className="flex-1 text-center px-3 py-2 text-sm font-medium bg-white text-[rgb(20_113_76)] hover:bg-gray-100 rounded-lg transition-colors"
+            >
+              Register
+            </Link>
+          </div>
+        )}
+      </div>
+
+      <ChangePasswordModal
+        isOpen={showChangePassword}
+        onClose={() => setShowChangePassword(false)}
+      />
+    </aside>
+  );
+}
diff --git a/apps/edr-passenger-web/portal/src/components/BottomTabBar.tsx b/apps/edr-passenger-web/portal/src/components/BottomTabBar.tsx
new file mode 100644
index 000000000..47bc58792
--- /dev/null
+++ b/apps/edr-passenger-web/portal/src/components/BottomTabBar.tsx
@@ -0,0 +1,69 @@
+'use client';
+
+import { Home, Phone, Ticket, User } from 'lucide-react';
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
+import { useAuthStore } from '@/lib/auth-store';
+
+// The linear, one-screen-at-a-time booking flow — each of these pages already
+// has its own sticky mobile CTA bar (and the mobile step strip at the top),
+// so the tab bar hides rather than stacking a second bottom bar underneath.
+const LINEAR_FLOW_PREFIXES = [
+  '/booking/search',
+  '/booking/results',
+  '/booking/seats',
+  '/booking/passengers',
+  '/booking/auth-check',
+  '/booking/review',
+  '/booking/payment',
+  '/booking/confirmation',
+];
+
+export default function BottomTabBar() {
+  const pathname = usePathname() ?? '';
+  const { isAuthenticated } = useAuthStore();
+
+  const isInLinearFlow = LINEAR_FLOW_PREFIXES.some((p) => pathname.startsWith(p));
+  if (isInLinearFlow) return null;
+
+  const tabs = [
+    { href: '/', label: 'Home', icon: Home, match: (p: string) => p === '/' },
+    { href: '/booking/lookup', label: 'Bookings', icon: Ticket, match: (p: string) => p.startsWith('/booking/lookup') || p.startsWith('/booking/detail') },
+    { href: '/contact', label: 'Contact', icon: Phone, match: (p: string) => p.startsWith('/contact') },
+    {
+      href: isAuthenticated ? '/profile' : '/login',
+      label: isAuthenticated ? 'Account' : 'Sign in',
+      icon: User,
+      match: (p: string) => p.startsWith('/profile') || p.startsWith('/login') || p.startsWith('/register'),
+    },
+  ];
+
+  return (
+    <>
+      {/* In-flow spacer so page content/Footer can't end up hidden behind the
+          fixed bar below — self-contained here so it only exists when the
+          bar itself is actually rendered. */}
+      <div className="lg:hidden h-16" aria-hidden="true" />
+      <nav className="lg:hidden fixed bottom-0 inset-x-0 z-40 bg-white dark:bg-gray-900 border-t border-gray-200 dark:border-gray-800 shadow-[0_-2px_10px_rgba(0,0,0,0.05)]">
+        <ul className="flex items-stretch">
+          {tabs.map(({ href, label, icon: Icon, match }) => {
+            const isActive = match(pathname);
+            return (
+              <li key={href} className="flex-1">
+                <Link
+                  href={href}
+                  className={`flex flex-col items-center justify-center gap-0.5 py-2.5 text-[11px] font-medium transition-colors ${
+                    isActive ? 'text-primary' : 'text-gray-500 dark:text-gray-400'
+                  }`}
+                >
+                  <Icon className={`w-5 h-5 ${isActive ? 'text-primary' : ''}`} strokeWidth={isActive ? 2.5 : 2} />
+                  {label}
+                </Link>
+              </li>
+            );
+          })}
+        </ul>
+      </nav>
+    </>
+  );
+}
diff --git a/apps/edr-passenger-web/portal/src/components/LandingNav.tsx b/apps/edr-passenger-web/portal/src/components/LandingNav.tsx
deleted file mode 100644
index 76d5fabb9..000000000
--- a/apps/edr-passenger-web/portal/src/components/LandingNav.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-'use client';
-
-import { Train, Menu, X, Moon, Sun, HelpCircle } from 'lucide-react';
-import Link from 'next/link';
-import { useState, useEffect } from 'react';
-import { LanguageSwitcher } from './LanguageSwitcher';
-import { getTranslation, Language } from '@/lib/i18n';
-import { useLanguage } from '@/lib/i18n';
-
-export function LandingNav() {
-  const [isOpen, setIsOpen] = useState(false);
-  const [lang, setLang] = useState<Language>('en');
-  const [isDark, setIsDark] = useState(false);
-  const [mounted, setMounted] = useState(false);
-  const { getLang } = useLanguage();
-  const t = (key: string) => getTranslation(lang, key);
-
-  useEffect(() => {
-    setMounted(true);
-    setLang(getLang());
-    const handleLanguageChange = (e: any) => setLang(e.detail);
-    window.addEventListener('languageChange', handleLanguageChange);
-    return () => window.removeEventListener('languageChange', handleLanguageChange);
-  }, [getLang]);
-
-  useEffect(() => {
-    const isDarkMode = document.documentElement.classList.contains('dark');
-    setIsDark(isDarkMode);
-  }, []);
-
-  const toggleTheme = () => {
-    const html = document.documentElement;
-    const isDarkMode = html.classList.contains('dark');
-    if (isDarkMode) {
-      html.classList.remove('dark');
-      setIsDark(false);
-      localStorage.setItem('theme', 'light');
-    } else {
-      html.classList.add('dark');
-      setIsDark(true);
-      localStorage.setItem('theme', 'dark');
-    }
-  };
-
-  const menuItems = [
-    { label: t('nav.home'), href: '/' },
-    { label: t('nav.services'), href: '/services' },
-    { label: t('nav.about'), href: '/about' },
-    { label: t('nav.contact'), href: '/contact' },
-  ];
-
-  if (!mounted) return null;
-
-  return (
-    <nav className="sticky top-0 z-40 bg-[rgb(20_113_76)] border-b border-[rgb(16_89_60)] shadow-sm">
-      <div className="container mx-auto px-4">
-        <div className="max-w-6xl mx-auto">
-          <div className="flex items-center justify-between h-16">
-            {/* Logo */}
-            <Link href="/" className="flex items-center gap-3 hover:opacity-80 transition-opacity">
-              <div className="w-10 h-10 bg-white rounded-lg flex items-center justify-center">
-                <Train className="w-6 h-6 text-[rgb(20_113_76)]" />
-              </div>
-              <div>
-                <h1 className="text-lg font-bold text-white">
-                  Ethio-Djibouti Railway
-                </h1>
-                <p className="text-xs text-gray-100">
-                  Book your train journey with us
-                </p>
-              </div>
-            </Link>
-
-            {/* Desktop Menu */}
-            <div className="hidden md:flex items-center gap-8">
-              {menuItems.map((item) => (
-                <Link
-                  key={item.href}
-                  href={item.href}
-                  className="text-sm font-medium text-gray-100 hover:text-white transition-colors"
-                >
-                  {item.label}
-                </Link>
-              ))}
-            </div>
-
-            {/* Right Actions */}
-            <div className="flex items-center gap-3">
-              <LanguageSwitcher />
-              
-              {/* Help Link */}
-              <Link
-                href="/help"
-                className="hidden sm:flex items-center gap-1.5 px-3 py-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                title="Help & FAQ"
-              >
-                <HelpCircle className="w-5 h-5" />
-              </Link>
-
-              {/* Theme Toggler */}
-              <button
-                onClick={toggleTheme}
-                className="p-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                title={isDark ? 'Light mode' : 'Dark mode'}
-              >
-                {isDark ? (
-                  <Sun className="w-5 h-5" />
-                ) : (
-                  <Moon className="w-5 h-5" />
-                )}
-              </button>
-
-              <Link
-                href="/booking/search"
-                className="hidden sm:block px-4 py-2 bg-white text-[rgb(20_113_76)] text-sm font-medium rounded-lg transition-all duration-200 transform hover:scale-105 hover:bg-gray-100"
-              >
-                {t('nav.bookNow')}
-              </Link>
-
-              {/* Mobile Menu Button */}
-              <button
-                onClick={() => setIsOpen(!isOpen)}
-                className="md:hidden p-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg"
-              >
-                {isOpen ? <X className="w-5 h-5" /> : <Menu className="w-5 h-5" />}
-              </button>
-            </div>
-          </div>
-
-          {/* Mobile Menu */}
-          {isOpen && (
-            <div className="md:hidden border-t border-white border-opacity-20 py-4 space-y-2 animate-in slide-in-from-top-2 duration-200">
-              {menuItems.map((item) => (
-                <Link
-                  key={item.href}
-                  href={item.href}
-                  className="block px-4 py-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                  onClick={() => setIsOpen(false)}
-                >
-                  {item.label}
-                </Link>
-              ))}
-              <Link
-                href="/help"
-                className="block px-4 py-2 text-gray-100 hover:bg-white hover:bg-opacity-10 rounded-lg transition-colors"
-                onClick={() => setIsOpen(false)}
-              >
-                {t('nav.help')}
-              </Link>
-              <Link
-                href="/booking/search"
-                className="block px-4 py-2 bg-white text-[rgb(20_113_76)] font-medium rounded-lg transition-colors hover:bg-gray-100"
-                onClick={() => setIsOpen(false)}
-              >
-                {t('nav.bookNow')}
-              </Link>
-            </div>
-          )}
-        </div>
-      </div>
-    </nav>
-  );
-}
diff --git a/apps/edr-passenger-web/portal/src/components/LoadingIndicator.tsx b/apps/edr-passenger-web/portal/src/components/LoadingIndicator.tsx
index 9fa5c466e..09ad7d787 100644
--- a/apps/edr-passenger-web/portal/src/components/LoadingIndicator.tsx
+++ b/apps/edr-passenger-web/portal/src/components/LoadingIndicator.tsx
@@ -1,23 +1,72 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { Suspense, useEffect, useRef, useState } from 'react';
+import { usePathname, useSearchParams } from 'next/navigation';
 
-export function LoadingIndicator() {
+// Minimum time the bar stays visible once shown, so very fast local
+// transitions don't flash imperceptibly (standard practice for top-loading
+// progress bars).
+const MIN_VISIBLE_MS = 300;
+
+function LoadingIndicatorInner() {
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
   const [isVisible, setIsVisible] = useState(false);
+  const shownAtRef = useRef<number | null>(null);
 
+  // Detects the START of a navigation: a same-origin link click gives
+  // instant feedback on tap, before the RSC fetch even begins. Browser
+  // back/forward (popstate) is covered the same way.
   useEffect(() => {
-    const handleStart = () => setIsVisible(true);
-    const handleEnd = () => setIsVisible(false);
+    const handleClick = (e: MouseEvent) => {
+      if (e.defaultPrevented || e.button !== 0) return;
+      if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
 
-    window.addEventListener('beforeunload', handleStart);
-    window.addEventListener('load', handleEnd);
+      const anchor = (e.target as HTMLElement | null)?.closest('a');
+      if (!anchor) return;
+      if (anchor.target && anchor.target !== '_self') return;
+      if (anchor.hasAttribute('download')) return;
 
+      const href = anchor.getAttribute('href');
+      if (!href || href.startsWith('#') || href.startsWith('mailto:') || href.startsWith('tel:')) return;
+
+      let url: URL;
+      try {
+        url = new URL(href, window.location.href);
+      } catch {
+        return;
+      }
+      if (url.origin !== window.location.origin) return;
+      if (url.pathname + url.search === window.location.pathname + window.location.search) return;
+
+      shownAtRef.current = Date.now();
+      setIsVisible(true);
+    };
+
+    const handlePopState = () => {
+      shownAtRef.current = Date.now();
+      setIsVisible(true);
+    };
+
+    document.addEventListener('click', handleClick, true);
+    window.addEventListener('popstate', handlePopState);
     return () => {
-      window.removeEventListener('beforeunload', handleStart);
-      window.removeEventListener('load', handleEnd);
+      document.removeEventListener('click', handleClick, true);
+      window.removeEventListener('popstate', handlePopState);
     };
   }, []);
 
+  // Detects the END of a navigation: pathname/search settling to a new value
+  // means the route transition has completed.
+  useEffect(() => {
+    if (!isVisible) return;
+    const elapsed = shownAtRef.current ? Date.now() - shownAtRef.current : MIN_VISIBLE_MS;
+    const remaining = Math.max(0, MIN_VISIBLE_MS - elapsed);
+    const timer = setTimeout(() => setIsVisible(false), remaining);
+    return () => clearTimeout(timer);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [pathname, searchParams]);
+
   if (!isVisible) return null;
 
   return (
@@ -28,3 +77,11 @@ export function LoadingIndicator() {
     </div>
   );
 }
+
+export function LoadingIndicator() {
+  return (
+    <Suspense fallback={null}>
+      <LoadingIndicatorInner />
+    </Suspense>
+  );
+}
diff --git a/apps/edr-passenger-web/portal/src/components/MobileTopBar.tsx b/apps/edr-passenger-web/portal/src/components/MobileTopBar.tsx
new file mode 100644
index 000000000..8920b2e80
--- /dev/null
+++ b/apps/edr-passenger-web/portal/src/components/MobileTopBar.tsx
@@ -0,0 +1,24 @@
+import Link from 'next/link';
+import Image from 'next/image';
+
+// AppSidebar (which carries the logo) is `hidden lg:flex` — invisible on
+// mobile, so mobile pages had no branding/way back to home at all. This is
+// the mobile-only equivalent: a slim bar with just the logo. Deliberately
+// not sticky — it scrolls away with the page content instead of staying
+// pinned to the top.
+export default function MobileTopBar() {
+  return (
+    <div className="lg:hidden relative bg-[rgb(20_113_76)] dark:bg-gray-900 border-b border-[rgb(16_89_60)] dark:border-gray-800 px-4 h-16 flex items-center flex-shrink-0">
+      <Link href="/" className="flex items-center hover:opacity-80 transition-opacity" aria-label="Go to home">
+        <Image
+          src="/edr-logo.png"
+          alt="Ethio-Djibouti Railway"
+          width={140}
+          height={48}
+          className="h-14 w-auto"
+          priority
+        />
+      </Link>
+    </div>
+  );
+}
diff --git a/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx b/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx
index 5ea145bba..674755516 100644
--- a/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx
+++ b/apps/edr-passenger-web/portal/src/components/ModernDatePicker.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useState, useEffect, useRef } from 'react';
+import { createPortal } from 'react-dom';
 import { ChevronLeft, ChevronRight, Calendar as CalendarIcon, Globe, X } from 'lucide-react';
 import {
   gregorianToEthiopian,
@@ -18,6 +19,7 @@ interface ModernDatePickerProps {
   minDate?: Date;
   maxDate?: Date;
   placeholder?: string;
+  error?: boolean;
 }
 
 export default function ModernDatePicker({
@@ -26,6 +28,7 @@ export default function ModernDatePicker({
   minDate,
   maxDate,
   placeholder = 'Select date',
+  error = false,
 }: ModernDatePickerProps) {
   const [isOpen, setIsOpen] = useState(false);
   const [isMobileView, setIsMobileView] = useState(false);
@@ -259,6 +262,21 @@ export default function ModernDatePicker({
         {calendarType === 'gregorian' ? renderGregorianCalendar() : renderEthiopianCalendar()}
         {calendarFooter}
       </div>
+
+      {/* Mobile-only: a large, unmistakable Cancel action in addition to the header
+          X — the mobile view is a full-screen takeover with no backdrop to tap, so
+          this is the fallback way out without having to pick a date. */}
+      {isMobileView && (
+        <div className="flex-shrink-0 border-t border-gray-200 dark:border-gray-700 p-3 bg-white dark:bg-gray-900">
+          <button
+            type="button"
+            onClick={() => setIsOpen(false)}
+            className="w-full py-3 rounded-xl border-2 border-gray-200 dark:border-gray-700 text-sm font-semibold text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors"
+          >
+            Cancel
+          </button>
+        </div>
+      )}
     </div>
   );
 
@@ -268,7 +286,11 @@ export default function ModernDatePicker({
       <button
         type="button"
         onClick={() => setIsOpen(true)}
-        className="w-full px-3.5 py-3.5 border-2 border-gray-200 dark:border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary text-left flex items-center justify-between bg-white dark:bg-gray-800 hover:border-gray-300 dark:hover:border-gray-600 transition-all group"
+        className={`w-full px-3.5 py-3.5 border-2 rounded-xl focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary text-left flex items-center justify-between bg-white dark:bg-gray-800 transition-all group ${
+          error
+            ? 'border-red-400 hover:border-red-400'
+            : 'border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600'
+        }`}
       >
         <span className={`text-sm ${value ? 'text-gray-900 dark:text-gray-100 font-medium' : 'text-gray-400'}`}>
           {value ? format(value, 'EEE, MMM d, yyyy') : placeholder}
@@ -276,7 +298,7 @@ export default function ModernDatePicker({
         <CalendarIcon className="w-4 h-4 text-gray-400 group-hover:text-primary transition-colors flex-shrink-0" />
       </button>
 
-      {isOpen && (
+      {isOpen && createPortal(
         <>
 
           {/* Mobile: full-screen takeover */}
@@ -314,7 +336,8 @@ export default function ModernDatePicker({
               to   { transform: scale(1);    opacity: 1; }
             }
           `}</style>
-        </>
+        </>,
+        document.body
       )}
     </div>
   );
diff --git a/apps/edr-passenger-web/portal/src/components/PageTransition.tsx b/apps/edr-passenger-web/portal/src/components/PageTransition.tsx
new file mode 100644
index 000000000..dbc8839e3
--- /dev/null
+++ b/apps/edr-passenger-web/portal/src/components/PageTransition.tsx
@@ -0,0 +1,15 @@
+'use client';
+
+import { usePathname } from 'next/navigation';
+
+// Keying by pathname forces React to remount this wrapper on every route
+// change, which restarts the CSS animation — a subtle fade/slide-up on each
+// step of the booking flow, no animation library required.
+export function PageTransition({ children }: { children: React.ReactNode }) {
+  const pathname = usePathname();
+  return (
+    <div key={pathname} className="animate-fade-in-up">
+      {children}
+    </div>
+  );
+}
diff --git a/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx b/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx
index 9d0215c3a..40f80d448 100644
--- a/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx
+++ b/apps/edr-passenger-web/portal/src/components/ProgressIndicator.tsx
@@ -3,7 +3,9 @@
 import { Check } from 'lucide-react';
 import { useEffect, useRef } from 'react';
 
-const steps = [
+// Shared source of truth for the booking flow's step order/labels — also
+// consumed by AppSidebar's vertical step list on desktop.
+export const BOOKING_STEPS = [
   { id: 'search',       name: 'Search' },
   { id: 'results',      name: 'Results' },
   { id: 'passengers',   name: 'Passengers' },
@@ -12,6 +14,7 @@ const steps = [
   { id: 'payment',      name: 'Payment' },
   { id: 'confirmation', name: 'Done' },
 ];
+const steps = BOOKING_STEPS;
 
 export function ProgressIndicator({ currentStep }: { currentStep: string }) {
   const currentIndex = steps.findIndex((s) => s.id === currentStep);
@@ -70,24 +73,18 @@ export function ProgressIndicator({ currentStep }: { currentStep: string }) {
     );
   };
 
+  // Desktop shows the vertical step list embedded in AppSidebar instead —
+  // this component is mobile-only now (the sidebar doesn't exist below lg).
   return (
-    <nav aria-label="Progress">
-      {/* Mobile: full-bleed scrollable */}
+    <nav aria-label="Progress" className="lg:hidden">
       <div
         ref={scrollRef}
-        className="md:hidden overflow-x-auto scrollbar-hide px-4 py-3"
+        className="overflow-x-auto scrollbar-hide px-4 py-3"
       >
         <ol className="flex items-start min-w-full">
           {steps.map((s, i) => stepItem(s, i))}
         </ol>
       </div>
-
-      {/* Desktop: full container width matching header/footer */}
-      <div className="hidden md:block container mx-auto px-4 py-4">
-        <ol className="flex items-start max-w-6xl mx-auto">
-          {steps.map((s, i) => stepItem(s, i))}
-        </ol>
-      </div>
     </nav>
   );
 }
diff --git a/apps/edr-passenger-web/portal/src/components/Skeleton.tsx b/apps/edr-passenger-web/portal/src/components/Skeleton.tsx
new file mode 100644
index 000000000..1c69f7483
--- /dev/null
+++ b/apps/edr-passenger-web/portal/src/components/Skeleton.tsx
@@ -0,0 +1,10 @@
+interface SkeletonProps {
+  className?: string;
+}
+
+// Shared pulse-block primitive for loading placeholders — replaces the
+// hand-rolled `animate-pulse` divs duplicated across PackagesSection,
+// results/page.tsx, and the home page's search skeleton.
+export function Skeleton({ className = '' }: SkeletonProps) {
+  return <div className={`animate-pulse rounded-lg bg-gray-200 dark:bg-gray-700 ${className}`} />;
+}
diff --git a/apps/edr-passenger-web/portal/src/features/support/SupportWidget.tsx b/apps/edr-passenger-web/portal/src/features/support/SupportWidget.tsx
index 2b46a97b6..8a4100de9 100644
--- a/apps/edr-passenger-web/portal/src/features/support/SupportWidget.tsx
+++ b/apps/edr-passenger-web/portal/src/features/support/SupportWidget.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Headset, MessageCircle } from 'lucide-react';
+import { Headset } from 'lucide-react';
 import { useState } from 'react';
 
 import { SupportPanel } from './SupportPanel';
@@ -8,6 +8,7 @@ import { useUnreadCount } from './useSupport';
 import { useSupportSocket } from './useSupportSocket';
 
 const GREEN = 'rgb(20 113 76)';
+const GRADIENT = `linear-gradient(135deg, ${GREEN}, rgb(30 140 96))`;
 
 /**
  * Floating support launcher for the portal. One device-scoped thread — opens
@@ -22,16 +23,37 @@ export function SupportWidget() {
   useSupportSocket(true);
 
   return (
-    <div className="fixed bottom-6 right-6 z-[100] flex flex-col items-end gap-3">
+    // Kept below every modal/drawer tier (z-90 through z-[120]) and the mobile sticky
+    // bottom action bars (z-40) used on booking flow pages, so the floating launcher never
+    // paints over dialog content or a page's "Continue" bar — it only sits above ordinary
+    // in-page content.
+    <div className="fixed bottom-6 right-6 z-30 flex flex-col items-end gap-3">
       {open && <SupportPanel onClose={() => setOpen(false)} />}
       {!open && (
         <button
           onClick={() => setOpen(true)}
           aria-label="Open support chat"
-          className="relative flex h-14 w-14 items-center justify-center rounded-full text-white shadow-lg transition hover:scale-105"
-          style={{ background: GREEN, boxShadow: '0 8px 24px rgba(20,113,76,0.4)' }}
+          className="group relative flex items-center gap-2.5 rounded-full p-2 pr-2 text-white transition-transform duration-150 hover:-translate-y-0.5 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-[3px] focus-visible:outline-primary active:translate-y-0 motion-reduce:transition-none motion-reduce:hover:translate-y-0 sm:pr-5"
+          style={{ background: GRADIENT, boxShadow: '0 10px 28px rgba(20,113,76,0.4)' }}
         >
-          {unread > 0 ? <Headset size={26} /> : <MessageCircle size={26} />}
+          {/* Faint breathing ring; the unread badge is loud enough on its own. */}
+          {unread === 0 && (
+            <span className="pointer-events-none absolute -inset-1 animate-pulse rounded-full ring-2 ring-primary/50 motion-reduce:animate-none" />
+          )}
+
+          <span className="relative grid h-[42px] w-[42px] shrink-0 place-items-center rounded-full bg-white/20">
+            <Headset size={22} />
+          </span>
+
+          <span className="relative hidden text-left leading-tight sm:block">
+            <span className="block whitespace-nowrap text-sm font-semibold">
+              👋 Need help?
+            </span>
+            <span className="block whitespace-nowrap text-[11px] opacity-85">
+              Chat with our team
+            </span>
+          </span>
+
           {unread > 0 && (
             <span className="absolute -right-1 -top-1 flex h-5 min-w-5 items-center justify-center rounded-full border-2 border-white bg-red-500 px-1 text-xs font-bold text-white">
               {unread > 9 ? '9+' : unread}
diff --git a/apps/edr-passenger-web/portal/src/features/support/SupportWidgetLazy.tsx b/apps/edr-passenger-web/portal/src/features/support/SupportWidgetLazy.tsx
new file mode 100644
index 000000000..6c5faadcd
--- /dev/null
+++ b/apps/edr-passenger-web/portal/src/features/support/SupportWidgetLazy.tsx
@@ -0,0 +1,13 @@
+'use client';
+
+import dynamic from 'next/dynamic';
+
+// Code-split the support widget out of the initial page bundle — it pulls in
+// socket.io-client and opens a live WebSocket connection on mount (see
+// useSupportSocket), which otherwise happens on every single page load before
+// the user ever opens the chat. next/dynamic + ssr:false must be called from a
+// Client Component (disallowed directly in a Server Component like layout.tsx),
+// hence this thin wrapper.
+const SupportWidget = dynamic(() => import('./SupportWidget'), { ssr: false });
+
+export default SupportWidget;
diff --git a/apps/edr-passenger-web/portal/src/lib/booking-store.ts b/apps/edr-passenger-web/portal/src/lib/booking-store.ts
index e5d1d83aa..ce578b7a9 100644
--- a/apps/edr-passenger-web/portal/src/lib/booking-store.ts
+++ b/apps/edr-passenger-web/portal/src/lib/booking-store.ts
@@ -128,7 +128,7 @@ interface BookingState {
   reviewedTotalMinor: number | null;
   // Per-passenger fare breakdown computed on the review page — guarantees line items
   // on the payment page sum to exactly reviewedTotalMinor.
-  reviewedPassengerFares: Array<{ fareMinor: number; isFree: boolean }> | null;
+  reviewedPassengerFares: Array<{ fareMinor: number; isFree: boolean; outboundFareMinor?: number; inboundFareMinor?: number }> | null;
 
   setSearchCriteria: (criteria: SearchCriteria) => void;
   setSelectedSchedule: (schedule: SelectedSchedule) => void;
@@ -143,7 +143,7 @@ interface BookingState {
   setCreateAccount: (create: boolean) => void;
   setPassengerId: (id: string | null) => void;
   setPackageContext: (packageId: string, priceTierId: string, priceMinor: number, packageName?: string, departureStationId?: string, departureStationName?: string) => void;
-  setReviewedTotal: (totalMinor: number, passengerFares: Array<{ fareMinor: number; isFree: boolean }>) => void;
+  setReviewedTotal: (totalMinor: number, passengerFares: Array<{ fareMinor: number; isFree: boolean; outboundFareMinor?: number; inboundFareMinor?: number }>) => void;
   clearBooking: () => void;
 }
 
diff --git a/apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts b/apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts
index 66232dfcc..f1e4fa6b0 100644
--- a/apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts
+++ b/apps/edr-payment-api/src/modules/webhooks/webhooks.controller.ts
@@ -51,8 +51,22 @@ export class WebhooksController {
   @ApiOperation({
     summary: "Telebirr payment notification callback (Ethiopia)",
   })
-  async receiveTelebirr(@Body() payload: TelebirrWebhookPayload) {
-    this.logger.log("Telebirr webhook called");
+  async receiveTelebirr(
+    @Body() payload: TelebirrWebhookPayload,
+    @Headers() headers: Record<string, string>,
+    @Req() req: { method?: string; rawBody?: Buffer },
+  ) {
+    this.logger.log(
+      `Telebirr webhook hit: method=${req.method ?? "n/a"} ` +
+        `merchOrderId=${payload?.merch_order_id ?? "n/a"} ` +
+        `paymentOrderId=${payload?.payment_order_id ?? "n/a"} ` +
+        `tradeStatus=${payload?.trade_status ?? "n/a"}`,
+    );
+    this.logger.log(`Telebirr webhook headers: ${JSON.stringify(headers)}`);
+    this.logger.log(`Telebirr webhook payload: ${JSON.stringify(payload)}`);
+    this.logger.log(
+      `Telebirr webhook raw body: ${req.rawBody?.toString("utf8") ?? "(none)"}`,
+    );
     try {
       await this.telebirr.handle(payload);
     } catch (err) {
diff --git a/docs/qa/edr-freight-qa-test-plan.md b/docs/qa/edr-freight-qa-test-plan.md
new file mode 100644
index 000000000..f9102bc18
--- /dev/null
+++ b/docs/qa/edr-freight-qa-test-plan.md
@@ -0,0 +1,292 @@
+# EDR Freight — Operations QA Test Plan
+
+End-to-end test flows from booking through warehouse, rail, and delivery — import and export,
+with and without first/last mile, self-haul and EDR haulage. Every status, guard, and endpoint
+below is taken from the code, not assumed.
+
+| | |
+|---|---|
+| **Branch** | `Truckdetantion` |
+| **Scope** | Warehouse · Fees · Allocation · First mile · Last mile |
+| **Depth** | Tester steps + technical refs |
+
+---
+
+## 00 · Test data setup
+
+Nothing below passes without this. Set it up once per environment and confirm each line before
+opening a single flow.
+
+- [ ] **Warehouse tree.** At least one `ACTIVE` warehouse with a yard and a zone. Capacities are in **tonnes**, not kg.
+- [ ] **Company has a linked portal user.** Critical — in-app notifications resolve recipients from the company's portal users. With none linked, `notify()` logs `0 recipients — skipped` and stores nothing. SMS/email still fire.
+- [ ] **Customer saved signature.** Required for Approve delivery; without it the API returns *"Please save your signature before approving delivery"*.
+- [ ] **Allocation rules** covering the freight type and trade direction under test (see §08), or accept the capacity-balanced fallback.
+- [ ] **Fee rules** — at least one each of `STORAGE_FEE`, `DEMURRAGE_FEE`, `DOUBLE_HANDLING_FEE`, `TRUCK_DETENTION_FEE` (see §07).
+- [ ] **Drivers and vehicles** registered; a train schedule with wagons for the route under test.
+- [ ] **Booking reaches `PAID`.** Receive-to-warehouse skips any booking that is not PAID.
+- [ ] **Container numbers are ISO 6346** — 4 letters + 7 digits, uppercase (`ABCU1234567`). Enforced at booking input and at every reference point.
+
+> **Direction is derived, not declared.** Receive-to-warehouse computes trade direction from the
+> *origin and destination yard countries*, not the booking's stored `trade_direction`. A booking
+> whose route says IMPORT will be skipped from an EXPORT receive with *"Booking route is IMPORT,
+> not EXPORT"*. Set up yards accordingly.
+
+---
+
+## 01 · Lifecycle reference
+
+The three state machines a tester needs to read a failure. Anything not listed as an allowed
+transition is rejected by `assertTransition`.
+
+### Warehouse inventory transitions
+
+| From | Allowed next | Notes |
+|---|---|---|
+| `UNLOADED` | `STORED`, `READY_FOR_PICKUP` | Import landing state after train unload |
+| `RECEIVED` | `STORED`, `READY_FOR_PICKUP` | Export landing state after truck receive |
+| `STORED` | `RESERVED`, `READY_FOR_LOADING` | Reserve is retired from the UI; `STORED → READY_FOR_LOADING` is the live path |
+| `READY_FOR_LOADING` | `LOADED` | Onto a wagon |
+| `LOADED` | `DISPATCHED` | |
+| `DISPATCHED` | `UNLOADED_AT_DJIBOUTI_PORT` | Export only, at Djibouti |
+| `READY_FOR_PICKUP` | `DELIVERED`, `STORED`, `DISPATCHED` | Import; may be put back into storage |
+
+### Container item stages
+
+```
+PENDING → RECEIVED → GRN → ASSIGNED → LOADED → LEFT → DELIVERED
+```
+
+**ASSIGNED** means the customer picked which containers ride which truck — planning only.
+**LOADED** requires the operator to actually load them, and only after the truck has arrived
+(`loaded_at` is stamped then). Assignment alone must never show LOADED.
+
+### First mile & last mile
+
+| Leg | Statuses, in order | Gate it controls |
+|---|---|---|
+| First mile | `PAYMENT_PENDING → READY_TO_TRANSIT → IN_TRANSIT → RECEIVED_TO_PORT` | Export receive is blocked until `RECEIVED_TO_PORT` |
+| Last mile | `PAYMENT_PENDING → READY_TO_TRANSIT → IN_TRANSIT → DELIVERED` | Truck-detention window: `arrivedAt` (reached destination) → `deliveredAt` (vehicle returned) |
+
+---
+
+## 02 · Export — without first mile
+
+Customer brings the cargo to the facility themselves. The happy path from a paid booking to cargo
+unloaded at Djibouti port with an interchange document.
+
+| Step | Tester action | Expected result | Technical ref |
+|---|---|---|---|
+| E1.1 | Create an export booking (route origin ET → destination DJ), pay it. | Booking reaches `PAID`. | Container numbers must be ISO 6346 |
+| E1.2 | Export Operations → **Receive for Loading**. Select the booking, capture the truck entrance (plate, driver, weights), pick warehouse/yard/zone. | Inventory created; **GRN issued** as `GRN-EXPORT-YYYYMMDD-XXXXXXXX`. Customer gets a receive SMS. | `POST /warehouse-inventory/receive-bulk` |
+| E1.3 | Store the item — auto-allocate, or pick warehouse/yard/zone in the Store modal. | Status `STORED`; note records "allocation rule", "capacity-balanced", or "operator-selected". | Capacity decremented in tonnes |
+| E1.4 | Inspect: mark selected items as inspected, outcome **PASSED**. | Export items advance straight to `READY_FOR_LOADING`. | Reserve step is retired |
+| E1.5 | Ready To Load tab → load onto the allocated wagon. | Status `LOADED`; a warehouse loading record exists. | Requires an allocated wagon |
+| E1.6 | Download the **export marshalling / load list** PDF. | PDF lists the train's wagons, bookings, containers. | train-scheduling controller |
+| E1.7 | Dispatch Queue → dispatch. | Status `DISPATCHED`. Customer receives **"Shipment dispatched"** naming origin → destination. | Per booking on the schedule |
+| E1.8 | Move the schedule to arrived at the Djibouti-side port. | Train appears in the Djibouti unloading queue. Customer receives **"Shipment arrived"**. | status `ARRIVED` / `ARRIVED_AT_DJIBOUTI` |
+| E1.9 | Grant the gate pass for the train, then **Unload at Djibouti**. | Items become `UNLOADED_AT_DJIBOUTI_PORT` and an **interchange document** is generated. | Unload checks `gatepass_granted_at` |
+| **E1.G** | Try to unload at Djibouti *before* granting the gate pass. | 🚫 **Blocked.** Items skipped with a gate-pass reason; no interchange document. | See §06 |
+
+---
+
+## 03 · Export — with first mile
+
+EDR collects the cargo from the customer's premises. Identical to §02 from the store step onward;
+the difference is entirely in the gate before receive.
+
+| Step | Tester action | Expected result | Technical ref |
+|---|---|---|---|
+| E2.1 | Create the export booking with a **first-mile pickup address** (or a service type that includes first mile). | Booking is flagged `hasFirstMile`. | Derived from address *or* `service_types.includes_first_mile` |
+| E2.2 | Create the first-mile request; assign a vehicle and driver. | Driver receives an SMS naming the vehicle, booking, pickup and destination. | First Mile page |
+| E2.3 | Walk the leg: `READY_TO_TRANSIT → IN_TRANSIT → RECEIVED_TO_PORT`. | Each transition persists. | |
+| E2.4 | Now run **Receive for Loading**. | Booking is received; truck entrance pre-filled from the first-mile vehicle and driver. | Then continue at E1.3 |
+| **E2.G1** | Attempt receive with **no first-mile request created**. | 🚫 Skipped: *"First-mile request not created"*. | |
+| **E2.G2** | Attempt receive while first-mile status is `IN_TRANSIT`. | 🚫 Skipped: *"First-mile truck has not arrived"*. | Only `RECEIVED_TO_PORT` passes |
+
+---
+
+## 04 · Import — self-haul (customer collects)
+
+The longest flow, and the one with the most guards. The customer assigns their own trucks, signs a
+booking-level handover, and collects. Test this one first — it exercises truck arrival, loading,
+weighing, handover, exit paper, and fees.
+
+```
+train arrives → unload → inspect → ready for pickup → assign truck → truck arrival
+  → sign handover → load → truck leaving → exit paper → deliver
+```
+
+| Step | Tester action | Expected result | Technical ref |
+|---|---|---|---|
+| I1.1 | Import booking (route DJ → ET), paid, **no last-mile address** and a service type that excludes last mile. | Booking is self-haul. | Drives `usesCustomerTruck` |
+| I1.2 | Import Operations → **Arrival Queue**. Open the arrived train, assign warehouse/yard/zone per booking, **Auto Unload Arrived Bookings**. | Inventory created at `UNLOADED`. Counter shows `n/total unloaded`. | Train must be `ARRIVED` |
+| I1.3 | Inspect the item, outcome **PASSED**. | Item advances to `READY_FOR_PICKUP`. Customer receives **"Assign a truck for pickup"** (in-app + SMS + email). | Fires only when self-haul *and* no truck assigned |
+| I1.4 | **Portal:** customer assigns truck(s), entering ISO container numbers per truck. | Containers move to stage `ASSIGNED` and show their planned truck. Booking becomes `TRUCK_ASSIGNED`. | 20ft → max 2/truck; 40ft → 1/truck; trucks ≤ containers |
+| I1.5 | Backoffice row menu → **Truck Arrival**. Select the assigned truck, record gate-in time and **tare** weight (tonnes). | Truck stamped arrived. A **SELF_HAUL handover** is generated (booking-level) and the customer is notified to sign, on all three channels. | Truck Arrival disabled until a truck is assigned |
+| I1.6 | **Portal:** customer opens the booking → **Approve delivery**. | The handover PDF opens for review; approving applies their saved signature and returns the signed PDF. | Signs all unsigned handovers on the booking |
+| I1.7 | Open the container list → select the assigned containers → **Load onto truck** (pick the arrived truck). | Containers move to `LOADED`; `loaded_at` stamped. | Only arrived, not-departed trucks are listed |
+| I1.8 | Row menu → **Truck Leaving**. Select the containers on the truck, record gate-out time and **gross** weight. | Net is computed from the selected containers' cargo weight and must equal `gross − tare`. Release document issued. | Weight match enforced client- *and* server-side |
+| I1.9 | Generate the **exit paper** for the truck. | PDF lists the truck, driver, and its containers. Containers move to `LEFT`. | Requires signed handover + cleared fees |
+| I1.10 | **Deliver** the inventory, recording the receiver name. | Status `DELIVERED`; handovers stamped delivered. | Requires handover signed *and* truck departed |
+
+> 🚫 **The single most likely bug you will hit.** Exit paper returns `400` when the handover is not
+> fully signed, or when a warehouse fee invoice is `ISSUED` / `PARTIALLY_PAID`. In the container
+> list, the Exit Paper button turns grey and clicking it **sends the customer a signature request**
+> instead of erroring. That is correct behaviour — verify the message, don't file it as a bug.
+
+---
+
+## 05 · Import — EDR last mile
+
+EDR delivers to the customer's door. No customer truck, no portal Approve delivery, and the
+handover is *per delivering truck* — not per booking. This is where truck detention accrues.
+
+| Step | Tester action | Expected result | Technical ref |
+|---|---|---|---|
+| I2.1 | Import booking with a **last-mile delivery address** (or service type including last mile). | `hasLastMile` is true; no "assign a truck" notification is sent. | EDR haulage — customer assigns nothing |
+| I2.2 | Unload from the arrived train, inspect PASSED. | Item becomes `READY_FOR_PICKUP` and the last-mile leg is accepted automatically. | |
+| I2.3 | Last Mile page: assign vehicle + driver. | Leg reaches `READY_TO_TRANSIT`. Row shows Assigned. | Driver notified by SMS |
+| I2.4 | **Truck Arrival** from the Last Mile row: gate-in, tare weight. | Weighing saved; the assigned last-mile truck is pre-selected. | Re-opening must show the saved details |
+| I2.5 | **Truck Leaving**: gate-out, gross weight. | Release document issued; leg moves to `IN_TRANSIT`. `arrivedAt` starts the detention clock. | Detention window opens |
+| I2.6 | Deliver at the customer's door, recording the receiver name. | Item `DELIVERED`. An **EDR_LAST_MILE handover is generated per delivering truck**, resolved from the container's allocated vehicle. | Not booking-level |
+| I2.7 | Return the vehicle → mark the leg `DELIVERED`. | `deliveredAt` stamped; detention clock stops. | |
+| I2.8 | Preview, then generate the **truck detention invoice**. | Charged per truck per day beyond the grace hours, at the matching tier. See §07. | `POST /last-mile/:id/generate-truck-detention-invoice` |
+| **I2.G** | Open the booking in the portal. | 🚫 **Approve delivery must NOT appear.** The portal flag counts only `SELF_HAUL` handovers; EDR handovers are signed by the receiver at the door. | Regression check |
+
+---
+
+## 06 · Marshalling, gate pass, interchange
+
+Documents are generated, not uploaded. Each has a precondition; test the precondition, not just the PDF.
+
+| Document | When | Precondition | Verify |
+|---|---|---|---|
+| **GRN** | On receive to warehouse | Booking `PAID`; route direction matches; export needs a truck entrance | Number format `GRN-<DIR>-<YYYYMMDD>-<8>`; PDF opens; customer SMS sent |
+| **Import load list / marshalling** | Import train, before unload | Schedule has bookings assigned | Summary endpoint and printable PDF agree; portrait/landscape both render |
+| **Export marshalling / load list** | Export train, after loading | Items `LOADED` onto wagons | Wagon, booking, container rows are complete |
+| **Gate pass** | Djibouti-side operations | Granted per schedule | `gatepass_granted_at` is set; **export Djibouti unload reads this same field** |
+| **Interchange document** | Automatically, after a successful Djibouti unload | At least one item unloaded | Document number returned in the unload response; visible in Interchange Documents |
+| **Handover** | Self-haul: on truck arrival. EDR: at delivery. | See §04 / §05 | Self-haul is booking-level, one per booking; EDR is one per delivering truck |
+| **Exit paper / release doc** | Truck leaving | Handover fully signed *and* no unpaid warehouse fee | Weights on the paper match the gate weighing |
+
+> ⚠️ **Cross-module quirk worth confirming with the team.** The *export* Djibouti unload checks the
+> gate-pass flag stored on the *import* Djibouti operations record
+> (`import_djibouti_operations.gatepass_granted_at`). It works, but it is surprising. If an export
+> unload silently skips every item, check that field first.
+
+---
+
+## 07 · Fee rules
+
+Four rule types. Two are day-based with free days and tiers; double handling is a flat rate
+multiplied by a basis; truck detention is hour-graced and vehicle-scoped.
+
+| Rule type | Charged on | Key fields | Test cases |
+|---|---|---|---|
+| `STORAGE_FEE` | Days in storage | free days, `tiers` | Within free days → zero. One day past → tier 1. Cross a tier boundary → correct tier rate. |
+| `DEMURRAGE_FEE` | Days beyond free time | free days, `tiers` | Same boundary tests. Confirm it blocks exit paper and delivery while `ISSUED`. |
+| `DOUBLE_HANDLING_FEE` | Flat rate × quantity | `basis`: `PER_CONTAINER` \| `PER_TON` \| `PER_ITEM` | Container booking → PER_CONTAINER uses container count. Bulk → PER_TON uses tonnage. Break-bulk machinery → PER_ITEM uses item count. **Import only.** Free days and tiers must not apply. |
+| `TRUCK_DETENTION_FEE` | Per truck, per day | `free_hours` grace, `tiers`, vehicle type scope | Return inside the grace window → zero. Just past grace → day 1 at tier 1. Multi-day → tier escalation. A vehicle type outside the rule's scope → no charge. **Import only.** |
+
+### Fee behaviour to verify on every rule
+
+- [ ] **Preview before invoice.** The preview amount must equal the issued invoice total.
+- [ ] **Notification on issue.** Issuing a warehouse fee invoice sends the customer an in-app `INVOICE_ISSUED` notification *and* an SMS, deep-linked to pay.
+- [ ] **Clearance gate.** While a warehouse-source invoice is `ISSUED` or `PARTIALLY_PAID`, exit paper, terminal release, and Approve delivery are all blocked.
+- [ ] **Payable-but-uninvoiced.** If fees are payable and no invoice exists yet, release is still blocked with *"Generate and fully pay…"*. Confirm the operator can generate it from that state.
+- [ ] **Fully paid** → release proceeds; a receipt PDF is available.
+- [ ] **Edit a rule** (rate, free days, tiers, grace hours) and confirm the next preview reflects it.
+
+---
+
+## 08 · Allocation rules
+
+Where an item is stored is decided by the first matching rule, in priority order. Test the
+precedence, not just one rule.
+
+| Match criteria (any may be null = wildcard) | Targets |
+|---|---|
+| `freight_type`, `trade_direction`, `cargo_type_code`, `container_status`, `requires_inspection`, ordered by `priority` | `target_facility_code`, `target_warehouse_code`, `target_yard_code` (required), `target_zone_code`, `storage_type` |
+
+### Precedence, highest first
+
+| # | Source of the location | How to trigger | Note recorded |
+|---|---|---|---|
+| 1 | **Operator selection** | Store modal → pick warehouse + yard + zone | "Stored at operator-selected location" |
+| 2 | **Allocation rule** | Leave the Store modal blank; a matching rule exists | "Stored by allocation rule `<name>`" |
+| 3 | **Capacity-balanced fallback** | Leave blank; no rule matches | "Stored by capacity-balanced allocation" |
+
+- [ ] Two matching rules → the **lower priority number wins**.
+- [ ] Yard dropdowns are filtered by **freight type** — container bookings offer container yards only.
+- [ ] Only `ACTIVE` warehouses, yards and zones are selectable.
+- [ ] Storing beyond a zone's capacity is rejected; capacities are compared in **tonnes**.
+- [ ] **Move** an item to another warehouse/yard/zone → capacity released at source, taken at destination.
+- [ ] Edit a rule, an existing warehouse, a yard, and a zone — all four must be editable.
+
+---
+
+## 09 · Negative & guard cases
+
+Every row here is intended behaviour. The test passes when the action is **refused** with the
+stated message. Anything that succeeds is the bug.
+
+| Area | Attempt | Expected refusal |
+|---|---|---|
+| Booking | Enter a container number that is not 4 letters + 7 digits (e.g. `MSKU10105185`, `3456789`). | *"Enter a valid ISO container number"*. Lowercase is auto-uppercased; input capped at 11 characters. |
+| Booking | Enter the **same container number twice** in one shipment. | *"Duplicate container number in this shipment."* |
+| Receive | Receive a booking that is not `PAID`. | Skipped: *"Booking not PAID"*. |
+| Receive | Receive the same booking twice. | Skipped: *"Already received"*. |
+| Receive | Export receive with no truck entrance captured. | Rejected before any inventory is created. |
+| Truck assign | Put **two 40ft containers** on one truck. | *"A 40ft container fills the truck — assign only 1 container to this truck"*. |
+| Truck assign | Put **three containers** on one truck. | *"A truck carries at most 2 containers"*. |
+| Truck assign | Assign **more trucks than the booking has containers**. | *"Cannot assign more trucks than containers…"*. |
+| Truck assign | Assign a container from another booking, or one already on another truck. | *"…is not one of this booking's containers"* / *"…already loaded onto another truck"*. |
+| Truck assign | Edit a truck **after it has arrived**. | Refused — edits are allowed only until arrival. |
+| Loading | **Load containers onto a truck that has not arrived.** | *"Record the truck arrival before loading…"*. The truck picker lists only arrived, not-departed trucks. |
+| Loading | Load onto a truck that has already departed. | *"This truck has already left — its load is locked"*. |
+| Stages | Customer assigns containers to a truck, then check the container list. | Stage is `ASSIGNED`, **never** `LOADED`. Exit Paper is not offered. |
+| Truck leaving | Enter a gross weight where `gross − tare` ≠ the selected containers' cargo weight. | *"Weight mismatch…"*. Exit paper and gate clearance blocked, client and server. |
+| Truck leaving | Save leaving with **no containers selected**. | *"Select the containers loaded on this truck"*. |
+| Exit paper | Generate before the handover is signed. | *"Handover must be signed…"*. In the container list the button is grey and instead **sends the customer a signature request**. |
+| Exit paper | Generate with an `ISSUED` demurrage/storage invoice. | *"…must be fully paid before terminal release"*. |
+| Approve delivery | Approve without a saved signature. | *"Please save your signature…"* and the portal routes to the signature page. |
+| Approve delivery | Approve before warehouse inspection has passed. | *"Delivery can be approved after warehouse inspection has passed"*. |
+| Approve delivery | Approve when a truck is assigned but has not arrived. | *"Customer truck arrival must be recorded before delivery approval"*. |
+| Deliver | Deliver before a release order was issued, or before the self-haul truck has left. | *"A release order must be issued…"* / *"Deliver is available only after the customer truck has left"*. |
+| Djibouti unload | Unload an export train with no gate pass granted. | Items skipped; no interchange document generated. |
+| Warehouse | Store into an `INACTIVE` warehouse/yard/zone, or beyond capacity. | Not selectable / *"No active warehouse yard/zone is available"* / capacity error. |
+
+---
+
+## 10 · Notifications
+
+All customer notifications land in the same portal inbox. Verify the message, the deep link, and —
+where noted — the SMS and email.
+
+| Notification | Fires when | Channels | Deep link |
+|---|---|---|---|
+| Shipment dispatched | Train schedule dispatched, per booking | In-app, SMS, email | Booking |
+| Shipment arrived | Train schedule arrived, per booking | In-app, SMS, email | Booking |
+| Assign a truck for pickup | Export: on warehouse receive. Import: on inspection pass → ready for pickup. Only if self-haul *and* no truck assigned. | In-app, SMS, email | Booking → assign truck |
+| Handover — signature needed | Self-haul truck arrives (handover generated), and re-sent when an operator requests a signature from the Exit Paper button | In-app, SMS, email | Booking → approve delivery |
+| Warehouse fee due | Storage / demurrage invoice issued | In-app, SMS | Booking → pay |
+| Wagon allocated / payment window | Scheduling | In-app | Booking |
+
+> 🚫 **Do not chase a missing in-app notification before checking this.** Recipients are resolved
+> from the company's linked portal users. If a company has none, `notify()` logs *"0 recipients —
+> skipped"* and stores nothing — the notification simply never appears, with no error. SMS and
+> email still go out, because they address the company's phone and email directly. On a fresh
+> environment this is the usual explanation.
+
+---
+
+## 11 · Known open issues
+
+Do not raise duplicates for these. Each is already identified.
+
+| Status | Issue | Impact on testing |
+|---|---|---|
+| 🔴 **Open** | **Export receive returns 500** on the deployed environment (`POST /warehouse-inventory/receive-bulk`). | Blocks flows E1 and E2 at step .2. Awaiting the response body / server log to diagnose. Likely schema drift, not the SQL. |
+| 🟠 **Fix pending deploy** | **Export receive was extremely slow.** The owner SMS was awaited inside the DB transaction, and the SMS client had no HTTP timeout. | Fixed on branch: SMS now has a timeout, and notifications are sent after commit. Re-test receive latency once deployed. |
+| 🟠 **Data** | **Drivers table has no unique constraints** on licence number, email, or phone, despite the entity declaring them unique. | Duplicate drivers can be created. Do not rely on uniqueness in test assertions. |
+| 🔵 **Behaviour** | **Handover generated before truck arrival.** If an operator triggers a signature request from the Exit Paper button while a truck is assigned but not arrived, Approve delivery refuses with *"truck arrival must be recorded"*. | Only reachable off the normal path. Follow flow I1 in order and it will not occur. |
diff --git a/docs/qa/edr-freight-qa-test-plan.pdf b/docs/qa/edr-freight-qa-test-plan.pdf
new file mode 100644
index 000000000..56c5d520d
--- /dev/null
+++ b/docs/qa/edr-freight-qa-test-plan.pdf
@@ -0,0 +1,6680 @@
+%PDF-1.3
+%�߬�
+3 0 obj
+<</Type /Page
+/Parent 1 0 R
+/Resources 2 0 R
+/MediaBox [0 0 595.2799999999999727 841.8899999999999864]
+/Contents 4 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 9916
+>>
+stream
+0.200025 w
+0 G
+BT
+/F5 8 Tf
+9.1999999999999993 TL
+0.043 0.333 0.388 rg
+42. 793.8899999999999864 Td
+(ETHIO-DJIBOUTI RAILWAY  /  FREIGHT PLATFORM) Tj
+ET
+BT
+/F9 30 Tf
+34.5 TL
+0.063 0.102 0.11 rg
+42. 767.8899999999999864 Td
+(Freight Operations) Tj
+ET
+BT
+/F9 30 Tf
+34.5 TL
+0.063 0.102 0.11 rg
+42. 737.8899999999999864 Td
+(QA Test Plan) Tj
+ET
+0.06 0.1 0.11 RG
+1.3999999999999999 w
+42. 717.8899999999999864 m
+553.2799999999999727 717.8899999999999864 l
+S
+BT
+/F1 10 Tf
+11.5 TL
+0.275 0.345 0.357 rg
+42. 697.8899999999999864 Td
+(End-to-end test flows from booking through warehouse, rail, and delivery - import and export,) Tj
+T* (with and without first/last mile, self-haul and EDR haulage. Every status, guard, and endpoint) Tj
+T* (below is taken from the code, not assumed.) Tj
+ET
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.427 0.498 0.51 rg
+42. 642.8899999999999864 Td
+(BRANCH  Truckdetantion) Tj
+ET
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.427 0.498 0.51 rg
+212. 642.8899999999999864 Td
+(SCOPE  Warehouse . Fees . Allocation . First mile . Last mile) Tj
+ET
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.427 0.498 0.51 rg
+42. 630.8899999999999864 Td
+(DEPTH  Tester steps + technical refs) Tj
+ET
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 596.8899999999999864 Td
+(00) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 595.8899999999999864 Td
+(Test data setup) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 575.8899999999999864 m
+553.2799999999999727 575.8899999999999864 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 561.8899999999999864 Td
+(Nothing below passes without this. Set it up once per environment and confirm each line before opening a single flow.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 547.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 539.8899999999999864 Td
+(Warehouse tree: at least one ACTIVE warehouse with a yard and a zone. Capacities are in TONNES, not kg.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 530.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 522.8899999999999864 Td
+(Company has a linked portal user. Critical - in-app notifications resolve recipients from the company's portal users. With) Tj
+T* (none linked, notify\(\) logs "0 recipients - skipped" and stores nothing. SMS/email still fire.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 501.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 493.8899999999999864 Td
+(Customer saved signature. Required for Approve delivery; without it the API returns "Please save your signature before) Tj
+T* (approving delivery".) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 472.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 464.8899999999999864 Td
+(Allocation rules covering the freight type and trade direction under test \(see 08\), or accept the capacity-balanced fallback.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 455.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 447.8899999999999864 Td
+(Fee rules: at least one each of STORAGE_FEE, DEMURRAGE_FEE, DOUBLE_HANDLING_FEE,) Tj
+T* (TRUCK_DETENTION_FEE \(see 07\).) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 426.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 418.8899999999999864 Td
+(Drivers and vehicles registered; a train schedule with wagons for the route under test.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 409.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 401.8899999999999864 Td
+(Booking reaches PAID. Receive-to-warehouse skips any booking that is not PAID.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 392.3899999999999864 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 384.8899999999999864 Td
+(Container numbers are ISO 6346 - 4 letters + 7 digits, uppercase \(ABCU1234567\). Enforced at booking input and every) Tj
+T* (reference point.) Tj
+ET
+0.89 0.94 0.95 rg
+42. 351.8899999999999864 511.2799999999999727 -51. re
+f
+0.04 0.33 0.39 rg
+42. 351.8899999999999864 3. -51. re
+f
+BT
+/F1 8.6 Tf
+9.8899999999999988 TL
+0.275 0.345 0.357 rg
+56. 338.8899999999999864 Td
+(Direction is derived, not declared. Receive-to-warehouse computes trade direction from the ORIGIN and DESTINATION YARD) Tj
+T* (COUNTRIES, not the booking's stored trade_direction. A booking whose route says IMPORT will be skipped from an EXPORT) Tj
+T* (receive with "Booking route is IMPORT, not EXPORT". Set up yards accordingly.) Tj
+ET
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 278.8899999999999864 Td
+(01) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 277.8899999999999864 Td
+(Lifecycle reference) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 257.8899999999999864 m
+553.2799999999999727 257.8899999999999864 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 243.8899999999999864 Td
+(The three state machines a tester needs to read a failure. Anything not listed as an allowed transition is rejected by) Tj
+T* (assertTransition.) Tj
+ET
+BT
+/F2 8 Tf
+9.1999999999999993 TL
+0.063 0.102 0.11 rg
+42. 203.8899999999999864 Td
+(WAREHOUSE INVENTORY TRANSITIONS) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 191.8899999999999864 105. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 180.9399999999999409 Td
+(From) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+147. 191.8899999999999864 145. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+152. 180.9399999999999409 Td
+(Allowed next) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+292. 191.8899999999999864 261.2799999999999159 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+297. 180.9399999999999409 Td
+(Notes) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 173.8400000000000318 105. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 162.8899999999999864 Td
+(UNLOADED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+147. 173.8400000000000318 145. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+152. 162.8899999999999864 Td
+(STORED, READY_FOR_PICKUP) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+292. 173.8400000000000318 261.2799999999999159 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+297. 162.3799999999999955 Td
+(Import landing state after train unload) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 155.1000000000000227 105. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 144.1499999999999773 Td
+(RECEIVED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+147. 155.1000000000000227 145. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+152. 144.1499999999999773 Td
+(STORED, READY_FOR_PICKUP) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+292. 155.1000000000000227 261.2799999999999159 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+297. 143.6399999999999864 Td
+(Export landing state after truck receive) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 136.3600000000000136 105. -27.4799999999999969 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 125.4099999999999682 Td
+(STORED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+147. 136.3600000000000136 145. -27.4799999999999969 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+152. 125.4099999999999682 Td
+(RESERVED, READY_FOR_LOADING) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+292. 136.3600000000000136 261.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+297. 124.8999999999999773 Td
+(Reserve is retired from the UI; STORED -> READY_FOR_LOADING is the) Tj
+T* (live path) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 108.8799999999999955 105. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 97.92999999999995 Td
+(READY_FOR_LOADING) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+147. 108.8799999999999955 145. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+152. 97.92999999999995 Td
+(LOADED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+292. 108.8799999999999955 261.2799999999999159 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+297. 97.4199999999999591 Td
+(Onto a wagon) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 90.1399999999999864 105. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 79.1899999999999409 Td
+(LOADED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+147. 90.1399999999999864 145. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+152. 79.1899999999999409 Td
+(DISPATCHED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+292. 90.1399999999999864 261.2799999999999159 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+297. 78.67999999999995 Td
+() Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 71.3999999999999773 105. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 60.4499999999999318 Td
+(DISPATCHED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+147. 71.3999999999999773 145. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+152. 60.4499999999999318 Td
+(UNLOADED_AT_DJIBOUTI_PORT) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+292. 71.3999999999999773 261.2799999999999159 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+297. 59.9399999999999409 Td
+(Export only, at Djibouti) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.8 0.85 0.85 RG
+0.5 w
+42. 36. m
+553.2799999999999727 36. l
+S
+BT
+/F9 8 Tf
+9.1999999999999993 TL
+0.427 0.498 0.51 rg
+42. 22. Td
+(EDR Freight - QA Test Plan) Tj
+ET
+BT
+/F5 7.5 Tf
+8.625 TL
+0.427 0.498 0.51 rg
+530.7799999999999727 22. Td
+(1 / 7) Tj
+ET
+endstream
+endobj
+5 0 obj
+<</Type /Page
+/Parent 1 0 R
+/Resources 2 0 R
+/MediaBox [0 0 595.2799999999999727 841.8899999999999864]
+/Contents 6 0 R
+>>
+endobj
+6 0 obj
+<<
+/Length 16091
+>>
+stream
+0. w
+0.78 G
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 801.8899999999999864 105. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 790.9399999999999409 Td
+(From) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+147. 801.8899999999999864 145. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+152. 790.9399999999999409 Td
+(Allowed next) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+292. 801.8899999999999864 261.2799999999999159 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+297. 790.9399999999999409 Td
+(Notes) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 783.8400000000000318 105. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 772.8899999999999864 Td
+(READY_FOR_PICKUP) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+147. 783.8400000000000318 145. -18.7399999999999984 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+152. 772.8899999999999864 Td
+(DELIVERED, STORED, DISPATCHED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+292. 783.8400000000000318 261.2799999999999159 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+297. 772.3799999999999955 Td
+(Import; may be put back into storage) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+BT
+/F2 8 Tf
+9.1999999999999993 TL
+0.063 0.102 0.11 rg
+42. 743.1000000000000227 Td
+(CONTAINER ITEM STAGES) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.5 w
+42. 733.1000000000000227 511.2799999999999727 -21. re
+B
+BT
+/F5 8 Tf
+9.1999999999999993 TL
+0.275 0.345 0.357 rg
+52. 721.1000000000000227 Td
+(PENDING  >  RECEIVED  >  GRN  >  ASSIGNED  >  LOADED  >  LEFT  >  DELIVERED) Tj
+ET
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 700.1000000000000227 Td
+(ASSIGNED means the customer picked which containers ride which truck - planning only. LOADED requires the operator to) Tj
+T* (actually load them, and only after the truck has arrived \(loaded_at is stamped then\). Assignment alone must never show) Tj
+T* (LOADED.) Tj
+ET
+BT
+/F2 8 Tf
+9.1999999999999993 TL
+0.063 0.102 0.11 rg
+42. 650.1000000000000227 Td
+(FIRST MILE & LAST MILE) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+0.8 0.85 0.85 RG
+0.5 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 638.1000000000000227 56. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 627.1499999999999773 Td
+(Leg) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+98. 638.1000000000000227 210. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+103. 627.1499999999999773 Td
+(Statuses, in order) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+308. 638.1000000000000227 245.2799999999999727 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+313. 627.1499999999999773 Td
+(Gate it controls) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 620.0499999999999545 56. -26.0999999999999979 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 608.5900000000000318 Td
+(First mile) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+98. 620.0499999999999545 210. -26.0999999999999979 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+103. 609.1000000000000227 Td
+(PAYMENT_PENDING -> READY_TO_TRANSIT ->) Tj
+T* (IN_TRANSIT -> RECEIVED_TO_PORT) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+308. 620.0499999999999545 245.2799999999999727 -26.0999999999999979 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+313. 608.5900000000000318 Td
+(Export receive is blocked until RECEIVED_TO_PORT) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 593.9500000000000455 56. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 582.4900000000000091 Td
+(Last mile) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+98. 593.9500000000000455 210. -27.4799999999999969 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+103. 583. Td
+(PAYMENT_PENDING -> READY_TO_TRANSIT ->) Tj
+T* (IN_TRANSIT -> DELIVERED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+308. 593.9500000000000455 245.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+313. 582.4900000000000091 Td
+(Truck-detention window: arrivedAt \(reached destination\) -> deliveredAt) Tj
+T* (\(vehicle returned\)) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+0.78 G
+0. w
+0.8 0.85 0.85 RG
+0.5 w
+0.8 0.85 0.85 RG
+0.5 w
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 540.4700000000000273 Td
+(02) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 539.4700000000000273 Td
+(Export - without first mile) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 519.4700000000000273 m
+553.2799999999999727 519.4700000000000273 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 505.4700000000000273 Td
+(Customer brings the cargo to the facility themselves. The happy path from a paid booking to cargo unloaded at Djibouti port with) Tj
+T* (an interchange document.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 471.4700000000000273 34. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 460.5200000000000387 Td
+(Step) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+76. 471.4700000000000273 150. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+81. 460.5200000000000387 Td
+(Tester action) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+226. 471.4700000000000273 227.2799999999999159 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+231. 460.5200000000000387 Td
+(Expected result) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+453.2799999999999159 471.4700000000000273 100. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+458.2799999999999159 460.5200000000000387 Td
+(Technical ref) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 453.4200000000000159 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 441.9600000000000364 Td
+(E1.1) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 453.4200000000000159 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 441.9600000000000364 Td
+(Create an export booking \(route origin ET) Tj
+T* (-> destination DJ\), pay it.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 453.4200000000000159 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 441.9600000000000364 Td
+(Booking reaches PAID.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 453.4200000000000159 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 441.9600000000000364 Td
+(Container numbers must) Tj
+T* (be ISO 6346) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 425.9399999999999977 34. -44.9599999999999937 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 414.4800000000000182 Td
+(E1.2) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 425.9399999999999977 150. -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 414.4800000000000182 Td
+(Export Operations > Receive for Loading.) Tj
+T* (Select the booking, capture the truck) Tj
+T* (entrance \(plate, driver, weights\), pick) Tj
+T* (warehouse/yard/zone.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 425.9399999999999977 227.2799999999999159 -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 414.4800000000000182 Td
+(Inventory created; GRN issued as) Tj
+T* (GRN-EXPORT-YYYYMMDD-XXXXXXXX. Customer gets a) Tj
+T* (receive SMS.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 425.9399999999999977 100. -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 414.4800000000000182 Td
+(POST /warehouse-invento) Tj
+T* (ry/receive-bulk) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 380.9800000000000182 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 369.5200000000000387 Td
+(E1.3) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 380.9800000000000182 150. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 369.5200000000000387 Td
+(Store the item - either let it auto-allocate,) Tj
+T* (or pick warehouse/yard/zone in the Store) Tj
+T* (modal.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 380.9800000000000182 227.2799999999999159 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 369.5200000000000387 Td
+(Status STORED; note records "allocation rule",) Tj
+T* ("capacity-balanced", or "operator-selected".) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 380.9800000000000182 100. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 369.5200000000000387 Td
+(Capacity decremented in) Tj
+T* (tonnes) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 344.7599999999999909 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 333.3000000000000114 Td
+(E1.4) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 344.7599999999999909 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 333.3000000000000114 Td
+(Inspect: mark selected items as) Tj
+T* (inspected, outcome PASSED.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 344.7599999999999909 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 333.3000000000000114 Td
+(Export items advance straight to READY_FOR_LOADING.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 344.7599999999999909 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 333.3000000000000114 Td
+(Reserve step is retired) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 317.2799999999999727 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 305.8199999999999363 Td
+(E1.5) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 317.2799999999999727 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 305.8199999999999363 Td
+(Ready To Load tab > load onto the) Tj
+T* (allocated wagon.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 317.2799999999999727 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 305.8199999999999363 Td
+(Status LOADED; a warehouse loading record exists.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 317.2799999999999727 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 305.8199999999999363 Td
+(Requires an allocated) Tj
+T* (wagon) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 289.7999999999999545 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 278.3399999999999181 Td
+(E1.6) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 289.7999999999999545 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 278.3399999999999181 Td
+(Download the export marshalling / load) Tj
+T* (list PDF.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 289.7999999999999545 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 278.3399999999999181 Td
+(PDF lists the train's wagons, bookings, containers.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 289.7999999999999545 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 278.3399999999999181 Td
+(train-scheduling controller) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 262.3199999999999363 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 250.8599999999999 Td
+(E1.7) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 262.3199999999999363 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 250.8599999999999 Td
+(Dispatch Queue > dispatch.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 262.3199999999999363 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 250.8599999999999 Td
+(Status DISPATCHED. Customer receives "Shipment dispatched") Tj
+T* (naming origin -> destination.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 262.3199999999999363 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 250.8599999999999 Td
+(Per booking on the) Tj
+T* (schedule) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 234.8399999999999181 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 223.3799999999998818 Td
+(E1.8) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 234.8399999999999181 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 223.3799999999998818 Td
+(Move the schedule to arrived at the) Tj
+T* (Djibouti-side port.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 234.8399999999999181 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 223.3799999999998818 Td
+(Train appears in the Djibouti unloading queue. Customer) Tj
+T* (receives "Shipment arrived".) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 234.8399999999999181 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 223.3799999999998818 Td
+(status ARRIVED /) Tj
+T* (ARRIVED_AT_DJIBOUTI) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 207.3599999999999 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 195.8999999999998636 Td
+(E1.9) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 207.3599999999999 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 195.8999999999998636 Td
+(Grant the gate pass for the train, then) Tj
+T* (Unload at Djibouti.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 207.3599999999999 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 195.8999999999998636 Td
+(Items become UNLOADED_AT_DJIBOUTI_PORT and an) Tj
+T* (interchange document is generated.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 207.3599999999999 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 195.8999999999998636 Td
+(Unload checks) Tj
+T* (gatepass_granted_at) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 179.8799999999998818 34. -27.4799999999999969 re
+B
+BT
+/F6 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 168.4199999999998454 Td
+(E1.G) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 179.8799999999998818 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 168.4199999999998454 Td
+(Try to unload at Djibouti BEFORE) Tj
+T* (granting the gate pass.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+226. 179.8799999999998818 227.2799999999999159 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+231. 168.4199999999998454 Td
+(BLOCKED. Items skipped with a gate-pass reason; no) Tj
+T* (interchange document.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2799999999999159 179.8799999999998818 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2799999999999159 168.4199999999998454 Td
+(See section 06) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.8 0.85 0.85 RG
+0.5 w
+42. 36. m
+553.2799999999999727 36. l
+S
+BT
+/F9 8 Tf
+9.1999999999999993 TL
+0.427 0.498 0.51 rg
+42. 22. Td
+(EDR Freight - QA Test Plan) Tj
+ET
+BT
+/F5 7.5 Tf
+8.625 TL
+0.427 0.498 0.51 rg
+530.7799999999999727 22. Td
+(2 / 7) Tj
+ET
+endstream
+endobj
+7 0 obj
+<</Type /Page
+/Parent 1 0 R
+/Resources 2 0 R
+/MediaBox [0 0 595.2799999999999727 841.8899999999999864]
+/Contents 8 0 R
+>>
+endobj
+8 0 obj
+<<
+/Length 18643
+>>
+stream
+0.9 w
+0.06 0.1 0.11 RG
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 783.8899999999999864 Td
+(03) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 782.8899999999999864 Td
+(Export - with first mile) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 762.8899999999999864 m
+553.2799999999999727 762.8899999999999864 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 748.8899999999999864 Td
+(EDR collects the cargo from the customer's premises. Identical to section 02 from the store step onward; the difference is entirely) Tj
+T* (in the gate before receive.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 714.8899999999999864 40. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 703.9400000000000546 Td
+(Step) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+82. 714.8899999999999864 150. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+87. 703.9400000000000546 Td
+(Tester action) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+232. 714.8899999999999864 221.2800000000000296 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+237. 703.9400000000000546 Td
+(Expected result) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+453.2800000000000296 714.8899999999999864 100. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+458.2800000000000296 703.9400000000000546 Td
+(Technical ref) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 696.8399999999999181 40. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 685.3799999999999955 Td
+(E2.1) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+82. 696.8399999999999181 150. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+87. 685.3799999999999955 Td
+(Create the export booking with a first-mile) Tj
+T* (pickup address \(or a service type that) Tj
+T* (includes first mile\).) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+232. 696.8399999999999181 221.2800000000000296 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+237. 685.3799999999999955 Td
+(Booking is flagged hasFirstMile.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2800000000000296 696.8399999999999181 100. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2800000000000296 685.3799999999999955 Td
+(Derived from address OR ) Tj
+T* (service_types.includes_firs) Tj
+T* (t_mile) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 660.6200000000000045 40. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 649.1599999999999682 Td
+(E2.2) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+82. 660.6200000000000045 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+87. 649.1599999999999682 Td
+(Create the first-mile request; assign a) Tj
+T* (vehicle and driver.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+232. 660.6200000000000045 221.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+237. 649.1599999999999682 Td
+(Driver receives an SMS naming the vehicle, booking, pickup) Tj
+T* (and destination.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2800000000000296 660.6200000000000045 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2800000000000296 649.1599999999999682 Td
+(First Mile page) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 633.1399999999999864 40. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 621.67999999999995 Td
+(E2.3) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+82. 633.1399999999999864 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+87. 621.67999999999995 Td
+(Walk the leg: READY_TO_TRANSIT ->) Tj
+T* (IN_TRANSIT -> RECEIVED_TO_PORT.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+232. 633.1399999999999864 221.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+237. 621.67999999999995 Td
+(Each transition persists.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2800000000000296 633.1399999999999864 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2800000000000296 621.67999999999995 Td
+() Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 605.6599999999999682 40. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 594.2000000000000455 Td
+(E2.4) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+82. 605.6599999999999682 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+87. 594.2000000000000455 Td
+(Now run Receive for Loading.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+232. 605.6599999999999682 221.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+237. 594.2000000000000455 Td
+(Booking is received; truck entrance pre-filled from the first-mile) Tj
+T* (vehicle and driver.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2800000000000296 605.6599999999999682 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2800000000000296 594.2000000000000455 Td
+(Then continue at E1.3) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 578.1800000000000637 40. -27.4799999999999969 re
+B
+BT
+/F6 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 566.7200000000000273 Td
+(E2.G1) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+82. 578.1800000000000637 150. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+87. 566.7200000000000273 Td
+(Attempt receive with NO first-mile request) Tj
+T* (created.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+232. 578.1800000000000637 221.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+237. 566.7200000000000273 Td
+(SKIPPED: "First-mile request not created".) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2800000000000296 578.1800000000000637 100. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2800000000000296 566.7200000000000273 Td
+() Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 550.7000000000000455 40. -36.2199999999999989 re
+B
+BT
+/F6 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 539.2400000000000091 Td
+(E2.G2) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+82. 550.7000000000000455 150. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+87. 539.2400000000000091 Td
+(Attempt receive while first-mile status is) Tj
+T* (IN_TRANSIT.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+232. 550.7000000000000455 221.2800000000000296 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+237. 539.2400000000000091 Td
+(SKIPPED: "First-mile truck has not arrived".) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+453.2800000000000296 550.7000000000000455 100. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+458.2800000000000296 539.2400000000000091 Td
+(Only) Tj
+T* (RECEIVED_TO_PORT) Tj
+T* (passes) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 488.4800000000000182 Td
+(04) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 487.4800000000000182 Td
+(Import - self-haul \(customer collects\)) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 467.4800000000000182 m
+553.2799999999999727 467.4800000000000182 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 453.4800000000000182 Td
+(The longest flow, and the one with the most guards. The customer assigns their own trucks, signs a booking-level handover, and) Tj
+T* (collects. Test this one first - it exercises truck arrival, loading, weighing, handover, exit paper, and fees.) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.5 w
+42. 421.4800000000000182 511.2799999999999727 -32. re
+B
+BT
+/F5 8 Tf
+9.1999999999999993 TL
+0.275 0.345 0.357 rg
+52. 409.4800000000000182 Td
+(train arrives  >  unload  >  inspect  >  ready for pickup  >  assign truck  >  truck arrival  >  sign) Tj
+T* (handover  >  load  >  truck leaving  >  exit paper  >  deliver) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+0.8 0.85 0.85 RG
+0.5 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 377.4800000000000182 34. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 366.5300000000000296 Td
+(Step) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+76. 377.4800000000000182 145. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+81. 366.5300000000000296 Td
+(Tester action) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+221. 377.4800000000000182 234.2800000000000296 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+226. 366.5300000000000296 Td
+(Expected result) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+455.2800000000000296 377.4800000000000182 98. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+460.2800000000000296 366.5300000000000296 Td
+(Technical ref) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 359.4300000000000068 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 347.9700000000000273 Td
+(I1.1) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 359.4300000000000068 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 347.9700000000000273 Td
+(Import booking \(route DJ -> ET\), paid,) Tj
+T* (no last-mile address and a service type) Tj
+T* (that excludes last mile.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 359.4300000000000068 234.2800000000000296 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 347.9700000000000273 Td
+(Booking is self-haul.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 359.4300000000000068 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 347.9700000000000273 Td
+(Drives) Tj
+T* (usesCustomerTruck) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 323.2100000000000364 34. -44.9599999999999937 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 311.75 Td
+(I1.2) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 323.2100000000000364 145. -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 311.75 Td
+(Import Operations > Arrival Queue.) Tj
+T* (Open the arrived train, assign) Tj
+T* (warehouse/yard/zone per booking, Auto) Tj
+T* (Unload Arrived Bookings.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 323.2100000000000364 234.2800000000000296 -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 311.75 Td
+(Inventory created at UNLOADED. Counter shows n/total unloaded.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 323.2100000000000364 98. -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 311.75 Td
+(Train must be ARRIVED) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 278.25 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 266.7899999999999636 Td
+(I1.3) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 278.25 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 266.7899999999999636 Td
+(Inspect the item, outcome PASSED.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 278.25 234.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 266.7899999999999636 Td
+(Item advances to READY_FOR_PICKUP. Customer receives) Tj
+T* ("Assign a truck for pickup" \(in-app + SMS + email\).) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 278.25 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 266.7899999999999636 Td
+(Fires only when self-haul) Tj
+T* (AND no truck assigned) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 250.7699999999999818 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 239.3099999999999454 Td
+(I1.4) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 250.7699999999999818 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 239.3099999999999454 Td
+(PORTAL: customer assigns truck\(s\),) Tj
+T* (entering ISO container numbers per) Tj
+T* (truck.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 250.7699999999999818 234.2800000000000296 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 239.3099999999999454 Td
+(Containers move to stage ASSIGNED and show their planned) Tj
+T* (truck. Booking becomes TRUCK_ASSIGNED.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 250.7699999999999818 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 239.3099999999999454 Td
+(20ft -> max 2/truck; 40ft ->) Tj
+T* (1/truck; trucks <=) Tj
+T* (containers) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 214.5499999999999545 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 203.0899999999999181 Td
+(I1.5) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 214.5499999999999545 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 203.0899999999999181 Td
+(Backoffice row menu > Truck Arrival.) Tj
+T* (Select the assigned truck, record gate-in) Tj
+T* (time and TARE weight \(tonnes\).) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 214.5499999999999545 234.2800000000000296 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 203.0899999999999181 Td
+(Truck stamped arrived. A SELF_HAUL handover is generated) Tj
+T* (\(booking-level\) and the customer is notified to sign, on all three) Tj
+T* (channels.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 214.5499999999999545 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 203.0899999999999181 Td
+(Truck Arrival disabled until) Tj
+T* (a truck is assigned) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 178.3299999999999272 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 166.8699999999998909 Td
+(I1.6) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 178.3299999999999272 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 166.8699999999998909 Td
+(PORTAL: customer opens the booking >) Tj
+T* (Approve delivery.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 178.3299999999999272 234.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 166.8699999999998909 Td
+(The handover PDF opens for review; approving applies their saved) Tj
+T* (signature and returns the signed PDF.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 178.3299999999999272 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 166.8699999999998909 Td
+(Signs all unsigned) Tj
+T* (handovers on the booking) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 150.8499999999999091 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 139.3899999999998727 Td
+(I1.7) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 150.8499999999999091 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 139.3899999999998727 Td
+(Open the container list > select the) Tj
+T* (assigned containers > Load onto truck) Tj
+T* (\(pick the arrived truck\).) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 150.8499999999999091 234.2800000000000296 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 139.3899999999998727 Td
+(Containers move to LOADED; loaded_at stamped.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 150.8499999999999091 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 139.3899999999998727 Td
+(Only arrived, not-departed) Tj
+T* (trucks are listed) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 114.6299999999998818 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 103.1699999999998454 Td
+(I1.8) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 114.6299999999998818 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 103.1699999999998454 Td
+(Row menu > Truck Leaving. Select the) Tj
+T* (containers on the truck, record gate-out) Tj
+T* (time and GROSS weight.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 114.6299999999998818 234.2800000000000296 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 103.1699999999998454 Td
+(Net is computed from the selected containers' cargo weight and) Tj
+T* (must equal gross - tare. Release document issued.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 114.6299999999998818 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 103.1699999999998454 Td
+(Weight match enforced) Tj
+T* (client- AND server-side) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 78.4099999999998545 34. -18.7399999999999984 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 66.9499999999998181 Td
+(I1.9) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 78.4099999999998545 145. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 66.9499999999998181 Td
+(Generate the exit paper for the truck.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 78.4099999999998545 234.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 66.9499999999998181 Td
+(PDF lists the truck, driver, and its containers. Containers move to) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 78.4099999999998545 98. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 66.9499999999998181 Td
+(Requires signed handover) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+0.8 0.85 0.85 RG
+0.5 w
+0.78 G
+0. w
+0.8 0.85 0.85 RG
+0.5 w
+42. 36. m
+553.2799999999999727 36. l
+S
+BT
+/F9 8 Tf
+9.1999999999999993 TL
+0.427 0.498 0.51 rg
+42. 22. Td
+(EDR Freight - QA Test Plan) Tj
+ET
+BT
+/F5 7.5 Tf
+8.625 TL
+0.427 0.498 0.51 rg
+530.7799999999999727 22. Td
+(3 / 7) Tj
+ET
+endstream
+endobj
+9 0 obj
+<</Type /Page
+/Parent 1 0 R
+/Resources 2 0 R
+/MediaBox [0 0 595.2799999999999727 841.8899999999999864]
+/Contents 10 0 R
+>>
+endobj
+10 0 obj
+<<
+/Length 20063
+>>
+stream
+0. w
+0.78 G
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 801.8899999999999864 34. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 790.9399999999999409 Td
+(Step) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+76. 801.8899999999999864 145. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+81. 790.9399999999999409 Td
+(Tester action) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+221. 801.8899999999999864 234.2800000000000296 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+226. 790.9399999999999409 Td
+(Expected result) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+455.2800000000000296 801.8899999999999864 98. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+460.2800000000000296 790.9399999999999409 Td
+(Technical ref) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 783.8400000000000318 34. -18.7399999999999984 re
+B
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 783.8400000000000318 145. -18.7399999999999984 re
+B
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 783.8400000000000318 234.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 772.3799999999999955 Td
+(LEFT.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 783.8400000000000318 98. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 772.3799999999999955 Td
+(+ cleared fees) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 765.1000000000000227 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 753.6399999999999864 Td
+(I1.10) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 765.1000000000000227 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 753.6399999999999864 Td
+(Deliver the inventory, recording the) Tj
+T* (receiver name.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 765.1000000000000227 234.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 753.6399999999999864 Td
+(Status DELIVERED; handovers stamped delivered.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2800000000000296 765.1000000000000227 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2800000000000296 753.6399999999999864 Td
+(Requires handover signed) Tj
+T* (AND truck departed) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+0.78 G
+0. w
+0.8 0.85 0.85 RG
+0.5 w
+0.8 0.85 0.85 RG
+0.5 w
+0.97 0.93 0.93 rg
+42. 723.6200000000000045 511.2799999999999727 -51. re
+f
+0.62 0.17 0.2 rg
+42. 723.6200000000000045 3. -51. re
+f
+BT
+/F1 8.6 Tf
+9.8899999999999988 TL
+0.275 0.345 0.357 rg
+56. 710.6200000000000045 Td
+(THE SINGLE MOST LIKELY BUG YOU WILL HIT. Exit paper returns 400 when the handover is not fully signed, or when a) Tj
+T* (warehouse fee invoice is ISSUED / PARTIALLY_PAID. In the container list, the Exit Paper button turns grey and clicking it sends) Tj
+T* (the customer a signature request instead of erroring. That is correct behaviour - verify the message, do not file it as a bug.) Tj
+ET
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 650.6200000000000045 Td
+(05) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 649.6200000000000045 Td
+(Import - EDR last mile) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 629.6200000000000045 m
+553.2799999999999727 629.6200000000000045 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 615.6200000000000045 Td
+(EDR delivers to the customer's door. No customer truck, no portal Approve delivery, and the handover is PER DELIVERING) Tj
+T* (TRUCK - not per booking. This is where truck detention accrues.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 581.6200000000000045 34. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 570.6700000000000728 Td
+(Step) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+76. 581.6200000000000045 145. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+81. 570.6700000000000728 Td
+(Tester action) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+221. 581.6200000000000045 234.2799999999999727 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+226. 570.6700000000000728 Td
+(Expected result) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+455.2799999999999727 581.6200000000000045 98. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+460.2799999999999727 570.6700000000000728 Td
+(Technical ref) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 563.5699999999999363 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 552.1100000000000136 Td
+(I2.1) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 563.5699999999999363 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 552.1100000000000136 Td
+(Import booking with a last-mile delivery) Tj
+T* (address \(or service type including last) Tj
+T* (mile\).) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 563.5699999999999363 234.2799999999999727 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 552.1100000000000136 Td
+(hasLastMile is true; no "assign a truck" notification is sent.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 563.5699999999999363 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 552.1100000000000136 Td
+(EDR haulage - customer) Tj
+T* (assigns nothing) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 527.3500000000000227 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 515.8900000000001 Td
+(I2.2) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 527.3500000000000227 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 515.8900000000001 Td
+(Unload from the arrived train, inspect) Tj
+T* (PASSED.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 527.3500000000000227 234.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 515.8900000000001 Td
+(Item becomes READY_FOR_PICKUP and the last-mile leg is) Tj
+T* (accepted automatically.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 527.3500000000000227 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 515.8900000000001 Td
+() Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 499.8700000000000045 34. -18.7399999999999984 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 488.410000000000025 Td
+(I2.3) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 499.8700000000000045 145. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 488.410000000000025 Td
+(Last Mile page: assign vehicle + driver.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 499.8700000000000045 234.2799999999999727 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 488.410000000000025 Td
+(Leg reaches READY_TO_TRANSIT. Row shows Assigned.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 499.8700000000000045 98. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 488.410000000000025 Td
+(Driver notified by SMS) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 481.1299999999999955 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 469.6700000000000159 Td
+(I2.4) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 481.1299999999999955 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 469.6700000000000159 Td
+(Truck Arrival from the Last Mile row:) Tj
+T* (gate-in, tare weight.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 481.1299999999999955 234.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 469.6700000000000159 Td
+(Weighing saved; the assigned last-mile truck is pre-selected.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 481.1299999999999955 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 469.6700000000000159 Td
+(Re-opening must show) Tj
+T* (the saved details) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 453.6499999999999773 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 442.1899999999999977 Td
+(I2.5) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 453.6499999999999773 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 442.1899999999999977 Td
+(Truck Leaving: gate-out, gross weight.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 453.6499999999999773 234.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 442.1899999999999977 Td
+(Release document issued; leg moves to IN_TRANSIT. arrivedAt) Tj
+T* (starts the detention clock.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 453.6499999999999773 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 442.1899999999999977 Td
+(Detention window opens) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 426.1699999999999591 34. -36.2199999999999989 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 414.7099999999999795 Td
+(I2.6) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 426.1699999999999591 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 414.7099999999999795 Td
+(Deliver at the customer's door, recording) Tj
+T* (the receiver name.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 426.1699999999999591 234.2799999999999727 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 414.7099999999999795 Td
+(Item DELIVERED. An EDR_LAST_MILE handover is generated) Tj
+T* (PER DELIVERING TRUCK, resolved from the container's allocated) Tj
+T* (vehicle.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 426.1699999999999591 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 414.7099999999999795 Td
+(Not booking-level) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 389.9499999999999318 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 378.4899999999999523 Td
+(I2.7) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 389.9499999999999318 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 378.4899999999999523 Td
+(Return the vehicle > mark the leg) Tj
+T* (DELIVERED.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 389.9499999999999318 234.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 378.4899999999999523 Td
+(deliveredAt stamped; detention clock stops.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 389.9499999999999318 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 378.4899999999999523 Td
+() Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 362.4699999999999136 34. -27.4799999999999969 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 351.0099999999999341 Td
+(I2.8) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 362.4699999999999136 145. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 351.0099999999999341 Td
+(Preview, then generate the truck) Tj
+T* (detention invoice.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 362.4699999999999136 234.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 351.0099999999999341 Td
+(Charged per truck per day beyond the grace hours, at the matching) Tj
+T* (tier. See section 07.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 362.4699999999999136 98. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 351.0099999999999341 Td
+(POST /last-mile/:id/genera) Tj
+T* (te-truck-detention-invoice) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 334.9899999999998954 34. -36.2199999999999989 re
+B
+BT
+/F6 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 323.529999999999859 Td
+(I2.G) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+76. 334.9899999999998954 145. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+81. 323.529999999999859 Td
+(Open the booking in the portal.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+221. 334.9899999999998954 234.2799999999999727 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+226. 323.529999999999859 Td
+(ABSENT: Approve delivery must NOT appear. The portal flag) Tj
+T* (counts only SELF_HAUL handovers; EDR handovers are signed) Tj
+T* (by the receiver at the door.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+455.2799999999999727 334.9899999999998954 98. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+460.2799999999999727 323.529999999999859 Td
+(Regression check) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 272.7699999999998681 Td
+(06) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 271.7699999999998681 Td
+(Marshalling, gate pass, interchange) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 251.7699999999998681 m
+553.2799999999999727 251.7699999999998681 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 237.7699999999998681 Td
+(Documents are generated, not uploaded. Each has a precondition; test the precondition, not just the PDF.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 215.7699999999998681 92. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 204.8199999999998226 Td
+(Document) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+134. 215.7699999999998681 95. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+139. 204.8199999999998226 Td
+(When) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+229. 215.7699999999998681 146.1434567681443468 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+234. 204.8199999999998226 Td
+(Precondition) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+375.1434567681443468 215.7699999999998681 178.1365432318555975 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+380.1434567681443468 204.8199999999998226 Td
+(Verify) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 197.7199999999999136 92. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 186.2599999999998772 Td
+(GRN) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 197.7199999999999136 95. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 186.2599999999998772 Td
+(On receive to warehouse) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 197.7199999999999136 146.1434567681443468 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+234. 186.2599999999998772 Td
+(Booking PAID; route direction matches;) Tj
+T* (export needs a truck entrance) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 197.7199999999999136 178.1365432318555975 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+380.1434567681443468 186.2599999999998772 Td
+(Number format GRN-<DIR>-<YYYYMMDD>-<8>;) Tj
+T* (PDF opens; customer SMS sent) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 170.2399999999998954 92. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 158.779999999999859 Td
+(Import load list /) Tj
+T* (marshalling) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 170.2399999999998954 95. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 158.779999999999859 Td
+(Import train, before) Tj
+T* (unload) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 170.2399999999998954 146.1434567681443468 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+234. 158.779999999999859 Td
+(Schedule has bookings assigned) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 170.2399999999998954 178.1365432318555975 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+380.1434567681443468 158.779999999999859 Td
+(Summary endpoint and printable PDF agree;) Tj
+T* (portrait/landscape both render) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 142.7599999999998772 92. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 131.2999999999998408 Td
+(Export marshalling /) Tj
+T* (load list) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 142.7599999999998772 95. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 131.2999999999998408 Td
+(Export train, after loading) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 142.7599999999998772 146.1434567681443468 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+234. 131.2999999999998408 Td
+(Items LOADED onto wagons) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 142.7599999999998772 178.1365432318555975 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+380.1434567681443468 131.2999999999998408 Td
+(Wagon, booking, container rows are complete) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 115.279999999999859 92. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 103.8199999999998226 Td
+(Gate pass) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 115.279999999999859 95. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 103.8199999999998226 Td
+(Djibouti-side operations) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 115.279999999999859 146.1434567681443468 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+234. 103.8199999999998226 Td
+(Granted per schedule) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 115.279999999999859 178.1365432318555975 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+380.1434567681443468 103.8199999999998226 Td
+(gatepass_granted_at is set; export Djibouti unload) Tj
+T* (reads this same field) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 87.7999999999998408 92. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 76.3399999999998045 Td
+(Interchange document) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 87.7999999999998408 95. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 76.3399999999998045 Td
+(Automatically, after a) Tj
+T* (successful Djibouti) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 87.7999999999998408 146.1434567681443468 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+234. 76.3399999999998045 Td
+(At least one item unloaded) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 87.7999999999998408 178.1365432318555975 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+380.1434567681443468 76.3399999999998045 Td
+(Document number returned in the unload) Tj
+T* (response; visible in Interchange Documents) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.8 0.85 0.85 RG
+0.5 w
+42. 36. m
+553.2799999999999727 36. l
+S
+BT
+/F9 8 Tf
+9.1999999999999993 TL
+0.427 0.498 0.51 rg
+42. 22. Td
+(EDR Freight - QA Test Plan) Tj
+ET
+BT
+/F5 7.5 Tf
+8.625 TL
+0.427 0.498 0.51 rg
+530.7799999999999727 22. Td
+(4 / 7) Tj
+ET
+endstream
+endobj
+11 0 obj
+<</Type /Page
+/Parent 1 0 R
+/Resources 2 0 R
+/MediaBox [0 0 595.2799999999999727 841.8899999999999864]
+/Contents 12 0 R
+>>
+endobj
+12 0 obj
+<<
+/Length 13441
+>>
+stream
+0. w
+0.78 G
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 801.8899999999999864 92. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 790.9399999999999409 Td
+(Document) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+134. 801.8899999999999864 95. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+139. 790.9399999999999409 Td
+(When) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+229. 801.8899999999999864 146.1434567681443468 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+234. 790.9399999999999409 Td
+(Precondition) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+375.1434567681443468 801.8899999999999864 178.1365432318555975 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+380.1434567681443468 790.9399999999999409 Td
+(Verify) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 783.8400000000000318 92. -18.7399999999999984 re
+B
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 783.8400000000000318 95. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 772.3799999999999955 Td
+(unload) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 783.8400000000000318 146.1434567681443468 -18.7399999999999984 re
+B
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 783.8400000000000318 178.1365432318555975 -18.7399999999999984 re
+B
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 765.1000000000000227 92. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 753.6399999999999864 Td
+(Handover) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 765.1000000000000227 95. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 753.6399999999999864 Td
+(Self-haul: on truck arrival.) Tj
+T* (EDR: at delivery.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 765.1000000000000227 146.1434567681443468 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+234. 753.6399999999999864 Td
+(See sections 04 / 05) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 765.1000000000000227 178.1365432318555975 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+380.1434567681443468 753.6399999999999864 Td
+(Self-haul is booking-level, one per booking; EDR) Tj
+T* (is one per delivering truck) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 737.6200000000000045 92. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 726.1599999999999682 Td
+(Exit paper / release doc) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+134. 737.6200000000000045 95. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+139. 726.1599999999999682 Td
+(Truck leaving) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+229. 737.6200000000000045 146.1434567681443468 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+234. 726.1599999999999682 Td
+(Handover fully signed AND no unpaid) Tj
+T* (warehouse fee) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+375.1434567681443468 737.6200000000000045 178.1365432318555975 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+380.1434567681443468 726.1599999999999682 Td
+(Weights on the paper match the gate weighing) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.97 0.94 0.89 rg
+42. 696.1399999999999864 511.2799999999999727 -51. re
+f
+0.54 0.35 0.04 rg
+42. 696.1399999999999864 3. -51. re
+f
+BT
+/F1 8.6 Tf
+9.8899999999999988 TL
+0.275 0.345 0.357 rg
+56. 683.1399999999999864 Td
+(CROSS-MODULE QUIRK WORTH CONFIRMING WITH THE TEAM. The EXPORT Djibouti unload checks the gate-pass flag) Tj
+T* (stored on the IMPORT Djibouti operations record \(import_djibouti_operations.gatepass_granted_at\). It works, but it is surprising.) Tj
+T* (If an export unload silently skips every item, check that field first.) Tj
+ET
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 623.1399999999999864 Td
+(07) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 622.1399999999999864 Td
+(Fee rules) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 602.1399999999999864 m
+553.2799999999999727 602.1399999999999864 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 588.1399999999999864 Td
+(Four rule types. Two are day-based with free days and tiers; double handling is a flat rate multiplied by a basis; truck detention is) Tj
+T* (hour-graced and vehicle-scoped.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 554.1399999999999864 88. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 543.1900000000000546 Td
+(Rule type) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+130. 554.1399999999999864 72. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+135. 543.1900000000000546 Td
+(Charged on) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+202. 554.1399999999999864 85. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+207. 543.1900000000000546 Td
+(Key fields) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+287. 554.1399999999999864 266.2799999999999727 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+292. 543.1900000000000546 Td
+(Test cases) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 536.0899999999999181 88. -27.4799999999999969 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 525.1399999999999864 Td
+(STORAGE_FEE) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+130. 536.0899999999999181 72. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+135. 524.6299999999999955 Td
+(Days in storage) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+202. 536.0899999999999181 85. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+207. 524.6299999999999955 Td
+(free days, tiers) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+287. 536.0899999999999181 266.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+292. 524.6299999999999955 Td
+(Within free days -> zero. One day past -> tier 1. Cross a tier boundary ->) Tj
+T* (correct tier rate.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 508.6099999999999568 88. -27.4799999999999969 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 497.6599999999999682 Td
+(DEMURRAGE_FEE) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+130. 508.6099999999999568 72. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+135. 497.1499999999999773 Td
+(Days beyond free) Tj
+T* (time) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+202. 508.6099999999999568 85. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+207. 497.1499999999999773 Td
+(free days, tiers) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+287. 508.6099999999999568 266.2799999999999727 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+292. 497.1499999999999773 Td
+(Same boundary tests. Confirm it blocks exit paper and delivery while) Tj
+T* (ISSUED.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 481.1299999999999386 88. -44.9599999999999937 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 470.17999999999995 Td
+(DOUBLE_HANDLING_FE) Tj
+T* (E) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+130. 481.1299999999999386 72. -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+135. 469.6699999999999591 Td
+(Flat rate x quantity) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+202. 481.1299999999999386 85. -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+207. 469.6699999999999591 Td
+(basis:) Tj
+T* (PER_CONTAINER |) Tj
+T* (PER_TON |) Tj
+T* (PER_ITEM) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+287. 481.1299999999999386 266.2799999999999727 -44.9599999999999937 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+292. 469.6699999999999591 Td
+(Container booking -> PER_CONTAINER uses container count. Bulk ->) Tj
+T* (PER_TON uses tonnage. Break-bulk machinery -> PER_ITEM uses item) Tj
+T* (count. IMPORT ONLY. Free days and tiers must not apply.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 436.1699999999999591 88. -36.2199999999999989 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 425.2199999999999704 Td
+(TRUCK_DETENTION_FE) Tj
+T* (E) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+130. 436.1699999999999591 72. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+135. 424.7099999999999795 Td
+(Per truck, per day) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+202. 436.1699999999999591 85. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+207. 424.7099999999999795 Td
+(free_hours grace,) Tj
+T* (tiers, vehicle type) Tj
+T* (scope) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+287. 436.1699999999999591 266.2799999999999727 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+292. 424.7099999999999795 Td
+(Return inside the grace window -> zero. Just past grace -> day 1 at tier 1.) Tj
+T* (Multi-day -> tier escalation. A vehicle type outside the rule's scope -> no) Tj
+T* (charge. IMPORT ONLY.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+BT
+/F2 8 Tf
+9.1999999999999993 TL
+0.063 0.102 0.11 rg
+42. 377.9499999999999318 Td
+(FEE BEHAVIOUR TO VERIFY ON EVERY RULE) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 373.4499999999999318 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 365.9499999999999318 Td
+(Preview before invoice. The preview amount must equal the issued invoice total.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 356.4499999999999318 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 348.9499999999999318 Td
+(Notification on issue. Issuing a warehouse fee invoice sends the customer an in-app INVOICE_ISSUED notification AND) Tj
+T* (an SMS, deep-linked to pay.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 327.4499999999999318 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 319.9499999999999318 Td
+(Clearance gate. While a warehouse-source invoice is ISSUED or PARTIALLY_PAID, exit paper, terminal release, and) Tj
+T* (Approve delivery are all blocked.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 298.4499999999999318 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 290.9499999999999318 Td
+(Payable-but-uninvoiced. If fees are payable and no invoice exists yet, release is still blocked with "Generate and fully) Tj
+T* (pay...". Confirm the operator can generate it from that state.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 269.4499999999999318 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 261.9499999999999318 Td
+(Fully paid -> release proceeds; a receipt PDF is available.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 252.4499999999999318 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 244.9499999999999318 Td
+(Edit a rule \(rate, free days, tiers, grace hours\) and confirm the next preview reflects it.) Tj
+ET
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 211.9499999999999318 Td
+(08) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 210.9499999999999318 Td
+(Allocation rules) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 190.9499999999999318 m
+553.2799999999999727 190.9499999999999318 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 176.9499999999999318 Td
+(Where an item is stored is decided by the first matching rule, in priority order. Test the precedence, not just one rule.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 154.9499999999999318 258.0206829268292381 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 143.9999999999998863 Td
+(Match criteria \(any may be null = wildcard\)) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+300.0206829268292381 154.9499999999999318 253.2593170731707346 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+305.0206829268292381 143.9999999999998863 Td
+(Targets) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 136.8999999999999773 258.0206829268292381 -34.1499999999999986 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.063 0.102 0.11 rg
+47. 125.9499999999999318 Td
+(freight_type, trade_direction, cargo_type_code,) Tj
+T* (container_status, requires_inspection, ordered by priority) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+300.0206829268292381 136.8999999999999773 253.2593170731707346 -34.1499999999999986 re
+B
+BT
+/F5 7 Tf
+8.0499999999999989 TL
+0.275 0.345 0.357 rg
+305.0206829268292381 125.9499999999999318 Td
+(target_facility_code, target_warehouse_code,) Tj
+T* (target_yard_code \(required\), target_zone_code,) Tj
+T* (storage_type) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+BT
+/F2 8 Tf
+9.1999999999999993 TL
+0.063 0.102 0.11 rg
+42. 80.75 Td
+(PRECEDENCE, HIGHEST FIRST) Tj
+ET
+0.8 0.85 0.85 RG
+0.5 w
+42. 36. m
+553.2799999999999727 36. l
+S
+BT
+/F9 8 Tf
+9.1999999999999993 TL
+0.427 0.498 0.51 rg
+42. 22. Td
+(EDR Freight - QA Test Plan) Tj
+ET
+BT
+/F5 7.5 Tf
+8.625 TL
+0.427 0.498 0.51 rg
+530.7799999999999727 22. Td
+(5 / 7) Tj
+ET
+endstream
+endobj
+13 0 obj
+<</Type /Page
+/Parent 1 0 R
+/Resources 2 0 R
+/MediaBox [0 0 595.2799999999999727 841.8899999999999864]
+/Contents 14 0 R
+>>
+endobj
+14 0 obj
+<<
+/Length 21215
+>>
+stream
+0.9 w
+0.06 0.1 0.11 RG
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 793.8899999999999864 20. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 782.9399999999999409 Td
+(#) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+62. 793.8899999999999864 120. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+67. 782.9399999999999409 Td
+(Source of the location) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+182. 793.8899999999999864 207.6664663121432 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+187. 782.9399999999999409 Td
+(How to trigger) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+389.6664663121432 793.8899999999999864 163.6135336878567728 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+394.6664663121432 782.9399999999999409 Td
+(Note recorded) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 775.8400000000000318 20. -18.7399999999999984 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 764.3799999999999955 Td
+(1) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+62. 775.8400000000000318 120. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+67. 764.3799999999999955 Td
+(Operator selection) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+182. 775.8400000000000318 207.6664663121432 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+187. 764.3799999999999955 Td
+(Store modal > pick warehouse + yard + zone) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+389.6664663121432 775.8400000000000318 163.6135336878567728 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+394.6664663121432 764.3799999999999955 Td
+("Stored at operator-selected location") Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 757.1000000000000227 20. -18.7399999999999984 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 745.6399999999999864 Td
+(2) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+62. 757.1000000000000227 120. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+67. 745.6399999999999864 Td
+(Allocation rule) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+182. 757.1000000000000227 207.6664663121432 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+187. 745.6399999999999864 Td
+(Leave the Store modal blank; a matching rule exists) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+389.6664663121432 757.1000000000000227 163.6135336878567728 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+394.6664663121432 745.6399999999999864 Td
+("Stored by allocation rule <name>") Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 738.3600000000000136 20. -18.7399999999999984 re
+B
+BT
+/F5 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 726.8999999999999773 Td
+(3) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+62. 738.3600000000000136 120. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+67. 726.8999999999999773 Td
+(Capacity-balanced fallback) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+182. 738.3600000000000136 207.6664663121432 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+187. 726.8999999999999773 Td
+(Leave blank; no rule matches) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+389.6664663121432 738.3600000000000136 163.6135336878567728 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+394.6664663121432 726.8999999999999773 Td
+("Stored by capacity-balanced allocation") Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.43 0.5 0.51 RG
+0.6 w
+43. 711.1200000000000045 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 703.6200000000000045 Td
+(Two matching rules -> the LOWER priority number wins.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 694.1200000000000045 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 686.6200000000000045 Td
+(Yard dropdowns are filtered by freight type - container bookings offer container yards only.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 677.1200000000000045 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 669.6200000000000045 Td
+(Only ACTIVE warehouses, yards and zones are selectable.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 660.1200000000000045 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 652.6200000000000045 Td
+(Storing beyond a zone's capacity is rejected; capacities are compared in TONNES.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 643.1200000000000045 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 635.6200000000000045 Td
+(Move an item to another warehouse/yard/zone -> capacity released at source, taken at destination.) Tj
+ET
+0.43 0.5 0.51 RG
+0.6 w
+43. 626.1200000000000045 8. -8. re
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+60. 618.6200000000000045 Td
+(Edit a rule, an existing warehouse, a yard, and a zone - all four must be editable.) Tj
+ET
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 585.6200000000000045 Td
+(09) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 584.6200000000000045 Td
+(Negative & guard cases) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 564.6200000000000045 m
+553.2799999999999727 564.6200000000000045 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 550.6200000000000045 Td
+(Every row here is intended behaviour. The test passes when the action is REFUSED with the stated message. Anything that) Tj
+T* (succeeds is the bug.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 516.6200000000000045 74. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 505.6700000000000159 Td
+(Area) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+116. 516.6200000000000045 195. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+121. 505.6700000000000159 Td
+(Attempt) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+311. 516.6200000000000045 242.2800000000000296 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+316. 505.6700000000000159 Td
+(Expected refusal) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 498.5699999999999932 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 487.1100000000000136 Td
+(Booking) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 498.5699999999999932 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 487.1100000000000136 Td
+(Enter a container number that is not 4 letters + 7 digits) Tj
+T* (\(e.g. MSKU10105185, 3456789\).) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 498.5699999999999932 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 487.1100000000000136 Td
+("Use ISO format: 4 letters + 7 digits". Lowercase is auto-uppercased;) Tj
+T* (input capped at 11 characters.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 471.089999999999975 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 459.6299999999999955 Td
+(Receive) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 471.089999999999975 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 459.6299999999999955 Td
+(Receive a booking that is not PAID.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 471.089999999999975 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 459.6299999999999955 Td
+(Skipped: "Booking not PAID".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 452.3499999999999659 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 440.8899999999999864 Td
+(Receive) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 452.3499999999999659 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 440.8899999999999864 Td
+(Receive the same booking twice.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 452.3499999999999659 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 440.8899999999999864 Td
+(Skipped: "Already received".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 433.6099999999999568 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 422.1499999999999773 Td
+(Receive) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 433.6099999999999568 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 422.1499999999999773 Td
+(Export receive with no truck entrance captured.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 433.6099999999999568 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 422.1499999999999773 Td
+(Rejected before any inventory is created.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 414.8699999999999477 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 403.4099999999999682 Td
+(Truck assign) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 414.8699999999999477 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 403.4099999999999682 Td
+(Put two 40ft containers on one truck.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 414.8699999999999477 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 403.4099999999999682 Td
+("A 40ft container fills the truck - assign only 1 container to this truck".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 396.1299999999999386 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 384.6699999999999591 Td
+(Truck assign) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 396.1299999999999386 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 384.6699999999999591 Td
+(Put three containers on one truck.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 396.1299999999999386 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 384.6699999999999591 Td
+("A truck carries at most 2 containers".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 377.3899999999999295 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 365.92999999999995 Td
+(Truck assign) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 377.3899999999999295 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 365.92999999999995 Td
+(Assign more trucks than the booking has containers.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 377.3899999999999295 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 365.92999999999995 Td
+("Cannot assign more trucks than containers...".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 358.6499999999999204 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 347.1899999999999409 Td
+(Truck assign) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 358.6499999999999204 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 347.1899999999999409 Td
+(Assign a container from another booking, or one) Tj
+T* (already on another truck.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 358.6499999999999204 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 347.1899999999999409 Td
+("...is not one of this booking's containers" / "...already loaded onto) Tj
+T* (another truck".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 331.1699999999999022 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 319.7099999999999227 Td
+(Truck assign) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 331.1699999999999022 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 319.7099999999999227 Td
+(Edit a truck AFTER it has arrived.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 331.1699999999999022 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 319.7099999999999227 Td
+(Refused - edits are allowed only until arrival.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 312.42999999999995 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 300.9699999999999136 Td
+(Loading) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 312.42999999999995 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 300.9699999999999136 Td
+(Load containers onto a truck that has not arrived.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 312.42999999999995 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 300.9699999999999136 Td
+("Record the truck arrival before loading...". The truck picker lists only) Tj
+T* (arrived, not-departed trucks.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 284.9499999999999318 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 273.4899999999998954 Td
+(Loading) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 284.9499999999999318 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 273.4899999999998954 Td
+(Load onto a truck that has already departed.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 284.9499999999999318 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 273.4899999999998954 Td
+("This truck has already left - its load is locked".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 266.2099999999999227 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 254.7499999999998863 Td
+(Stages) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 266.2099999999999227 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 254.7499999999998863 Td
+(Customer assigns containers to a truck, then check the) Tj
+T* (container list.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 266.2099999999999227 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 254.7499999999998863 Td
+(Stage is ASSIGNED, NEVER LOADED. Exit Paper is not offered.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 238.7299999999999045 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 227.2699999999998681 Td
+(Truck leaving) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 238.7299999999999045 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 227.2699999999998681 Td
+(Enter a gross weight where gross - tare != the selected) Tj
+T* (containers' cargo weight.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 238.7299999999999045 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 227.2699999999998681 Td
+("Weight mismatch...". Exit paper and gate clearance blocked, client) Tj
+T* (and server.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 211.2499999999998863 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 199.7899999999998499 Td
+(Truck leaving) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 211.2499999999998863 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 199.7899999999998499 Td
+(Save leaving with no containers selected.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 211.2499999999998863 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 199.7899999999998499 Td
+("Select the containers loaded on this truck".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 192.5099999999998772 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 181.0499999999998408 Td
+(Exit paper) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 192.5099999999998772 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 181.0499999999998408 Td
+(Generate before the handover is signed.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 192.5099999999998772 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 181.0499999999998408 Td
+("Handover must be signed...". In the container list the button is grey) Tj
+T* (and instead SENDS THE CUSTOMER A SIGNATURE REQUEST.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 165.029999999999859 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 153.5699999999998226 Td
+(Exit paper) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 165.029999999999859 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 153.5699999999998226 Td
+(Generate with an ISSUED demurrage/storage invoice.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 165.029999999999859 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 153.5699999999998226 Td
+("...must be fully paid before terminal release".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 146.2899999999998499 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 134.8299999999998136 Td
+(Approve delivery) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 146.2899999999998499 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 134.8299999999998136 Td
+(Approve without a saved signature.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 146.2899999999998499 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 134.8299999999998136 Td
+("Please save your signature..." and the portal routes to the signature) Tj
+T* (page.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 118.8099999999998317 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 107.3499999999997954 Td
+(Approve delivery) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 118.8099999999998317 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 107.3499999999997954 Td
+(Approve before warehouse inspection has passed.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 118.8099999999998317 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 107.3499999999997954 Td
+("Delivery can be approved after warehouse inspection has passed".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 100.0699999999998226 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 88.6099999999997863 Td
+(Approve delivery) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 100.0699999999998226 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 88.6099999999997863 Td
+(Approve when a truck is assigned but has not arrived.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 100.0699999999998226 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 88.6099999999997863 Td
+("Customer truck arrival must be recorded before delivery approval".) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 81.3299999999998136 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 69.8699999999997772 Td
+(Deliver) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 81.3299999999998136 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 69.8699999999997772 Td
+(Deliver before a release order was issued, or before) Tj
+T* (the self-haul truck has left.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 81.3299999999998136 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 69.8699999999997772 Td
+("A release order must be issued..." / "Deliver is available only after) Tj
+T* (the customer truck has left".) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.8 0.85 0.85 RG
+0.5 w
+42. 36. m
+553.2799999999999727 36. l
+S
+BT
+/F9 8 Tf
+9.1999999999999993 TL
+0.427 0.498 0.51 rg
+42. 22. Td
+(EDR Freight - QA Test Plan) Tj
+ET
+BT
+/F5 7.5 Tf
+8.625 TL
+0.427 0.498 0.51 rg
+530.7799999999999727 22. Td
+(6 / 7) Tj
+ET
+endstream
+endobj
+15 0 obj
+<</Type /Page
+/Parent 1 0 R
+/Resources 2 0 R
+/MediaBox [0 0 595.2799999999999727 841.8899999999999864]
+/Contents 16 0 R
+>>
+endobj
+16 0 obj
+<<
+/Length 15025
+>>
+stream
+0. w
+0.78 G
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 801.8899999999999864 74. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 790.9399999999999409 Td
+(Area) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+116. 801.8899999999999864 195. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+121. 790.9399999999999409 Td
+(Attempt) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+311. 801.8899999999999864 242.2800000000000296 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+316. 790.9399999999999409 Td
+(Expected refusal) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 783.8400000000000318 74. -18.7399999999999984 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 772.3799999999999955 Td
+(Djibouti unload) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 783.8400000000000318 195. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 772.3799999999999955 Td
+(Unload an export train with no gate pass granted.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 783.8400000000000318 242.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 772.3799999999999955 Td
+(Items skipped; no interchange document generated.) Tj
+ET
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 765.1000000000000227 74. -27.4799999999999969 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 753.6399999999999864 Td
+(Warehouse) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+116. 765.1000000000000227 195. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+121. 753.6399999999999864 Td
+(Store into an INACTIVE warehouse/yard/zone, or) Tj
+T* (beyond capacity.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+311. 765.1000000000000227 242.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+316. 753.6399999999999864 Td
+(Not selectable / "No active warehouse yard/zone is available" /) Tj
+T* (capacity error.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 711.6200000000000045 Td
+(10) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 710.6200000000000045 Td
+(Notifications) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 690.6200000000000045 m
+553.2799999999999727 690.6200000000000045 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 676.6200000000000045 Td
+(All customer notifications land in the same portal inbox. Verify the message, the deep link, and - where noted - the SMS and) Tj
+T* (email.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 642.6200000000000045 96. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 631.6700000000000728 Td
+(Notification) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+138. 642.6200000000000045 257.2800000000000296 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+143. 631.6700000000000728 Td
+(Fires when) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+395.2800000000000296 642.6200000000000045 74. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+400.2800000000000296 631.6700000000000728 Td
+(Channels) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+469.2800000000000296 642.6200000000000045 84. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+474.2800000000000296 631.6700000000000728 Td
+(Deep link) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 624.5699999999999363 96. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 613.1100000000000136 Td
+(Shipment dispatched) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+138. 624.5699999999999363 257.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+143. 613.1100000000000136 Td
+(Train schedule dispatched, per booking) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+395.2800000000000296 624.5699999999999363 74. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+400.2800000000000296 613.1100000000000136 Td
+(In-app, SMS, email) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+469.2800000000000296 624.5699999999999363 84. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+474.2800000000000296 613.1100000000000136 Td
+(Booking) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 605.8299999999999272 96. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 594.3700000000000045 Td
+(Shipment arrived) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+138. 605.8299999999999272 257.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+143. 594.3700000000000045 Td
+(Train schedule arrived, per booking) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+395.2800000000000296 605.8299999999999272 74. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+400.2800000000000296 594.3700000000000045 Td
+(In-app, SMS, email) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+469.2800000000000296 605.8299999999999272 84. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+474.2800000000000296 594.3700000000000045 Td
+(Booking) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 587.0899999999999181 96. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 575.6299999999999955 Td
+(Assign a truck for pickup) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+138. 587.0899999999999181 257.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+143. 575.6299999999999955 Td
+(Export: on warehouse receive. Import: on inspection pass -> ready for) Tj
+T* (pickup. Only if self-haul AND no truck assigned.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+395.2800000000000296 587.0899999999999181 74. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+400.2800000000000296 575.6299999999999955 Td
+(In-app, SMS, email) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+469.2800000000000296 587.0899999999999181 84. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+474.2800000000000296 575.6299999999999955 Td
+(Booking > assign) Tj
+T* (truck) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 559.6099999999999 96. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 548.1499999999999773 Td
+(Handover - signature) Tj
+T* (needed) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+138. 559.6099999999999 257.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+143. 548.1499999999999773 Td
+(Self-haul truck arrives \(handover generated\), and re-sent when an) Tj
+T* (operator requests a signature from the Exit Paper button.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+395.2800000000000296 559.6099999999999 74. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+400.2800000000000296 548.1499999999999773 Td
+(In-app, SMS, email) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+469.2800000000000296 559.6099999999999 84. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+474.2800000000000296 548.1499999999999773 Td
+(Booking > approve) Tj
+T* (delivery) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 532.1299999999998818 96. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 520.6699999999999591 Td
+(Warehouse fee due) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+138. 532.1299999999998818 257.2800000000000296 -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+143. 520.6699999999999591 Td
+(Storage / demurrage invoice issued) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+395.2800000000000296 532.1299999999998818 74. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+400.2800000000000296 520.6699999999999591 Td
+(In-app, SMS) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+469.2800000000000296 532.1299999999998818 84. -18.7399999999999984 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+474.2800000000000296 520.6699999999999591 Td
+(Booking > pay) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 513.3899999999998727 96. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 501.92999999999995 Td
+(Wagon allocated /) Tj
+T* (payment window) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+138. 513.3899999999998727 257.2800000000000296 -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+143. 501.92999999999995 Td
+(Scheduling) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+395.2800000000000296 513.3899999999998727 74. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+400.2800000000000296 501.92999999999995 Td
+(In-app) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+469.2800000000000296 513.3899999999998727 84. -27.4799999999999969 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+474.2800000000000296 501.92999999999995 Td
+(Booking) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.97 0.93 0.93 rg
+42. 471.9099999999999113 511.2799999999999727 -62. re
+f
+0.62 0.17 0.2 rg
+42. 471.9099999999999113 3. -62. re
+f
+BT
+/F1 8.6 Tf
+9.8899999999999988 TL
+0.275 0.345 0.357 rg
+56. 458.9099999999999113 Td
+(DO NOT CHASE A MISSING IN-APP NOTIFICATION BEFORE CHECKING THIS. Recipients are resolved from the company's) Tj
+T* (linked portal users. If a company has none, notify\(\) logs "0 recipients - skipped" and stores nothing - the notification simply never) Tj
+T* (appears, with no error. SMS and email still go out, because they address the company's phone and email directly. On a fresh) Tj
+T* (environment this is the usual explanation.) Tj
+ET
+BT
+/F5 9 Tf
+10.3499999999999996 TL
+0.043 0.333 0.388 rg
+42. 387.9099999999999113 Td
+(11) Tj
+ET
+BT
+/F9 17 Tf
+19.5499999999999972 TL
+0.063 0.102 0.11 rg
+72. 386.9099999999999113 Td
+(Known open issues) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+42. 366.9099999999999113 m
+553.2799999999999727 366.9099999999999113 l
+S
+BT
+/F1 9 Tf
+10.3499999999999996 TL
+0.275 0.345 0.357 rg
+42. 352.9099999999999113 Td
+(Do not raise duplicates for these. Each is already identified.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+42. 330.9099999999999113 78. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+47. 319.9599999999999227 Td
+(Status) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+120. 330.9099999999999113 190. -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+125. 319.9599999999999227 Td
+(Issue) Tj
+ET
+0.93 0.95 0.95 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.93 0.95 0.95 rg
+310. 330.9099999999999113 243.2799999999999727 -18.0499999999999972 re
+B
+BT
+/F2 7 Tf
+8.0499999999999989 TL
+0.427 0.498 0.51 rg
+315. 319.9599999999999227 Td
+(Impact on testing) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.97 0.93 0.93 rg
+0.8 0.85 0.85 RG
+0.4 w
+0.97 0.93 0.93 rg
+42. 312.8599999999999 78. -36.2199999999999989 re
+B
+BT
+/F2 7.6 Tf
+8.7399999999999984 TL
+0.616 0.169 0.196 rg
+47. 301.3999999999998636 Td
+(OPEN) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+120. 312.8599999999999 190. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+125. 301.3999999999998636 Td
+(Export receive returns 500 on the deployed) Tj
+T* (environment \(POST) Tj
+T* (/warehouse-inventory/receive-bulk\).) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+310. 312.8599999999999 243.2799999999999727 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+315. 301.3999999999998636 Td
+(Blocks flows E1 and E2 at step .2. Awaiting the response body /) Tj
+T* (server log to diagnose. Likely schema drift, not the SQL.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 276.6399999999998727 78. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 265.1799999999998363 Td
+(FIX PENDING) Tj
+T* (DEPLOY) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+120. 276.6399999999998727 190. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+125. 265.1799999999998363 Td
+(Export receive was extremely slow. The owner SMS) Tj
+T* (was awaited inside the DB transaction, and the SMS) Tj
+T* (client had no HTTP timeout.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+310. 276.6399999999998727 243.2799999999999727 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+315. 265.1799999999998363 Td
+(Fixed on branch: SMS now has a timeout, and notifications are sent) Tj
+T* (after commit. Re-test receive latency once deployed.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 240.4199999999998454 78. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 228.959999999999809 Td
+(DATA) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+120. 240.4199999999998454 190. -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+125. 228.959999999999809 Td
+(Drivers table has no unique constraints on licence) Tj
+T* (number, email, or phone, despite the entity declaring) Tj
+T* (them unique.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+310. 240.4199999999998454 243.2799999999999727 -36.2199999999999989 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+315. 228.959999999999809 Td
+(Duplicate drivers can be created. Do not rely on uniqueness in test) Tj
+T* (assertions.) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+42. 204.1999999999998181 78. -53.6999999999999886 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.063 0.102 0.11 rg
+47. 192.7399999999997817 Td
+(BEHAVIOUR) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+120. 204.1999999999998181 190. -53.6999999999999886 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+125. 192.7399999999997817 Td
+(Handover generated before truck arrival. If an) Tj
+T* (operator triggers a signature request from the Exit) Tj
+T* (Paper button while a truck is assigned but not arrived,) Tj
+T* (Approve delivery refuses with "truck arrival must be) Tj
+T* (recorded".) Tj
+ET
+1. g
+0.8 0.85 0.85 RG
+0.4 w
+1. g
+310. 204.1999999999998181 243.2799999999999727 -53.6999999999999886 re
+B
+BT
+/F1 7.6 Tf
+8.7399999999999984 TL
+0.275 0.345 0.357 rg
+315. 192.7399999999997817 Td
+(Only reachable off the normal path. Follow flow I1 in order and it will) Tj
+T* (not occur.) Tj
+ET
+0.06 0.1 0.11 RG
+0.9 w
+0.78 G
+0. w
+0.06 0.1 0.11 RG
+0.9 w
+0.06 0.1 0.11 RG
+0.9 w
+0.8 0.85 0.85 RG
+0.5 w
+42. 36. m
+553.2799999999999727 36. l
+S
+BT
+/F9 8 Tf
+9.1999999999999993 TL
+0.427 0.498 0.51 rg
+42. 22. Td
+(EDR Freight - QA Test Plan) Tj
+ET
+BT
+/F5 7.5 Tf
+8.625 TL
+0.427 0.498 0.51 rg
+530.7799999999999727 22. Td
+(7 / 7) Tj
+ET
+endstream
+endobj
+1 0 obj
+<</Type /Pages
+/Kids [3 0 R 5 0 R 7 0 R 9 0 R 11 0 R 13 0 R 15 0 R ]
+/Count 7
+>>
+endobj
+17 0 obj
+<<
+/Type /Font
+/BaseFont /Helvetica
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+18 0 obj
+<<
+/Type /Font
+/BaseFont /Helvetica-Bold
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+19 0 obj
+<<
+/Type /Font
+/BaseFont /Helvetica-Oblique
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+20 0 obj
+<<
+/Type /Font
+/BaseFont /Helvetica-BoldOblique
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+21 0 obj
+<<
+/Type /Font
+/BaseFont /Courier
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+22 0 obj
+<<
+/Type /Font
+/BaseFont /Courier-Bold
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+23 0 obj
+<<
+/Type /Font
+/BaseFont /Courier-Oblique
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+24 0 obj
+<<
+/Type /Font
+/BaseFont /Courier-BoldOblique
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+25 0 obj
+<<
+/Type /Font
+/BaseFont /Times-Roman
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+26 0 obj
+<<
+/Type /Font
+/BaseFont /Times-Bold
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+27 0 obj
+<<
+/Type /Font
+/BaseFont /Times-Italic
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+28 0 obj
+<<
+/Type /Font
+/BaseFont /Times-BoldItalic
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+29 0 obj
+<<
+/Type /Font
+/BaseFont /ZapfDingbats
+/Subtype /Type1
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+30 0 obj
+<<
+/Type /Font
+/BaseFont /Symbol
+/Subtype /Type1
+/FirstChar 32
+/LastChar 255
+>>
+endobj
+2 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/F1 17 0 R
+/F2 18 0 R
+/F3 19 0 R
+/F4 20 0 R
+/F5 21 0 R
+/F6 22 0 R
+/F7 23 0 R
+/F8 24 0 R
+/F9 25 0 R
+/F10 26 0 R
+/F11 27 0 R
+/F12 28 0 R
+/F13 29 0 R
+/F14 30 0 R
+>>
+/XObject <<
+>>
+>>
+endobj
+31 0 obj
+<<
+/Producer (jsPDF 4.2.1)
+/CreationDate (D:20260709090321-00'00')
+>>
+endobj
+32 0 obj
+<<
+/Type /Catalog
+/Pages 1 0 R
+/OpenAction [3 0 R /FitH null]
+/PageLayout /OneColumn
+>>
+endobj
+xref
+0 33
+0000000000 65535 f 
+0000115749 00000 n 
+0000117610 00000 n 
+0000000015 00000 n 
+0000000152 00000 n 
+0000010120 00000 n 
+0000010257 00000 n 
+0000026401 00000 n 
+0000026538 00000 n 
+0000045234 00000 n 
+0000045372 00000 n 
+0000065489 00000 n 
+0000065628 00000 n 
+0000079123 00000 n 
+0000079262 00000 n 
+0000100531 00000 n 
+0000100670 00000 n 
+0000115845 00000 n 
+0000115971 00000 n 
+0000116102 00000 n 
+0000116236 00000 n 
+0000116374 00000 n 
+0000116498 00000 n 
+0000116627 00000 n 
+0000116759 00000 n 
+0000116895 00000 n 
+0000117023 00000 n 
+0000117150 00000 n 
+0000117279 00000 n 
+0000117412 00000 n 
+0000117514 00000 n 
+0000117863 00000 n 
+0000117949 00000 n 
+trailer
+<<
+/Size 33
+/Root 32 0 R
+/Info 31 0 R
+/ID [ <3BEB58B86E90D0C327872D7AEEEBDAFB> <3BEB58B86E90D0C327872D7AEEEBDAFB> ]
+>>
+startxref
+118053
+%%EOF
\ No newline at end of file
diff --git a/packages/types/src/freight/contracts.ts b/packages/types/src/freight/contracts.ts
index c6b97fab1..49af6b736 100644
--- a/packages/types/src/freight/contracts.ts
+++ b/packages/types/src/freight/contracts.ts
@@ -519,6 +519,8 @@ export interface IContract extends BaseEntity {
 
   companyId?: string | null;
   companyProfileId?: string | null;
+  /** Loaded company relation (list + detail responses include it). */
+  company?: BookingRequestCompany | null;
   isGovernment: boolean;
   governmentInstitution?: string | null;
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 069d12c32..9feac7c1d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -298,6 +298,9 @@ importers:
       tinymce:
         specifier: ^8.6.0
         version: 8.6.0
+      xlsx:
+        specifier: ^0.18.5
+        version: 0.18.5
       zustand:
         specifier: ^5.0.0
         version: 5.0.14(@types/react@18.3.31)(immer@11.1.8)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6))
@@ -419,6 +422,9 @@ importers:
       tailwind-merge:
         specifier: ^3.6.0
         version: 3.6.0
+      xlsx:
+        specifier: ^0.18.5
+        version: 0.18.5
       zod:
         specifier: ^4.4.3
         version: 4.4.3