diff --git a/.github/scripts/scan.js b/.github/scripts/scan.js
index 7b1924b3f..2526dff2b 100644
--- a/.github/scripts/scan.js
+++ b/.github/scripts/scan.js
@@ -35,23 +35,50 @@ const CONFIG = {
     "tailwind.config.js",
     "tailwind.config.ts",
     "tailwind.config.cjs",
+    "tailwind.config.mjs",
     "tailwind.js",
     "postcss.config.js",
+    "postcss.config.ts",
     "postcss.config.mjs",
     "postcss.config.cjs",
     "babel.config.js",
+    "babel.config.ts",
+    "babel.config.mjs",
     "babel.config.cjs",
     "next.config.js",
+    "next.config.ts",
     "next.config.mjs",
     "next.config.cjs",
+    "eslint.config.js",
+    "eslint.config.ts",
+    "eslint.config.mjs",
+    "eslint.config.cjs",
     "astro.config.mjs",
     "astro.config.js",
     "vite.config.js",
     "vite.config.ts",
+    "vite.config.mjs",
+    "vite.config.cjs",
     "webpack.config.js",
     "webpack.mix.js",
+    "svelte.config.js",
+    "nuxt.config.ts",
   ],
 
+  // Font files — the campaign appends JS payloads to web fonts, which are
+  // never executed directly but are fetched by the build and used as a
+  // staging blob. Binary formats, so they are read as latin1.
+  fontExtensions: [".woff", ".woff2", ".ttf", ".otf", ".eot"],
+
+  // Minimum number of \uXXXX escape sequences in one file before it is
+  // treated as deliberately obfuscated. Legitimate source files use a
+  // handful at most; PolinRider samples carry 400–600.
+  maxLegitUnicodeEscapes: 20,
+
+  // Any single line longer than this inside a config file means code was
+  // appended past the real export block.
+  maxLegitConfigLineLength: 1000,
+
   // Files intentionally containing malware indicators for scanner logic/tests.
   // These filenames are skipped before malware rules are evaluated.
   ignoredFilenames: ["scan.js"],
@@ -187,14 +214,166 @@ const RULES = [
     },
   },
 
+  {
+    id: "POLINRIDER-018",
+    severity: "CRITICAL",
+    description:
+      "Unicode-escape string obfuscation — the payload writes plain ASCII literals such as require and https as \\u0068\\u0074\\u0074\\u0070 so that grep, code review, and GitHub diff search cannot see the API calls it makes",
+    test(content) {
+      // Only printable-ASCII escapes count. Minified vendor bundles legitimately
+      // carry hundreds of \uXXXX escapes, but those decode to emoji, diacritics
+      // and CJK ranges — escaping ASCII that could have been written literally
+      // has no purpose other than hiding it from a reader.
+      const asciiEscapes = (content.match(/\\u00[0-7][0-9a-fA-F]/g) || []).filter(
+        (e) => {
+          const code = parseInt(e.slice(2), 16);
+          return code >= 0x20 && code <= 0x7e;
+        },
+      );
+      return asciiEscapes.length >= CONFIG.maxLegitUnicodeEscapes
+        ? [
+            `${asciiEscapes.length} printable-ASCII \\uXXXX escapes (threshold: ${CONFIG.maxLegitUnicodeEscapes})`,
+          ]
+        : [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-019",
+    severity: "CRITICAL",
+    description:
+      "Ethereum dead-drop C2 resolver — the attacker wallet's latest transaction encodes the C2 IP addresses in the 'to' field, so the C2 can be rotated without touching the implant",
+    test(_content, _filePath, _lines, decoded) {
+      const iocs = [
+        "0xa322e5f3d311d3080e6f0121063e9adc2490ef1a",
+        "eth.blockscout.com",
+        "eth_getBlockByNumber",
+        "eth_getTransactionCount",
+        "eth_blockNumber",
+        "ethereum-rpc.publicnode.com",
+        "eth-mainnet.public.blastapi.io",
+        "1rpc.io/eth",
+        "eth.drpc.org",
+      ];
+      const hay = decoded.toLowerCase();
+      return iocs.filter((i) => hay.includes(i));
+    },
+  },
+
+  {
+    id: "POLINRIDER-020",
+    severity: "CRITICAL",
+    description:
+      "Remote code execution stager — fetches a payload over HTTP, XOR-decrypts it, eval()s it in-process and re-launches it as a detached hidden node -e child process that survives the build exiting",
+    test(_content, _filePath, _lines, decoded) {
+      const hits = [];
+      if (/spawn\s*\(\s*["']node["']\s*,\s*\[\s*["']-e["']/.test(decoded))
+        hits.push('spawn("node", ["-e", <remote payload>])');
+      if (/detached\s*:\s*(!0|true)/.test(decoded))
+        hits.push("detached child process");
+      if (/stdio\s*:\s*["']ignore["']/.test(decoded))
+        hits.push('stdio:"ignore" (output suppressed)');
+      if (/\beval\s*\(\s*\w+\s*\+/.test(decoded))
+        hits.push("eval() of concatenated remote string");
+      if (/x-payload-b64/i.test(decoded))
+        hits.push("x-payload-b64 C2 response header");
+      // Only report when this is a genuine stager, not an isolated keyword.
+      return hits.length >= 2 ? hits : [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-021",
+    severity: "CRITICAL",
+    description:
+      "Campaign marker + Node internals capture via dot notation — the implant stores its victim/campaign ID and re-exposes require/module on globalThis so later stages can load native modules from inside an ES module",
+    test(_content, _filePath, _lines, decoded) {
+      const hits = [];
+      const marker = decoded.match(
+        /global\s*\.\s*[a-zA-Z_$]\w*\s*=\s*["']([A-Z]{0,2}\d[\d-]{3,})["']/,
+      );
+      if (marker) hits.push(`campaign marker: "${marker[1]}"`);
+      if (/global\s*\.\s*\w+\s*=\s*require\b/.test(decoded))
+        hits.push("global.<x> = require");
+      if (/global\s*\.\s*\w+\s*=\s*module\b/.test(decoded))
+        hits.push("global.<x> = module");
+      return hits;
+    },
+  },
+
+  {
+    id: "POLINRIDER-022",
+    severity: "CRITICAL",
+    description:
+      "Web font file carrying an executable payload — .woff/.woff2 files are treated as opaque binary assets by reviewers and linters, so the campaign uses them to smuggle JavaScript past code review",
+    test(content, filePath) {
+      const ext = path.extname(filePath).toLowerCase();
+      if (!CONFIG.fontExtensions.includes(ext)) return [];
+
+      const hits = [];
+      const magic = content.slice(0, 4);
+      const expected = { ".woff": "wOFF", ".woff2": "wOF2", ".otf": "OTTO" };
+      if (expected[ext] && magic !== expected[ext]) {
+        hits.push(
+          `bad magic bytes: expected "${expected[ext]}", got "${magic.replace(/[^\x20-\x7e]/g, ".")}"`,
+        );
+      }
+      const codeMarkers = [
+        "require(",
+        "eval(",
+        "child_process",
+        "global.",
+        "createRequire",
+        "process.env",
+      ];
+      const found = codeMarkers.filter((m) => content.includes(m));
+      if (found.length > 0) {
+        hits.push(`embedded JS markers: ${found.join(", ")}`);
+      }
+      return hits;
+    },
+  },
+
+  {
+    id: "POLINRIDER-023",
+    severity: "CRITICAL",
+    description:
+      ".vscode/tasks.json configured to auto-execute on folder open — gives the campaign code execution the moment a developer opens the repo in VS Code, before any build or install command is run",
+    test(content, filePath) {
+      if (!/\.vscode[\\/]tasks\.json$/.test(filePath.replace(/\\/g, "/")))
+        return [];
+      const hits = [];
+      if (/"runOn"\s*:\s*"folderOpen"/.test(content))
+        hits.push('runOn: "folderOpen" (executes without user action)');
+      const cmd = content.match(/"command"\s*:\s*"([^"]{0,120})"/);
+      if (cmd && /node|curl|wget|powershell|bash|-e\b|eval/i.test(cmd[1]))
+        hits.push(`command: "${cmd[1]}"`);
+      return hits.length >= 1 ? hits : [];
+    },
+  },
+
+  {
+    id: "POLINRIDER-024",
+    severity: "HIGH",
+    description:
+      ".gitignore lists this campaign's persistence artifacts — the implant appends these entries so its own dropped files never appear in git status and the developer never sees them",
+    test(content, filePath) {
+      if (path.basename(filePath) !== ".gitignore") return [];
+      const lines = content.split("\n").map((l) => l.trim());
+      return CONFIG.persistenceArtifacts.filter((a) => lines.includes(a)).map(
+        (a) => `.gitignore hides "${a}"`,
+      );
+    },
+  },
+
   // ── Tier 2: Behavioral / structural indicators ─────────────────────────────
 
   {
     id: "POLINRIDER-009",
     severity: "HIGH",
     description:
-      "Blockchain RPC infrastructure contact — campaign uses TRON, Aptos, and BSC as dead-drop C2 resolvers",
-    test(content) {
+      "Blockchain RPC infrastructure contact — campaign uses TRON, Aptos, BSC and Ethereum as dead-drop C2 resolvers",
+    test(_content, _filePath, _lines, decoded) {
       const endpoints = [
         "trongrid.io",
         "aptoslabs.com",
@@ -202,7 +381,7 @@ const RULES = [
         "bsc-rpc.publicnode.com",
         "eth_getTransactionByHash",
       ];
-      return endpoints.filter((e) => content.includes(e));
+      return endpoints.filter((e) => decoded.includes(e));
     },
   },
 
@@ -210,11 +389,10 @@ const RULES = [
     id: "POLINRIDER-010",
     severity: "HIGH",
     description:
-      "Hidden process spawn with windowsHide:true — used by InvisibleFerret / BeaverTail stager to launch detached Node.js child processes invisibly",
-    test(content) {
-      return /windowsHide\s*:\s*true/.test(content)
-        ? ["windowsHide:true found"]
-        : [];
+      "Hidden process spawn with windowsHide — used by InvisibleFerret / BeaverTail stager to launch detached Node.js child processes invisibly. Matches both true and its minified form !0",
+    test(_content, _filePath, _lines, decoded) {
+      const m = decoded.match(/windowsHide\s*:\s*(true|!0)/);
+      return m ? [`windowsHide:${m[1]} found`] : [];
     },
   },
 
@@ -237,7 +415,10 @@ const RULES = [
     severity: "HIGH",
     description:
       "Payload hidden after large horizontal whitespace (>100 spaces on one line) — evasion technique to hide code off-screen in editors and GitHub diff views",
-    test(content, _filePath, lines) {
+    test(_content, filePath, lines) {
+      // Binary assets contain long runs of 0x20 as padding — not an indicator.
+      if (CONFIG.fontExtensions.includes(path.extname(filePath).toLowerCase()))
+        return [];
       const hits = [];
       lines.forEach((line, i) => {
         const spaceRun = line.match(/\s{100,}/);
@@ -269,6 +450,27 @@ const RULES = [
     },
   },
 
+  {
+    id: "POLINRIDER-025",
+    severity: "HIGH",
+    description:
+      "Minified code appended past the end of a config file — real config files are hand-written and line-wrapped; a single multi-thousand-character line means a payload was concatenated onto the original file",
+    test(_content, filePath, lines) {
+      const base = path.basename(filePath).toLowerCase();
+      if (!CONFIG.targetedFilenames.some((f) => f.toLowerCase() === base))
+        return [];
+      const hits = [];
+      lines.forEach((line, i) => {
+        if (line.length > CONFIG.maxLegitConfigLineLength) {
+          hits.push(
+            `line ${i + 1}: ${line.length} chars (threshold: ${CONFIG.maxLegitConfigLineLength})`,
+          );
+        }
+      });
+      return hits;
+    },
+  },
+
   {
     id: "POLINRIDER-014",
     severity: "HIGH",
@@ -330,25 +532,58 @@ const RULES = [
 
 // ─── Scanner Engine ────────────────────────────────────────────────────────────
 
+/**
+ * Resolve \uXXXX and \xXX escapes so string-matching rules see the real API
+ * calls. The campaign writes every literal as escapes specifically to defeat
+ * grep, so rules that match on plain text must run against this form.
+ * The decoded text is appended to the original rather than replacing it, so a
+ * rule can still match either representation with one pass.
+ */
+function deobfuscate(content) {
+  if (!/\\[ux]/.test(content)) return content;
+  const decoded = content
+    .replace(/\\u\{([0-9a-fA-F]{1,6})\}/g, (m, h) => {
+      try {
+        return String.fromCodePoint(parseInt(h, 16));
+      } catch {
+        return m;
+      }
+    })
+    .replace(/\\u([0-9a-fA-F]{4})/g, (_m, h) =>
+      String.fromCharCode(parseInt(h, 16)),
+    )
+    .replace(/\\x([0-9a-fA-F]{2})/g, (_m, h) =>
+      String.fromCharCode(parseInt(h, 16)),
+    );
+  return content + "\n/* --- deobfuscated --- */\n" + decoded;
+}
+
 function scanFile(filePath) {
   if (shouldIgnoreFile(filePath)) {
     return { filePath, findings: [], skipped: true };
   }
 
+  // Fonts are binary. latin1 maps bytes 1:1 to chars, so magic-byte checks and
+  // ASCII payload searches both work without mangling the content.
+  const isBinary = CONFIG.fontExtensions.includes(
+    path.extname(filePath).toLowerCase(),
+  );
+
   let content;
   try {
-    content = fs.readFileSync(filePath, "utf8");
+    content = fs.readFileSync(filePath, isBinary ? "latin1" : "utf8");
   } catch (err) {
     return { filePath, error: err.message, findings: [] };
   }
 
   const lines = content.split("\n");
+  const decoded = deobfuscate(content);
   const findings = [];
 
   for (const rule of RULES) {
     let matches;
     try {
-      matches = rule.test(content, filePath, lines);
+      matches = rule.test(content, filePath, lines, decoded);
     } catch (err) {
       matches = [`[rule error: ${err.message}]`];
     }
@@ -388,6 +623,7 @@ function walkDir(dir, results = []) {
     } else if (entry.isFile() && !shouldIgnoreFile(full)) {
       const ext = path.extname(entry.name).toLowerCase();
       const base = entry.name.toLowerCase();
+      const rel = full.replace(/\\/g, "/");
 
       // Scan all JS/TS config files + any file matching a targeted name
       const isTargetedName = CONFIG.targetedFilenames.some(
@@ -399,8 +635,18 @@ function walkDir(dir, results = []) {
       const isJsLike = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"].includes(
         ext,
       );
+      const isFont = CONFIG.fontExtensions.includes(ext);
+      const isGitignore = base === ".gitignore";
+      const isVsCodeTask = /\.vscode\/tasks\.json$/.test(rel);
 
-      if (isTargetedName || isPersistenceArtifact || isJsLike) {
+      if (
+        isTargetedName ||
+        isPersistenceArtifact ||
+        isJsLike ||
+        isFont ||
+        isGitignore ||
+        isVsCodeTask
+      ) {
         results.push(full);
       }
     }
@@ -532,10 +778,141 @@ function printReport(allResults, { json = false, outputFile = null } = {}) {
   return infected.length > 0;
 }
 
+// ─── Self-test ─────────────────────────────────────────────────────────────────
+
+/**
+ * Runs the rule set against synthetic samples. Guards the two properties that
+ * matter: the live payload is still caught, and minified vendor bundles that
+ * legitimately contain \uXXXX escapes are still not flagged.
+ * Run with: node scan.js --self-test
+ */
+function selfTest() {
+  const os = require("os");
+  const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "polinrider-selftest-"));
+  const write = (name, body) => {
+    const p = path.join(tmp, name);
+    fs.mkdirSync(path.dirname(p), { recursive: true });
+    fs.writeFileSync(p, body);
+    return p;
+  };
+
+  const esc = (s) =>
+    [...s].map((c) => "\\u" + c.charCodeAt(0).toString(16).padStart(4, "0")).join("");
+
+  const cases = [];
+
+  // 1. The live payload shape: ASCII-escaped strings + ETH dead drop + stager.
+  cases.push({
+    name: "infected postcss.config.js",
+    file: write(
+      "infected/postcss.config.js",
+      `export default { plugins: {} };` +
+        " ".repeat(300) +
+        `global.i="A8-4299";global.r=require;global.m=module;` +
+        `const http=require("${esc("http")}"),{spawn}=require("${esc("child_process")}");` +
+        `S="0xa322E5f3D311D3080e6f0121063e9aDC2490Ef1a".toLowerCase(),` +
+        `I="${esc("https://eth.blockscout.com/api")}";` +
+        `rc(t,"${esc("eth_getBlockByNumber")}");eval(r+o);` +
+        `spawn("node",["-e",r+o],{detached:!0,stdio:"${esc("ignore")}",windowsHide:!0});`,
+    ),
+    expect: true,
+  });
+
+  // 2. Clean config — must stay silent.
+  cases.push({
+    name: "clean postcss.config.js",
+    file: write(
+      "clean/postcss.config.js",
+      "export default {\n  plugins: {\n    tailwindcss: {},\n    autoprefixer: {},\n  },\n};\n",
+    ),
+    expect: false,
+  });
+
+  // 3. Minified vendor bundle with many non-ASCII escapes — must stay silent.
+  cases.push({
+    name: "minified vendor bundle",
+    file: write(
+      "vendor/emoji.min.js",
+      "var e=[" +
+        Array.from({ length: 400 }, (_, i) => `"\\ud83d\\ude${(i % 90) + 10}"`).join(",") +
+        "];",
+    ),
+    expect: false,
+  });
+
+  // 4. Font carrying an appended JS payload.
+  cases.push({
+    name: "trojanised .woff2",
+    file: write(
+      "fonts/bad.woff2",
+      "wOF2" + "".repeat(64) + 'require("child_process");global.x=1;eval(a+b);',
+    ),
+    expect: true,
+  });
+
+  // 5. Clean font — correct magic, no code markers.
+  cases.push({
+    name: "clean .woff2",
+    file: write("fonts/good.woff2", "wOF2" + "
".repeat(200)),
+    expect: false,
+  });
+
+  // 6. .gitignore hiding persistence artifacts.
+  cases.push({
+    name: ".gitignore with persistence artifacts",
+    file: write(
+      "ignore/.gitignore",
+      "node_modules/\ntemp_auto_push.bat\nbranch_structure.json\n",
+    ),
+    expect: true,
+  });
+
+  // 7. VS Code task auto-executing on folder open.
+  cases.push({
+    name: ".vscode/tasks.json auto-exec",
+    file: write(
+      "vscode/.vscode/tasks.json",
+      JSON.stringify({
+        version: "2.0.0",
+        tasks: [
+          {
+            label: "build",
+            command: "node -e require('http')",
+            runOptions: { runOn: "folderOpen" },
+          },
+        ],
+      }),
+    ),
+    expect: true,
+  });
+
+  let failed = 0;
+  for (const c of cases) {
+    const { findings } = scanFile(c.file);
+    const detected = findings.length > 0;
+    const ok = detected === c.expect;
+    if (!ok) failed++;
+    const ids = findings.map((f) => f.id).join(", ") || "none";
+    console.log(
+      `  ${ok ? `${ANSI.green}PASS${ANSI.reset}` : `${ANSI.red}FAIL${ANSI.reset}`}  ` +
+        `${c.name} — expected ${c.expect ? "detection" : "clean"}, got: ${ids}`,
+    );
+  }
+
+  fs.rmSync(tmp, { recursive: true, force: true });
+  console.log(
+    failed === 0
+      ? `\n${ANSI.green}${ANSI.bold}Self-test passed (${cases.length}/${cases.length}).${ANSI.reset}\n`
+      : `\n${ANSI.red}${ANSI.bold}Self-test FAILED: ${failed}/${cases.length} case(s).${ANSI.reset}\n`,
+  );
+  process.exit(failed === 0 ? 0 : 1);
+}
+
 // ─── CLI Entry Point ───────────────────────────────────────────────────────────
 
 function main() {
   const args = process.argv.slice(2);
+  if (args.includes("--self-test")) return selfTest();
   const jsonFlag = args.includes("--json");
   const outputFileIdx = args.indexOf("--output");
   const outputFile = outputFileIdx !== -1 ? args[outputFileIdx + 1] : null;
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bdb4c5ff5..b1c797dc6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,8 +10,16 @@ permissions:
   contents: read
 
 jobs:
+  # Supply-chain gate. Every other job depends on this, so a malware detection
+  # blocks the entire deploy before any build, migration or container starts.
+  malware-scan:
+    name: Malware gate
+    uses: ./.github/workflows/malware-scan.yml
+    secrets: inherit
+
   detect-changes:
     name: Detect changed services
+    needs: malware-scan
     runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', github.ref_name)) }}
     outputs:
       matrix: ${{ steps.filter.outputs.matrix }}
@@ -90,7 +98,7 @@ jobs:
 
   deploy:
     name: Deploy ${{ matrix.service }}
-    needs: detect-changes
+    needs: [malware-scan, detect-changes]
     if: ${{ needs.detect-changes.outputs.matrix != '[]' }}
     runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', github.ref_name)) }}
     strategy:
@@ -102,6 +110,7 @@ jobs:
       DEPLOY_USER: tria
       DOCKER_BUILDKIT: "1"
       COMPOSE_DOCKER_CLI_BUILD: "1"
+      ENV_MANAGER_TOKEN: ${{ secrets.ENV_MANAGER_TOKEN }}     
 
     steps:
       - name: Checkout
@@ -127,10 +136,10 @@ jobs:
               ;;
           esac
 
-      - name: Sync environment from server
+      - name: Sync environment from Env manager app
         run: |
           chmod +x scripts/deploy/*.sh
-          ./scripts/deploy/sync-env-from-server.sh "${{ matrix.service }}"
+          ./scripts/deploy/sync-env-from-env-manager.sh "${{ matrix.service }}"
 
       - name: Set compose project name
         run: |
diff --git a/.github/workflows/malware-scan.yml b/.github/workflows/malware-scan.yml
new file mode 100644
index 000000000..15ca4faeb
--- /dev/null
+++ b/.github/workflows/malware-scan.yml
@@ -0,0 +1,161 @@
+name: Malware Scan
+
+# Supply-chain malware gate for the PolinRider / Famous Chollima campaign.
+#
+# Runs standalone on every push and pull request, and is also called by
+# deploy.yml as a required first job — a detection fails this workflow, which
+# blocks every downstream deploy job from starting.
+
+on:
+  push:
+    # dev and staging are already gated through deploy.yml's required
+    # malware-scan job — no need to scan those pushes twice.
+    branches-ignore:
+      - dev
+      - staging
+  pull_request:
+  workflow_call:
+    secrets:
+      TELEGRAM_BOT_TOKEN:
+        required: false
+      TELEGRAM_CHAT_ID:
+        required: false
+
+permissions:
+  contents: read
+
+# A detection on a ref should not be raced by a newer run of the same ref.
+concurrency:
+  group: malware-scan-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  scan:
+    name: Scan for PolinRider malware
+    # Plain `self-hosted` — GitHub applies this label to every self-hosted
+    # runner automatically. The scan is host-agnostic, unlike the deploy jobs
+    # which pin to a branch-specific runner.
+    runs-on: [self-hosted, dev]
+    outputs:
+      infected: ${{ steps.scan.outputs.infected }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Verify scanner rules still work
+        # Fails if someone weakens a detection rule or introduces a false
+        # positive against minified vendor bundles.
+        run: node .github/scripts/scan.js --self-test
+
+      - name: Scan repository
+        id: scan
+        run: |
+          set -uo pipefail
+
+          # Actions runs this with `bash -e`, so the non-zero exit must be
+          # caught with `||` rather than read back from $? afterwards.
+          STATUS=0
+          node .github/scripts/scan.js --json --output malware-report.json . || STATUS=$?
+
+          if [ "$STATUS" -eq 0 ]; then
+            echo "infected=false" >> "$GITHUB_OUTPUT"
+            echo "No malware detected."
+            exit 0
+          fi
+
+          echo "infected=true" >> "$GITHUB_OUTPUT"
+
+          # Human-readable run for the log, so the failure is legible in the UI.
+          node .github/scripts/scan.js . || true
+          exit 1
+
+      - name: Build alert message
+        id: message
+        if: failure() && steps.scan.outputs.infected == 'true'
+        run: |
+          set -euo pipefail
+
+          FILES=$(jq -r '.results[].filePath' malware-report.json | head -20)
+          COUNT=$(jq -r '.infectedFiles' malware-report.json)
+          RULES=$(jq -r '[.results[].findings[] | select(.severity=="CRITICAL") | .id] | unique | join(", ")' malware-report.json)
+
+          {
+            echo "message<<EOF"
+            echo "🚨 POLINRIDER MALWARE DETECTED — DEPLOY BLOCKED"
+            echo ""
+            echo "Repo:   ${GITHUB_REPOSITORY}"
+            echo "Branch: ${GITHUB_REF_NAME}"
+            echo "Commit: ${GITHUB_SHA}"
+            echo "Author: ${GITHUB_ACTOR}"
+            echo ""
+            echo "Infected files (${COUNT}):"
+            echo "${FILES}"
+            echo ""
+            echo "Critical rules: ${RULES:-none}"
+            echo ""
+            echo "Run: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+            echo ""
+            echo "Do NOT run pnpm install or any build on this checkout."
+            echo "Rotate every secret this repo's CI can reach."
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Notify Telegram
+        if: failure() && steps.scan.outputs.infected == 'true'
+        env:
+          BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+          TEXT: ${{ steps.message.outputs.message }}
+        run: |
+          set -uo pipefail
+
+          if [ -z "${BOT_TOKEN:-}" ] || [ -z "${CHAT_ID:-}" ]; then
+            echo "::warning::TELEGRAM_BOT_TOKEN / TELEGRAM_CHAT_ID not set — skipping notification."
+            exit 0
+          fi
+
+          # No parse_mode: the payload contains characters Telegram's Markdown
+          # parser would reject, and a failed notification is worse than plain text.
+          HTTP=$(curl -sS -o /tmp/tg.out -w '%{http_code}' \
+            -X POST "https://api.telegram.org/bot${BOT_TOKEN}/sendMessage" \
+            --data-urlencode "chat_id=${CHAT_ID}" \
+            --data-urlencode "text=${TEXT}" \
+            --data-urlencode "disable_web_page_preview=true") || true
+
+          if [ "${HTTP:-000}" != "200" ]; then
+            echo "::warning::Telegram notification failed (HTTP ${HTTP:-000}): $(cat /tmp/tg.out 2>/dev/null | head -c 300)"
+          else
+            echo "Telegram alert sent."
+          fi
+          rm -f /tmp/tg.out
+
+      - name: Upload scan report
+        if: always() && hashFiles('malware-report.json') != ''
+        uses: actions/upload-artifact@v4
+        with:
+          name: malware-report-${{ github.run_id }}
+          path: malware-report.json
+          retention-days: 30
+
+      - name: Job summary
+        if: always()
+        run: |
+          set -uo pipefail
+          RESULT="${{ steps.scan.outputs.infected }}"
+
+          if [ "$RESULT" = "true" ]; then
+            {
+              echo "## 🚨 Malware detected — deployment blocked"
+              echo ""
+              echo '```'
+              jq -r '.results[] | .filePath, (.findings[] | "    [\(.id)] \(.severity) — \(.description)")' \
+                malware-report.json 2>/dev/null | head -100 || true
+              echo '```'
+            } >> "$GITHUB_STEP_SUMMARY"
+          elif [ "$RESULT" = "false" ]; then
+            echo "## ✅ No malware detected" >> "$GITHUB_STEP_SUMMARY"
+          else
+            # The scan step never produced a verdict — treat as inconclusive
+            # rather than clean, so a broken scanner is never read as a pass.
+            echo "## ⚠️ Scan did not complete — verdict unknown" >> "$GITHUB_STEP_SUMMARY"
+          fi
diff --git a/.gitignore b/.gitignore
index 977a34353..8fa8bca90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,13 @@ RUNNING_LOCALLY.md
 
 # Generated per-shard compose file for the integration suite (it.mjs).
 integration/.it-shards.yaml
-branch_structure.json
-temp_auto_push.bat
-temp_interactive_push.bat
+
+# private keys / certificates (EIMS INSA credentials and anything like them) — never commit
+*.key
+*.pem
+*.pem.txt
+*.p12
+*.pfx
+*.crt
+secrets/
+certs/
diff --git a/apps/edr-freight-api/.env.example b/apps/edr-freight-api/.env.example
index 16ee9cd57..2c636eee4 100644
--- a/apps/edr-freight-api/.env.example
+++ b/apps/edr-freight-api/.env.example
@@ -76,6 +76,12 @@ SEED_EDR_ORG=true
 SEED_FREIGHT_STAFF=true
 SEED_EXPORT_DJIBOUTI_INTERCHANGE_DEMO=false
 
+# Limits GET /staff/users to employees of this IAM organization (iam.organizations.key).
+# Unset = every employee. A key matching no organization returns no users.
+# Dev seed key: edr_freight
+# Production: ETHIO_DJIBOUTI_STANDARD_GAUGE_RAILWAY_SHARE_COMPANY_001
+FREIGHT_ORG_KEY=edr_freight
+
 # MinIO (used by @tria-plc/iamapi-common for file storage)
 MINIO_ENDPOINT=localhost
 MINIO_PORT=9000
@@ -122,3 +128,79 @@ FAYDA_SESSION_TTL_MINUTES=10
 EXPIRATION_TIME=15
 ALGORITHM=RS256
 EMAIL_QUEUE=email_queue
+
+# Shared secret for service-to-service calls (payment microservice <-> freight).
+# Required at boot; set ALLOW_UNAUTH_INTERNAL=true instead ONLY for local dev.
+SERVICE_AUTH_TOKEN=change-me
+
+# ── MoR EIMS e-invoicing (core.mor.gov.et) ─────────────────────────────────
+# Disabled by default; every EIMS call fails fast with EIMS_NOT_CONFIGURED until enabled.
+EIMS_ENABLED=false
+EIMS_BASE_URL=https://core.mor.gov.et
+EIMS_CLIENT_ID=
+EIMS_CLIENT_SECRET=
+EIMS_API_KEY=
+EIMS_TIN=
+# Source-system identity comes from the access token's systemNumber/systemType claims.
+# Setting these turns them into expected-value checks: a mismatch against the token fails
+# fast rather than one side silently winning. Leave empty to take the gateway's word.
+EIMS_SYSTEM_NUMBER=
+EIMS_SYSTEM_TYPE=
+# Absolute paths to the INSA-issued credentials. Keep them OUTSIDE the repo; the file
+# patterns are gitignored, but a path outside the working tree is safer still.
+# The certificate is transmitted as base64 of this file's exact bytes — do not convert it.
+EIMS_PRIVATE_KEY_PATH=
+EIMS_CERTIFICATE_PATH=
+# Optional tuning
+EIMS_HTTP_TIMEOUT_MS=30000
+EIMS_TOKEN_SKEW_SECONDS=45
+
+# ── EIMS invoice registration (required only to register invoices) ─────────
+# Seller identity: EDR's own legal details are not modelled anywhere in the DB.
+# Region and Wereda are MoR *codes* (e.g. 13 / 574), not names.
+EIMS_SELLER_LEGAL_NAME=
+EIMS_SELLER_VAT_NUMBER=
+EIMS_SELLER_PHONE=
+EIMS_SELLER_EMAIL=
+EIMS_SELLER_REGION=
+EIMS_SELLER_WEREDA=
+# Optional seller address parts; sent as null when unset.
+EIMS_SELLER_CITY=
+EIMS_SELLER_SUBCITY=
+EIMS_SELLER_HOUSE_NUMBER=
+EIMS_SELLER_LOCALITY=
+# Tax treatment — REQUIRES FINANCE SIGN-OFF. The application models no tax at all
+# (invoice.taxAmount is always 0), so nothing here is defaulted: registration fails
+# locally, naming the missing variables, until these are set.
+# Required, and deliberately unset: the choice is a tax position, not a default.
+# MoR's enum (from its own 400): TOT10 TOT2 VAT15 VWHT TWHT VATEX VATWH WHOP2 WTHOI VAT0 VWTH
+# Pending finance confirmation of VAT0 (zero-rated) vs VATEX (exempt).
+EIMS_TAX_CODE=
+EIMS_TAX_RATE_PERCENT=0
+EIMS_EXCISE_TAX_VALUE=0
+EIMS_INCOME_WITHHOLD_VALUE=0
+EIMS_TRANSACTION_WITHHOLD_VALUE=0
+# Document classification and payment presentation.
+EIMS_TRANSACTION_TYPE=B2B
+# Lowercase constant: MoR's oneOf branches require exactly 'goods' or 'service'.
+EIMS_NATURE_OF_SUPPLIES=service
+EIMS_PAYMENT_MODE=CASH
+EIMS_PAYMENT_TERM=IMMIDIATE
+EIMS_UNIT_DEFAULT=PCS
+# MoR numeric country code for the buyer; our companies store the country name.
+EIMS_BUYER_COUNTRY_CODE=
+# Buyer region name -> MoR numeric code. companies.region holds names; MoR wants ^[0-9]{1,3}$.
+# An unmapped region fails locally rather than being filed with a guess.
+EIMS_BUYER_REGION_CODES=Addis Ababa=13
+# Same mechanism for Wereda. MoR has never named a Wereda regex in an error (only Region's is
+# confirmed), so this is precautionary — but an unmapped name still fails locally, not filed as a guess.
+EIMS_BUYER_WEREDA_CODES=
+EIMS_CASHIER_NAME=
+EIMS_SALESPERSON_NAME=
+# Automatic filing of issued invoices (@Cron sweep, one invoice per tick).
+# Independent of EIMS_ENABLED on purpose: authentication can be live long before
+# filing is. Both must be true before anything is submitted automatically.
+EIMS_AUTO_SUBMIT=false
+EIMS_AUTO_SUBMIT_CRON=0 */5 * * * *
+# MoR rejects documents older than 3 days; the sweep will not attempt those.
+EIMS_AUTO_SUBMIT_MAX_AGE_DAYS=3
diff --git a/apps/edr-freight-api/package.json b/apps/edr-freight-api/package.json
index c4837c8a7..fb6a0bd31 100644
--- a/apps/edr-freight-api/package.json
+++ b/apps/edr-freight-api/package.json
@@ -37,7 +37,8 @@
     "iam:migration:revert": "pnpm run iam:typeorm:cli migration:revert",
     "iam:migration:show": "pnpm run iam:typeorm:cli migration:show",
     "migration:run": "nest build && node dist/scripts/migrate.js",
-    "script": "ts-node -r tsconfig-paths/register src/scripts/main.ts"
+    "script": "ts-node -r tsconfig-paths/register src/scripts/main.ts",
+    "eims:login": "ts-node -r tsconfig-paths/register src/scripts/eims-login.ts"
   },
   "dependencies": {
     "@edr/api-common": "workspace:*",
diff --git a/apps/edr-freight-api/src/app.module.ts b/apps/edr-freight-api/src/app.module.ts
index d41b77dce..c1b890719 100644
--- a/apps/edr-freight-api/src/app.module.ts
+++ b/apps/edr-freight-api/src/app.module.ts
@@ -23,6 +23,7 @@ import databaseConfig from "./config/database.config";
 import telebirrConfig from "./config/telebirr.config";
 import rabbitmqConfig from "./config/rabbitmq.config";
 import faydaConfig from "./config/fayda.config";
+import eimsConfig from "./config/eims.config";
 
 import { BookingsModule } from "./modules/bookings/bookings.module";
 import { ContractsModule } from "./modules/contracts/contracts.module";
@@ -49,11 +50,11 @@ import { FileUploadSettingsModule } from "./modules/file-upload-settings/file-up
 import { DropdownSettingsModule } from "./modules/dropdown-settings/dropdown-settings.module";
 import { ExchangeSettingsModule } from "./modules/exchange-settings/exchange-settings.module";
 import { ContractTemplatesModule } from "./modules/contract-templates/contract-templates.module";
+import { SupportContentModule } from "./modules/support-content/support-content.module";
 import { OtpModule } from "./modules/otp/otp.module";
 import { HealthModule } from "./modules/health/health.module";
 import { RuleEngineModule } from "./modules/rule-engine/rule-engine.module";
 import { BackofficeModule } from "./modules/backoffice/backoffice.module";
-import { DemoPermissionsModule } from "./modules/demo-permissions/demo-permissions.module";
 import { FreightAuthModule } from "./modules/auth/freight-auth.module";
 import {
   EDR_FREIGHT_APPLICATION,
@@ -67,6 +68,7 @@ import { FreightPositionsSeeder } from "./seed/freight-positions.seeder";
 import { PaymentModule } from "./modules/payment/payment.module";
 // import { PricingDataSeeder } from "./seed/pricing-data.seeder";
 import { FileUploadSettingsSeeder } from "./seed/file-upload-settings.seeder";
+import { SupportContentSeeder } from "./seed/support-content.seeder";
 // import { YardFacilitiesSeeder } from "./seed/yard-facilities.seeder";
 // import { IndodeFacilitySeeder } from "./seed/indode-facility.seeder";
 // import { Batch14TestDataSeeder } from "./seed/batch1-4-test-data.seeder";
@@ -77,13 +79,15 @@ import { FileUploadSettingsSeeder } from "./seed/file-upload-settings.seeder";
 // import { ExportDjiboutiInterchangeDemoSeeder } from "./seed/export-djibouti-interchange-demo.seeder";
 // import { MarshallingDemoTrainsSeeder } from "./seed/marshalling-demo-trains.seeder";
 import { FreightPermissionKeyMigrationSeeder } from "./seed/freight-permission-key-migration.seeder";
+import { FreightNotificationPermissionsSeeder } from "./seed/freight-notification-permissions.seeder";
 // import { DemoFreightDataSeeder } from "./seed/demo-freight-data.seeder";
 // import { GovCompaniesSeeder } from "./seed/gov-companies.seeder";
-import { ApprovedFirstLastMileDemoBookingsSeeder } from "./seed/approved-first-lastmile-demo-bookings.seeder";
-import { PaidImportExportMileDemoSeeder } from "./seed/paid-import-export-mile-demo.seeder";
+// import { ApprovedFirstLastMileDemoBookingsSeeder } from "./seed/approved-first-lastmile-demo-bookings.seeder";
+// import { PaidImportExportMileDemoSeeder } from "./seed/paid-import-export-mile-demo.seeder";
 //New Trains, Wagons, Container and Cargo management modules
 import { TrainsModule } from "./modules/trains/trains.module";
 import { VerifaydaModule } from "./modules/verifayda/verifayda.module";
+import { EimsModule } from "./modules/eims/eims.module";
 import { FleetHistoryModule } from "./modules/fleet-history/fleet-history.module";
 import { WagonsModule } from "./modules/wagons/wagons.module";
 import { ContainersModule } from "./modules/container-management/containers.module";
@@ -100,6 +104,7 @@ import { MaintenanceModule } from "./modules/maintenance/maintenance.module";
 import { ComplianceModule } from "./modules/compliance/compliance.module";
 import { IncidentsModule } from "./modules/incidents/incidents.module";
 import { ProcurementModule } from "./modules/procurement/procurement.module";
+import { FacilitiesModule } from "./modules/facilities/facilities.module";
 import { GpsTrackingModule } from "./modules/gps-tracking/gps-tracking.module";
 import { FirstMileModule } from "./modules/first-mile/first-mile.module";
 import { LastMileModule } from "./modules/last-mile/last-mile.module";
@@ -110,6 +115,7 @@ import { AiModule } from "./modules/ai/ai.module";
 import { AuditModule } from "./modules/audit/audit.module";
 import { LoggerMiddleware } from "./logger.middleware";
 import { LoginAudienceMiddleware } from "./modules/auth/login-audience.middleware";
+import { PositionTypePermissionsCache } from "./common/position-type-permissions.cache";
 
 if (!process.env.APPLICATION_NAME) {
   process.env.APPLICATION_NAME = "freight";
@@ -125,6 +131,7 @@ if (!process.env.APPLICATION_NAME) {
         telebirrConfig,
         rabbitmqConfig,
         faydaConfig,
+        eimsConfig,
       ],
     }),
     ScheduleModule.forRoot(),
@@ -215,11 +222,11 @@ if (!process.env.APPLICATION_NAME) {
     DropdownSettingsModule,
     ExchangeSettingsModule,
     ContractTemplatesModule,
+    SupportContentModule,
     OtpModule,
     HealthModule,
     RuleEngineModule,
     BackofficeModule,
-    DemoPermissionsModule,
     FreightAuthModule,
     PaymentModule,
     //New Modules
@@ -239,6 +246,7 @@ if (!process.env.APPLICATION_NAME) {
     ComplianceModule,
     IncidentsModule,
     ProcurementModule,
+    FacilitiesModule,
     GpsTrackingModule,
     FirstMileModule,
     LastMileModule,
@@ -246,6 +254,7 @@ if (!process.env.APPLICATION_NAME) {
     InterchangeDocumentsModule,
     ImportOperationsModule,
     VerifaydaModule,
+    EimsModule,
     FleetHistoryModule,
     AiModule,
     AuditModule,
@@ -254,8 +263,10 @@ if (!process.env.APPLICATION_NAME) {
     EdrOrgSeeder,
     FreightPositionsSeeder,
     FileUploadSettingsSeeder,
+    SupportContentSeeder,
     // YardFacilitiesSeeder,
     FreightPermissionKeyMigrationSeeder,
+    FreightNotificationPermissionsSeeder,
     // Disabled seeds — providers commented out (imports/injection/run too):
     // DemoUsersSeeder,
     // FreightStaffUsersSeeder,
@@ -270,9 +281,12 @@ if (!process.env.APPLICATION_NAME) {
     // WarehouseDemoSeeder,
     // ExportDjiboutiInterchangeDemoSeeder,
     // MarshallingDemoTrainsSeeder,
-    ApprovedFirstLastMileDemoBookingsSeeder,
-    PaidImportExportMileDemoSeeder,
+    // ApprovedFirstLastMileDemoBookingsSeeder,
+    // PaidImportExportMileDemoSeeder,
     LoginAudienceMiddleware,
+    // Feeds position-TYPE grants to the synchronous permission checks — without
+    // it, staff whose permissions live on their position type resolve to none.
+    PositionTypePermissionsCache,
   ],
 })
 export class AppModule implements OnApplicationBootstrap {
@@ -281,8 +295,10 @@ export class AppModule implements OnApplicationBootstrap {
     private readonly edrOrgSeeder: EdrOrgSeeder,
     private readonly freightPositionsSeeder: FreightPositionsSeeder,
     private readonly fileUploadSettingsSeeder: FileUploadSettingsSeeder,
+    private readonly supportContentSeeder: SupportContentSeeder,
     // private readonly yardFacilitiesSeeder: YardFacilitiesSeeder,
     private readonly freightPermissionKeyMigrationSeeder: FreightPermissionKeyMigrationSeeder,
+    private readonly freightNotificationPermissionsSeeder: FreightNotificationPermissionsSeeder,
     // Disabled seeds — injections commented out (imports/provider/run too):
     // private readonly demoUsersSeeder: DemoUsersSeeder,
     // private readonly freightStaffUsersSeeder: FreightStaffUsersSeeder,
@@ -324,10 +340,24 @@ export class AppModule implements OnApplicationBootstrap {
     await this.edrOrgSeeder.run();
     await this.iamBaselineSeeder.run();
     await this.freightPositionsSeeder.run();
+    //   freightNotificationPermissions → seeds the <module>:get_notification
+    //                                   keys and backfills them onto whoever
+    //                                   already holds each desk's anchor
+    //                                   permission. Runs LAST in this block so
+    //                                   it sees a freshly-seeded catalog and
+    //                                   freshly-seeded positions. Unlike the
+    //                                   seeders above it is NOT gated behind
+    //                                   SEED_EDR_ORG — without it every staff
+    //                                   notification resolves to no one.
+    await this.freightNotificationPermissionsSeeder.run();
 
     // File upload settings — keep enabled.
     await this.fileUploadSettingsSeeder.run();
 
+    // Portal help/FAQ/legal copy — keep enabled. Idempotent by emptiness, so
+    // it fills an empty table once and never touches admin edits afterwards.
+    await this.supportContentSeeder.run();
+
     // Flags which yards can load/unload cargo (Indode, Sebeta, Modjo, Adama,
     // Dire Dawa). Idempotent; creates no yards.
     // await this.yardFacilitiesSeeder.run();
diff --git a/apps/edr-freight-api/src/common/booking-guards.ts b/apps/edr-freight-api/src/common/booking-guards.ts
index 854594ffc..d1b5364c3 100644
--- a/apps/edr-freight-api/src/common/booking-guards.ts
+++ b/apps/edr-freight-api/src/common/booking-guards.ts
@@ -1,7 +1,11 @@
 import { applyDecorators, UseGuards } from '@nestjs/common';
 import { JwtGuard } from '@tria-plc/api-common/modules/auth/services/jwt.guard';
 
-import { FreightPermissionGuard } from './freight-permission.guard';
+import {
+  FreightPermissionGuard,
+  MixedAudienceGuard,
+  PortalCustomerGuard,
+} from './freight-permission.guard';
 import { FREIGHT_PERMS } from '../seed/freight-permissions.registry';
 
 export const BookingStaff = (permission: string | string[]) =>
@@ -18,8 +22,30 @@ export const BookingStaff = (permission: string | string[]) =>
  * Read-only reference data (yard dropdowns, search filters): any signed-in
  * staff. Menu/page visibility stays permission-gated in the frontend — this
  * only lets forms populate their lookups.
+ * Deprecated for new routes — it never checked the caller was staff. Prefer
+ * BookingStaff(<view key>) or MixedAudience(); kept for routes not yet swept.
  */
-export const StaffReference = () => applyDecorators(UseGuards(JwtGuard));
+export const StaffReference = () =>
+  applyDecorators(UseGuards(JwtGuard, FreightPermissionGuard([])));
+
+/** Portal routes: customer accounts only; ownership scoping stays in services. */
+export const PortalCustomer = () =>
+  applyDecorators(UseGuards(JwtGuard, PortalCustomerGuard));
+
+/**
+ * Routes both audiences call (sign, shared document reads, handover): staff
+ * need one of the given permissions, customers pass through to the service's
+ * ownership checks.
+ */
+export const MixedAudience = (permission: string | string[]) =>
+  applyDecorators(
+    UseGuards(
+      JwtGuard,
+      MixedAudienceGuard(
+        Array.isArray(permission) ? permission : [permission],
+      ),
+    ),
+  );
 
 export const BookingView = () => BookingStaff(FREIGHT_PERMS.bookings.view);
 
@@ -31,6 +57,18 @@ export const BookingView = () => BookingStaff(FREIGHT_PERMS.bookings.view);
 export const BookingDocReviewAlert = () =>
   BookingStaff(FREIGHT_PERMS.bookings.docReviewAlert);
 
+/** Staff wagon-cancellation history list (admin side). */
+export const WagonCancellationView = () =>
+  BookingStaff(FREIGHT_PERMS.bookings.wagonCancellationView);
+
+/** Staff void of a customer's pending (fee-unpaid) wagon cancellation. */
+export const WagonCancellationVoid = () =>
+  BookingStaff(FREIGHT_PERMS.bookings.wagonCancellationVoid);
+
+/** Staff rebook of a customer's wagon-cancellation credit on their behalf. */
+export const WagonCancellationRebook = () =>
+  BookingStaff(FREIGHT_PERMS.bookings.wagonCancellationRebook);
+
 export const TrainSchedulingView = () =>
   BookingStaff(FREIGHT_PERMS.trainScheduling.view);
 
@@ -57,9 +95,14 @@ export const TrainSchedulingRulesManage = () =>
  * wagons:delete, …). The legacy coarse fleet:view / fleet:manage keys remain
  * valid as a one-of fallback so existing role grants keep working.
  */
-export const FleetView = (granular?: string) =>
+export const FleetView = (granular?: string | string[]) =>
   BookingStaff(
-    granular ? [granular, FREIGHT_PERMS.fleet.view] : FREIGHT_PERMS.fleet.view,
+    granular
+      ? [
+          ...(Array.isArray(granular) ? granular : [granular]),
+          FREIGHT_PERMS.fleet.view,
+        ]
+      : FREIGHT_PERMS.fleet.view,
   );
 
 export const FleetManage = (granular?: string) =>
diff --git a/apps/edr-freight-api/src/common/export-received-gate.spec.ts b/apps/edr-freight-api/src/common/export-received-gate.spec.ts
index 6aaa24a26..62e7c758c 100644
--- a/apps/edr-freight-api/src/common/export-received-gate.spec.ts
+++ b/apps/edr-freight-api/src/common/export-received-gate.spec.ts
@@ -36,4 +36,27 @@ describe('assertExportReceivedWithGrn', () => {
       assertExportReceivedWithGrn(db([]), { id: 'b-1', tradeDirection: 'DOMESTIC' }),
     ).resolves.toBeUndefined();
   });
+
+  it('never blocks direct truck-to-train export — that cargo has no GRN by design', async () => {
+    const source = db([]);
+    await expect(
+      assertExportReceivedWithGrn(source, {
+        id: 'b-1',
+        tradeDirection: 'EXPORT',
+        exportHandoverMode: 'DIRECT_TO_TRAIN',
+      }),
+    ).resolves.toBeUndefined();
+    // Direct short-circuits before querying — there is no inventory to look for.
+    expect(source.query as jest.Mock).not.toHaveBeenCalled();
+  });
+
+  it('still gates a warehouse export booking', async () => {
+    await expect(
+      assertExportReceivedWithGrn(db([]), {
+        id: 'b-1',
+        tradeDirection: 'EXPORT',
+        exportHandoverMode: 'WAREHOUSE',
+      }),
+    ).rejects.toBeInstanceOf(BadRequestException);
+  });
 });
diff --git a/apps/edr-freight-api/src/common/export-received-gate.ts b/apps/edr-freight-api/src/common/export-received-gate.ts
index 0e1728800..5fd97480a 100644
--- a/apps/edr-freight-api/src/common/export-received-gate.ts
+++ b/apps/edr-freight-api/src/common/export-received-gate.ts
@@ -5,8 +5,15 @@ import type { DataSource, EntityManager } from 'typeorm';
 export interface ExportLoadGateBooking {
   id: string;
   tradeDirection?: string | null;
+  /** 'DIRECT_TO_TRAIN' skips the gate entirely; null/'WAREHOUSE' keeps it. */
+  exportHandoverMode?: string | null;
 }
 
+/** Direct truck-to-train: the cargo never sees a warehouse, so it never has a GRN. */
+export const DIRECT_TO_TRAIN = 'DIRECT_TO_TRAIN';
+/** Warehouse-then-train: the existing flow. Also what a null mode means. */
+export const WAREHOUSE = 'WAREHOUSE';
+
 /**
  * Export cargo may not be loaded onto its train until it has physically reached
  * the warehouse and been issued a GRN — whether it got there by first-mile or by
@@ -21,12 +28,18 @@ export interface ExportLoadGateBooking {
  * "Received with a GRN" = an inventory row that has reached the warehouse
  * (RECEIVED or any later stage) and carries a GRN, in the column or the notes
  * fallback older rows use.
+ *
+ * Export has a second, warehouse-free shape: the customer's truck loads straight
+ * onto the wagon. That cargo is never received and never GRN'd, so a booking
+ * marked DIRECT_TO_TRAIN is outside this gate by definition — its custody is
+ * attested by the carriage acceptance sheet instead.
  */
 export async function assertExportReceivedWithGrn(
   db: DataSource | EntityManager,
   booking: ExportLoadGateBooking,
 ): Promise<void> {
   if (booking.tradeDirection !== 'EXPORT') return;
+  if (booking.exportHandoverMode === DIRECT_TO_TRAIN) return;
 
   const [row] = await db.query(
     `SELECT 1
diff --git a/apps/edr-freight-api/src/common/freight-permission.guard.ts b/apps/edr-freight-api/src/common/freight-permission.guard.ts
index 68def6440..9cb002891 100644
--- a/apps/edr-freight-api/src/common/freight-permission.guard.ts
+++ b/apps/edr-freight-api/src/common/freight-permission.guard.ts
@@ -8,7 +8,48 @@ import {
 } from '@nestjs/common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
 
-import { hasFreightPermission } from './freight-permission.util';
+import { hasFreightPermission, isSuperAdmin } from './freight-permission.util';
+import { readTwinOf } from '../seed/freight-permissions.registry';
+
+// String literals on purpose (same reasoning as login-audience.middleware.ts):
+// the values are wire-format constants from iam.users.user_type, and importing
+// the vendored enum couples us to its package layout for no gain.
+const CUSTOMER_USER_TYPES = ['individual', 'external_organization'];
+
+const userTypeOf = (user: TCurrentUser): string | undefined =>
+  (user as { userType?: string }).userType;
+
+/** Staff routes are employee-only; a missing userType (stale session) also fails. */
+const isEmployee = (user: TCurrentUser): boolean =>
+  userTypeOf(user) === 'employee' || isSuperAdmin(user);
+
+const SAFE_METHODS = new Set(['GET', 'HEAD', 'OPTIONS']);
+
+/**
+ * Does the caller satisfy a required permission?
+ *
+ * Holding the key outright always passes. A required `<module>:view` is ALSO
+ * satisfied by the weaker `<module>:read` — the key that buys API reads
+ * without putting the module in the backoffice sidebar — but only on a safe
+ * HTTP method.
+ *
+ * The method restriction is load-bearing, not caution. Nest runs class AND
+ * method guards, so controllers list every route key on the class gate,
+ * `:view` among the write keys. Without this check a `:read` holder would
+ * clear that class gate and then reach any write route that has no method
+ * gate of its own. Keying on the HTTP verb closes that by construction rather
+ * than by an audit that goes stale the next time a route is added.
+ */
+const satisfiedBy = (
+  user: TCurrentUser,
+  required: string,
+  method: string,
+): boolean => {
+  if (hasFreightPermission(user, required)) return true;
+  if (!SAFE_METHODS.has(method)) return false;
+  const readTwin = readTwinOf(required);
+  return Boolean(readTwin && hasFreightPermission(user, readTwin));
+};
 
 export function FreightPermissionGuard(
   permissions: string[],
@@ -16,15 +57,20 @@ export function FreightPermissionGuard(
   @Injectable()
   class FreightPermissionsGuard implements CanActivate {
     canActivate(context: ExecutionContext): boolean {
-      const request = context.switchToHttp().getRequest<{ user?: TCurrentUser }>();
+      const request = context
+        .switchToHttp()
+        .getRequest<{ user?: TCurrentUser; method: string }>();
       const user = request.user;
 
-      if (!permissions?.length) return true;
       if (!user) {
         throw new UnauthorizedException('Authentication required');
       }
+      if (!isEmployee(user)) {
+        throw new ForbiddenException('Staff account required');
+      }
 
-      if (permissions.some((p) => hasFreightPermission(user, p))) {
+      if (!permissions?.length) return true;
+      if (permissions.some((p) => satisfiedBy(user, p, request.method))) {
         return true;
       }
 
@@ -36,3 +82,59 @@ export function FreightPermissionGuard(
 
   return FreightPermissionsGuard;
 }
+
+/** Portal routes: customer accounts only (individual / external organization). */
+@Injectable()
+export class PortalCustomerGuard implements CanActivate {
+  canActivate(context: ExecutionContext): boolean {
+    const request = context.switchToHttp().getRequest<{ user?: TCurrentUser }>();
+    const user = request.user;
+
+    if (!user) {
+      throw new UnauthorizedException('Authentication required');
+    }
+    if (!CUSTOMER_USER_TYPES.includes(userTypeOf(user) ?? '')) {
+      throw new ForbiddenException('Customer account required');
+    }
+    return true;
+  }
+}
+
+/**
+ * Routes both audiences legitimately call (contract sign, shared document
+ * reads, warehouse handover). Staff callers must hold one of the given
+ * permissions; customer callers pass here and are scoped by the service's
+ * ownership checks.
+ */
+export function MixedAudienceGuard(permissions: string[]): Type<CanActivate> {
+  @Injectable()
+  class MixedAudiencesGuard implements CanActivate {
+    canActivate(context: ExecutionContext): boolean {
+      const request = context
+        .switchToHttp()
+        .getRequest<{ user?: TCurrentUser; method: string }>();
+      const user = request.user;
+
+      if (!user) {
+        throw new UnauthorizedException('Authentication required');
+      }
+      if (CUSTOMER_USER_TYPES.includes(userTypeOf(user) ?? '')) {
+        return true;
+      }
+      if (!isEmployee(user)) {
+        throw new ForbiddenException('Unrecognized account type');
+      }
+      if (
+        !permissions?.length ||
+        permissions.some((p) => satisfiedBy(user, p, request.method))
+      ) {
+        return true;
+      }
+      throw new ForbiddenException(
+        `Missing permission. Required one of: ${permissions.join(', ')}`,
+      );
+    }
+  }
+
+  return MixedAudiencesGuard;
+}
diff --git a/apps/edr-freight-api/src/common/freight-permission.util.spec.ts b/apps/edr-freight-api/src/common/freight-permission.util.spec.ts
index d0d01535a..f3931f78a 100644
--- a/apps/edr-freight-api/src/common/freight-permission.util.spec.ts
+++ b/apps/edr-freight-api/src/common/freight-permission.util.spec.ts
@@ -1,6 +1,9 @@
 import {
   assertCanApproveContractStep,
   canEditContractStep,
+  collectPermissionKeys,
+  hasFreightPermission,
+  setPositionTypePermissionResolver,
 } from './freight-permission.util';
 import { FREIGHT_PERMS } from '../seed/freight-permissions.registry';
 
@@ -49,3 +52,72 @@ describe('canEditContractStep (strict per-step edit gate)', () => {
     );
   });
 });
+
+/**
+ * The GL lockout regression: positions created through the admin UI keep their
+ * grants on the position TYPE, and the JWT only ever snapshots DIRECT position
+ * permissions. Without the type resolver those staff resolved to zero
+ * permissions, so every gated route rejected them — which is what kept GL
+ * officers out of their own clearance detail pages.
+ */
+describe('collectPermissionKeys — position-type grants', () => {
+  const CLEARANCE = FREIGHT_PERMS.contracts.clearanceReview;
+
+  afterEach(() => {
+    setPositionTypePermissionResolver(() => []);
+  });
+
+  const glOfficer = {
+    roles: [],
+    permissions: [],
+    employee: {
+      position: {
+        permissions: [], // admin-created position carries NO direct grants
+        positionType: { key: 'commercial-global-logistics-(et)-officer' },
+      },
+    },
+  };
+
+  it('resolves permissions carried by the position type', () => {
+    setPositionTypePermissionResolver((key) =>
+      key === 'commercial-global-logistics-(et)-officer' ? [CLEARANCE] : [],
+    );
+
+    expect(collectPermissionKeys(glOfficer)).toContain(CLEARANCE);
+    expect(hasFreightPermission(glOfficer, CLEARANCE)).toBe(true);
+  });
+
+  it('handles the array-shaped employee payload too', () => {
+    setPositionTypePermissionResolver(() => [CLEARANCE]);
+
+    const arrayShaped = {
+      roles: [],
+      permissions: [],
+      employee: [
+        {
+          positions: [
+            { permissions: [], positionType: { key: 'djibouti-gl-officer' } },
+          ],
+        },
+      ],
+    };
+
+    expect(hasFreightPermission(arrayShaped, CLEARANCE)).toBe(true);
+  });
+
+  it('still rejects when neither the position nor its type grants it', () => {
+    setPositionTypePermissionResolver(() => []);
+
+    expect(hasFreightPermission(glOfficer, CLEARANCE)).toBe(false);
+  });
+
+  it('keeps direct position permissions working with no resolver installed', () => {
+    const direct = {
+      roles: [],
+      permissions: [],
+      employee: { position: { permissions: [{ key: CLEARANCE }] } },
+    };
+
+    expect(hasFreightPermission(direct, CLEARANCE)).toBe(true);
+  });
+});
diff --git a/apps/edr-freight-api/src/common/freight-permission.util.ts b/apps/edr-freight-api/src/common/freight-permission.util.ts
index 56c0e77c2..bc98a6df4 100644
--- a/apps/edr-freight-api/src/common/freight-permission.util.ts
+++ b/apps/edr-freight-api/src/common/freight-permission.util.ts
@@ -42,12 +42,41 @@ export function isFreightApprovalAdmin(user: MeLikeUser | null | undefined): boo
   return isSuperAdmin(user) || isOrganizationAdmin(user);
 }
 
-/** Flat permission keys from JWT / session user (roles + position permissions). */
+/**
+ * Permissions carried by a position TYPE rather than the position itself.
+ *
+ * The JWT snapshots only DIRECT position permissions, so type-level grants —
+ * which is where admin-created positions keep theirs — are absent from the
+ * token entirely. This resolver is installed at startup
+ * (see `PositionTypePermissionsCache`) so the synchronous permission checks
+ * below can still see them. Left as a no-op resolver until then, which
+ * degrades to the old position-only behaviour rather than throwing.
+ */
+let positionTypePermissionResolver: (positionTypeKey: string) => string[] = () =>
+  [];
+
+export function setPositionTypePermissionResolver(
+  resolver: (positionTypeKey: string) => string[],
+): void {
+  positionTypePermissionResolver = resolver;
+}
+
+/**
+ * Flat permission keys from JWT / session user: roles, position permissions,
+ * and the grants held by each position's TYPE.
+ */
 export function collectPermissionKeys(user: MeLikeUser | null | undefined): string[] {
   if (!user) return [];
 
   const keys = new Set<string>();
 
+  const addTypePermissions = (positionType: PositionTypeLike | null | undefined) => {
+    if (!positionType?.key) return;
+    for (const key of positionTypePermissionResolver(positionType.key)) {
+      keys.add(key);
+    }
+  };
+
   for (const p of user.permissions ?? []) {
     if (p.key) keys.add(p.key);
   }
@@ -63,6 +92,7 @@ export function collectPermissionKeys(user: MeLikeUser | null | undefined): stri
         for (const p of pos.permissions ?? []) {
           if (p.key) keys.add(p.key);
         }
+        addTypePermissions(pos.positionType);
       }
     }
     return [...keys];
@@ -71,6 +101,7 @@ export function collectPermissionKeys(user: MeLikeUser | null | undefined): stri
   for (const p of employee.position?.permissions ?? []) {
     if (p.key) keys.add(p.key);
   }
+  addTypePermissions(employee.position?.positionType);
   for (const delegated of employee.delegatedPositions ?? []) {
     for (const p of delegated.permissions ?? []) {
       if (p.key) keys.add(p.key);
diff --git a/apps/edr-freight-api/src/common/guards/service-auth.guard.ts b/apps/edr-freight-api/src/common/guards/service-auth.guard.ts
index 9165e54d5..2d2863dd5 100644
--- a/apps/edr-freight-api/src/common/guards/service-auth.guard.ts
+++ b/apps/edr-freight-api/src/common/guards/service-auth.guard.ts
@@ -20,8 +20,12 @@ export class ServiceAuthGuard implements CanActivate {
     private warned = false;
 
     constructor() {
-        if (!this.token && process.env.NODE_ENV === "production") {
-            throw new Error("SERVICE_AUTH_TOKEN must be set in production");
+        // Fail closed everywhere: a missing secret must never silently open the
+        // internal payment surface. Local dev can opt out explicitly.
+        if (!this.token && process.env.ALLOW_UNAUTH_INTERNAL !== "true") {
+            throw new Error(
+                "SERVICE_AUTH_TOKEN must be set (or ALLOW_UNAUTH_INTERNAL=true for local dev)",
+            );
         }
     }
 
@@ -29,7 +33,7 @@ export class ServiceAuthGuard implements CanActivate {
         if (!this.token) {
             if (!this.warned) {
                 this.logger.warn(
-                    "SERVICE_AUTH_TOKEN unset — internal endpoints are UNGUARDED (dev only)",
+                    "ALLOW_UNAUTH_INTERNAL=true — internal endpoints are UNGUARDED (dev only)",
                 );
                 this.warned = true;
             }
diff --git a/apps/edr-freight-api/src/common/last-mile-charge.util.spec.ts b/apps/edr-freight-api/src/common/last-mile-charge.util.spec.ts
index e2ff1bfd9..e60bf4f4e 100644
--- a/apps/edr-freight-api/src/common/last-mile-charge.util.spec.ts
+++ b/apps/edr-freight-api/src/common/last-mile-charge.util.spec.ts
@@ -85,6 +85,48 @@ describe('computeLastMileCharge', () => {
     expect(charge).toMatchObject({ mode: 'BULK', total: 60 * 26 * 25, currency: 'ETB' });
   });
 
+  it('picks the bulk rate whose distance band holds the km (half-open boundary)', () => {
+    const bulkNear = rate({ rateUnit: 'PER_TON_KM', rateValue: 30, minKm: 0, maxKm: 30 });
+    const bulkFar = rate({ rateUnit: 'PER_TON_KM', rateValue: 22, minKm: 30, maxKm: null });
+    const near = computeLastMileCharge({
+      freightType: 'BULK',
+      tons: 10,
+      km: 12,
+      containers: [],
+      liveRates: [bulkNear, bulkFar],
+    });
+    expect(near).toMatchObject({ mode: 'BULK', total: 10 * 12 * 30 });
+    const boundary = computeLastMileCharge({
+      freightType: 'BULK',
+      tons: 10,
+      km: 30,
+      containers: [],
+      liveRates: [bulkNear, bulkFar],
+    });
+    expect(boundary).toMatchObject({ total: 10 * 30 * 22 });
+  });
+
+  it('bulk falls back to the legacy bandless rate when no band holds the km, null when nothing covers it', () => {
+    const bulkNear = rate({ rateUnit: 'PER_TON_KM', rateValue: 30, minKm: 0, maxKm: 30 });
+    const fallback = computeLastMileCharge({
+      freightType: 'BULK',
+      tons: 10,
+      km: 50,
+      containers: [],
+      liveRates: [bulkNear, bulkRate], // bulkRate has no band
+    });
+    expect(fallback).toMatchObject({ total: 10 * 50 * 25 });
+    expect(
+      computeLastMileCharge({
+        freightType: 'BULK',
+        tons: 10,
+        km: 50,
+        containers: [],
+        liveRates: [bulkNear],
+      }),
+    ).toBeNull();
+  });
+
   it('returns null on mixed currencies, unknown km, and uncovered freight types', () => {
     const usd40 = rate({ ...band40a, currency: 'USD' });
     expect(
diff --git a/apps/edr-freight-api/src/common/last-mile-charge.util.ts b/apps/edr-freight-api/src/common/last-mile-charge.util.ts
index 706e21238..055e8e5f9 100644
--- a/apps/edr-freight-api/src/common/last-mile-charge.util.ts
+++ b/apps/edr-freight-api/src/common/last-mile-charge.util.ts
@@ -30,10 +30,12 @@ const round2 = (n: number): number => Math.round(n * 100) / 100;
 /**
  * Price a last-mile leg off the LIVE rate rules. Pure — pass the live rates in.
  *
- * BULK: one PER_TON_KM rate → price = tons × km × rate.
+ * BULK: the PER_TON_KM rate whose distance band holds the km (a legacy
+ * bandless row — NULL minKm — is the fallback and prices every distance) →
+ * price = tons × km × rate.
  * CONTAINER: per container size, the PER_KM rate whose distance band holds the
- * km (bands are half-open [minKm, maxKm), NULL maxKm = open-ended) → price =
- * km × rate × quantity, summed across sizes.
+ * km → price = km × rate × quantity, summed across sizes.
+ * Bands are half-open [minKm, maxKm), NULL maxKm = open-ended.
  *
  * Returns null whenever the rules don't fully cover the shipment (no rate, a
  * container size without a matching band, mixed currencies, km/tons unknown) —
@@ -56,7 +58,15 @@ export function computeLastMileCharge(input: {
 
   if (freightType === 'BULK') {
     if (!tons || tons <= 0) return null;
-    const rate = candidates.find((r) => r.rateUnit === 'PER_TON_KM');
+    const bulkRates = candidates.filter((r) => r.rateUnit === 'PER_TON_KM');
+    const rate =
+      bulkRates.find(
+        (r) =>
+          r.minKm !== null &&
+          r.minKm !== undefined &&
+          Number(r.minKm) <= km &&
+          (r.maxKm === null || r.maxKm === undefined || km < Number(r.maxKm)),
+      ) ?? bulkRates.find((r) => r.minKm === null || r.minKm === undefined);
     if (!rate) return null;
     const unitRate = Number(rate.rateValue);
     const amount = round2(tons * km * unitRate);
diff --git a/apps/edr-freight-api/src/common/position-type-permissions.cache.ts b/apps/edr-freight-api/src/common/position-type-permissions.cache.ts
new file mode 100644
index 000000000..2848ed0b2
--- /dev/null
+++ b/apps/edr-freight-api/src/common/position-type-permissions.cache.ts
@@ -0,0 +1,83 @@
+import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
+import { InjectDataSource } from '@nestjs/typeorm';
+import { DataSource } from 'typeorm';
+
+import { setPositionTypePermissionResolver } from './freight-permission.util';
+
+/**
+ * Permissions granted to a position TYPE (`iam.position_type_permissions`).
+ *
+ * A position type is the platform's notion of a role, and positions created
+ * through the admin UI carry their grants there rather than on the position
+ * itself. The JWT only ever snapshots DIRECT position permissions, so those
+ * grants are invisible to `collectPermissionKeys` — staff on such a position
+ * resolve to zero permissions and every permission-gated route rejects them.
+ *
+ * The permission checks (`hasFreightPermission`, `FreightPermissionGuard`) are
+ * synchronous and sit on the request path, so the mapping is held in memory and
+ * refreshed periodically rather than queried per request. The dataset is tiny
+ * (tens of types, a few hundred rows), so a full reload is cheaper than any
+ * incremental scheme.
+ */
+@Injectable()
+export class PositionTypePermissionsCache implements OnModuleInit {
+  private readonly logger = new Logger(PositionTypePermissionsCache.name);
+
+  /** position_type key → permission keys. Empty until the first load lands. */
+  private byPositionTypeKey = new Map<string, string[]>();
+
+  // ponytail: fixed 5-min refresh, no invalidation hook. A permission granted
+  // in the admin UI takes up to one interval to reach the guards. Wire the
+  // grant mutation to call `refresh()` if that lag ever matters.
+  private static readonly REFRESH_INTERVAL_MS = 5 * 60 * 1000;
+
+  constructor(@InjectDataSource() private readonly dataSource: DataSource) {}
+
+  async onModuleInit(): Promise<void> {
+    await this.refresh();
+    // Hand the lookup to the permission utils, whose checks are synchronous and
+    // therefore cannot query IAM themselves.
+    setPositionTypePermissionResolver((positionTypeKey) =>
+      this.get(positionTypeKey),
+    );
+    const timer = setInterval(() => {
+      void this.refresh();
+    }, PositionTypePermissionsCache.REFRESH_INTERVAL_MS);
+    // Never hold the process open for a cache refresh.
+    timer.unref?.();
+  }
+
+  /** Permission keys for a position-type key ([] when unknown/not loaded). */
+  get(positionTypeKey: string | undefined | null): string[] {
+    if (!positionTypeKey) return [];
+    return this.byPositionTypeKey.get(positionTypeKey) ?? [];
+  }
+
+  /** Reload the whole mapping. Failures keep the previous snapshot in place. */
+  async refresh(): Promise<void> {
+    try {
+      const rows: { position_type_key: string; permission_key: string }[] =
+        await this.dataSource.query(
+          `SELECT pt.key AS position_type_key, perm.key AS permission_key
+             FROM iam.position_type_permissions ptp
+             JOIN iam.position_types pt ON pt.id = ptp.position_type_id
+             JOIN iam.permissions perm ON perm.id = ptp.permission_id`,
+        );
+
+      const next = new Map<string, string[]>();
+      for (const row of rows) {
+        if (!row.position_type_key || !row.permission_key) continue;
+        const keys = next.get(row.position_type_key);
+        if (keys) keys.push(row.permission_key);
+        else next.set(row.position_type_key, [row.permission_key]);
+      }
+      this.byPositionTypeKey = next;
+    } catch (err) {
+      // iam schema unreachable — keep serving the previous snapshot rather than
+      // dropping every type-derived permission and locking staff out.
+      this.logger.warn(
+        `Position-type permission refresh failed: ${(err as Error).message}`,
+      );
+    }
+  }
+}
diff --git a/apps/edr-freight-api/src/config/database.config.ts b/apps/edr-freight-api/src/config/database.config.ts
index 5de529d15..af4a5b017 100644
--- a/apps/edr-freight-api/src/config/database.config.ts
+++ b/apps/edr-freight-api/src/config/database.config.ts
@@ -215,8 +215,11 @@ export function buildFreightMigrationDataSourceOptions(): DataSourceOptions {
   };
 }
 
-export default registerAs("database", (): TypeOrmModuleOptions => ({
-  ...buildDataSourceOptions(),
-  autoLoadEntities: true,
-  migrationsRun: false,
-}));
+export default registerAs(
+  "database",
+  (): TypeOrmModuleOptions => ({
+    ...buildDataSourceOptions(),
+    autoLoadEntities: true,
+    migrationsRun: false,
+  }),
+);
diff --git a/apps/edr-freight-api/src/config/eims.config.ts b/apps/edr-freight-api/src/config/eims.config.ts
new file mode 100644
index 000000000..a8a929ca5
--- /dev/null
+++ b/apps/edr-freight-api/src/config/eims.config.ts
@@ -0,0 +1,205 @@
+import { registerAs } from "@nestjs/config";
+
+/**
+ * Ethiopian MoR EIMS e-invoicing gateway.
+ *
+ * Disabled by default: with `EIMS_ENABLED=false` the config resolves to a stub and every EIMS
+ * service throws a clear error on use, so a deployment without credentials still boots.
+ *
+ * Secrets (client secret, API key) and the credential file paths live only here and are never
+ * logged — validation reports missing variable *names*, never their values.
+ */
+export interface EimsConfig {
+  enabled: boolean;
+  baseUrl: string;
+  clientId: string;
+  clientSecret: string;
+  apiKey: string;
+  tin: string;
+  /**
+   * Optional *expectations* for the source-system identity, not inputs.
+   *
+   * The access token MoR issues carries `systemNumber` and `systemType` claims for the credentials
+   * that authenticated, and those are what registration uses. When these are set they are compared
+   * against the token and a mismatch fails fast — neither side silently wins. Leave them empty to
+   * take whatever the gateway says.
+   */
+  systemNumber: string;
+  systemType: string;
+  /** Filesystem path to the INSA-issued RSA private key (PEM). Never leaves the server. */
+  privateKeyPath: string;
+  /** Filesystem path to the INSA-issued certificate bundle; sent as base64 of its exact bytes. */
+  certificatePath: string;
+  httpTimeoutMs: number;
+  /** Re-authenticate this many ms before the access token actually expires. */
+  tokenSkewMs: number;
+  /**
+   * Automatic submission of issued invoices, off by default.
+   *
+   * Invoices are produced by the workflow, so the production path is a sweep rather than a human
+   * action — but enabling it starts filing real documents with the tax authority, which is
+   * irreversible from our side. It therefore needs its own deliberate switch, separate from
+   * `EIMS_ENABLED`, so that authentication can be live long before filing is.
+   */
+  autoSubmit: boolean;
+  autoSubmitCron: string;
+  /** MoR rejects a document whose date is more than 3 days old; the sweep will not attempt those. */
+  autoSubmitMaxAgeDays: number;
+  /**
+   * Seller identity and tax/business treatment for the invoice document.
+   *
+   * None of this is derivable from the database: EDR's own legal identity exists nowhere in the
+   * codebase, and the app models no tax at all. Values are required at registration time and are
+   * validated there rather than at boot, so a deployment can run with EIMS enabled for
+   * authentication before finance has signed off on the tax treatment.
+   */
+  invoice: EimsInvoiceConfig;
+}
+
+export interface EimsInvoiceConfig {
+  sellerLegalName: string;
+  sellerVatNumber: string;
+  sellerPhone: string;
+  sellerEmail: string;
+  /** MoR *codes*, not names (e.g. "13" for Addis Ababa, "574"). */
+  sellerRegion: string;
+  sellerWereda: string;
+  sellerCity: string | null;
+  sellerSubCity: string | null;
+  sellerHouseNumber: string | null;
+  sellerLocality: string | null;
+  /** REQUIRES_BUSINESS_CONFIRMATION — no tax model exists in this application. */
+  taxCode: string;
+  taxRatePercent: number | null;
+  exciseTaxValue: number | null;
+  incomeWithholdValue: number | null;
+  transactionWithholdValue: number | null;
+  /** B2B / B2C — a tax classification, so it is configured, not inferred. */
+  transactionType: string;
+  natureOfSupplies: string;
+  paymentMode: string;
+  paymentTerm: string;
+  unitDefault: string;
+  buyerCountryCode: string | null;
+  /**
+   * Buyer region name → MoR numeric code, from `EIMS_BUYER_REGION_CODES`
+   * ("Addis Ababa=13,Oromia=4"). A buyer whose region is neither a code nor in this map fails
+   * locally rather than being filed with a guessed one.
+   */
+  buyerRegionCodes: Record<string, string>;
+  /** Same mechanism as `buyerRegionCodes`, for `EIMS_BUYER_WEREDA_CODES` ("Yeka=574"). */
+  buyerWeredaCodes: Record<string, string>;
+  cashierName: string | null;
+  salesPersonName: string | null;
+}
+
+const REQUIRED_VARS = [
+  "EIMS_CLIENT_ID",
+  "EIMS_CLIENT_SECRET",
+  "EIMS_API_KEY",
+  "EIMS_TIN",
+  "EIMS_PRIVATE_KEY_PATH",
+  "EIMS_CERTIFICATE_PATH",
+] as const;
+
+const positiveInt = (raw: string | undefined, fallback: number, name: string): number => {
+  if (raw === undefined || raw === "") return fallback;
+  const value = Number.parseInt(raw, 10);
+  if (Number.isNaN(value) || value <= 0) {
+    throw new Error(`${name} must be a positive integer`);
+  }
+  return value;
+};
+
+/** "Addis Ababa=13,Oromia=4" → { "Addis Ababa": "13", Oromia: "4" }. */
+const parseCodeMap = (raw: string | undefined): Record<string, string> => {
+  const map: Record<string, string> = {};
+  for (const pair of (raw ?? "").split(",")) {
+    const [name, code] = pair.split("=");
+    if (name?.trim() && code?.trim()) map[name.trim()] = code.trim();
+  }
+  return map;
+};
+
+/** Unset stays null so the registration-time check can name it; a set-but-bogus value throws. */
+const optionalNumber = (raw: string | undefined, name: string): number | null => {
+  if (raw === undefined || raw === "") return null;
+  const value = Number(raw);
+  if (!Number.isFinite(value)) throw new Error(`${name} must be a number`);
+  return value;
+};
+
+export default registerAs("eims", (): EimsConfig => {
+  const enabled = (process.env.EIMS_ENABLED ?? "false").toLowerCase() === "true";
+  const baseUrl = (process.env.EIMS_BASE_URL ?? "https://core.mor.gov.et").replace(/\/+$/, "");
+  const httpTimeoutMs = positiveInt(process.env.EIMS_HTTP_TIMEOUT_MS, 30_000, "EIMS_HTTP_TIMEOUT_MS");
+  const tokenSkewMs =
+    positiveInt(process.env.EIMS_TOKEN_SKEW_SECONDS, 45, "EIMS_TOKEN_SKEW_SECONDS") * 1000;
+
+  const base: EimsConfig = {
+    enabled,
+    baseUrl,
+    clientId: process.env.EIMS_CLIENT_ID ?? "",
+    clientSecret: process.env.EIMS_CLIENT_SECRET ?? "",
+    apiKey: process.env.EIMS_API_KEY ?? "",
+    tin: process.env.EIMS_TIN ?? "",
+    systemNumber: process.env.EIMS_SYSTEM_NUMBER ?? "",
+    systemType: process.env.EIMS_SYSTEM_TYPE ?? "",
+    privateKeyPath: process.env.EIMS_PRIVATE_KEY_PATH ?? "",
+    certificatePath: process.env.EIMS_CERTIFICATE_PATH ?? "",
+    httpTimeoutMs,
+    tokenSkewMs,
+    autoSubmit: (process.env.EIMS_AUTO_SUBMIT ?? "false").toLowerCase() === "true",
+    // Every 5 minutes by default: filing is not latency-sensitive, and a slow cadence keeps a
+    // misconfiguration from filing a burst of bad documents before anyone notices.
+    autoSubmitCron: process.env.EIMS_AUTO_SUBMIT_CRON || "0 */5 * * * *",
+    autoSubmitMaxAgeDays: positiveInt(
+      process.env.EIMS_AUTO_SUBMIT_MAX_AGE_DAYS,
+      3,
+      "EIMS_AUTO_SUBMIT_MAX_AGE_DAYS",
+    ),
+    invoice: {
+      sellerLegalName: process.env.EIMS_SELLER_LEGAL_NAME ?? "",
+      sellerVatNumber: process.env.EIMS_SELLER_VAT_NUMBER ?? "",
+      sellerPhone: process.env.EIMS_SELLER_PHONE ?? "",
+      sellerEmail: process.env.EIMS_SELLER_EMAIL ?? "",
+      sellerRegion: process.env.EIMS_SELLER_REGION ?? "",
+      sellerWereda: process.env.EIMS_SELLER_WEREDA ?? "",
+      sellerCity: process.env.EIMS_SELLER_CITY || null,
+      sellerSubCity: process.env.EIMS_SELLER_SUBCITY || null,
+      sellerHouseNumber: process.env.EIMS_SELLER_HOUSE_NUMBER || null,
+      sellerLocality: process.env.EIMS_SELLER_LOCALITY || null,
+      taxCode: process.env.EIMS_TAX_CODE ?? "",
+      taxRatePercent: optionalNumber(process.env.EIMS_TAX_RATE_PERCENT, "EIMS_TAX_RATE_PERCENT"),
+      exciseTaxValue: optionalNumber(process.env.EIMS_EXCISE_TAX_VALUE, "EIMS_EXCISE_TAX_VALUE"),
+      incomeWithholdValue: optionalNumber(
+        process.env.EIMS_INCOME_WITHHOLD_VALUE,
+        "EIMS_INCOME_WITHHOLD_VALUE",
+      ),
+      transactionWithholdValue: optionalNumber(
+        process.env.EIMS_TRANSACTION_WITHHOLD_VALUE,
+        "EIMS_TRANSACTION_WITHHOLD_VALUE",
+      ),
+      transactionType: process.env.EIMS_TRANSACTION_TYPE ?? "",
+      natureOfSupplies: process.env.EIMS_NATURE_OF_SUPPLIES ?? "",
+      paymentMode: process.env.EIMS_PAYMENT_MODE ?? "",
+      paymentTerm: process.env.EIMS_PAYMENT_TERM ?? "",
+      unitDefault: process.env.EIMS_UNIT_DEFAULT ?? "",
+      buyerCountryCode: process.env.EIMS_BUYER_COUNTRY_CODE || null,
+      buyerRegionCodes: parseCodeMap(process.env.EIMS_BUYER_REGION_CODES),
+      buyerWeredaCodes: parseCodeMap(process.env.EIMS_BUYER_WEREDA_CODES),
+      cashierName: process.env.EIMS_CASHIER_NAME || null,
+      salesPersonName: process.env.EIMS_SALESPERSON_NAME || null,
+    },
+  };
+
+  if (!enabled) return base;
+
+  const missing = REQUIRED_VARS.filter((name) => !process.env[name]);
+  if (missing.length > 0) {
+    throw new Error(
+      `EIMS integration is enabled (EIMS_ENABLED=true) but the following env vars are missing: ${missing.join(", ")}`,
+    );
+  }
+  return base;
+});
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 d4f0c4039..36e4e34d0 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
@@ -120,6 +120,8 @@ export class ContractDocumentViewModelBuilder {
         contract.tradeDirection,
         contract.freightType,
         contract.customsClearingEnabled,
+        // Bulk templates are keyed by the contract's cargo type.
+        (contract.cargoScope ?? []).find((c) => c.cargoTypeId)?.cargoTypeId,
       );
       dynamicTemplate = dynamicSource
         ? {
diff --git a/apps/edr-freight-api/src/migrations/3300000000000-BookingWagonCancellations.ts b/apps/edr-freight-api/src/migrations/3300000000000-BookingWagonCancellations.ts
new file mode 100644
index 000000000..0d506cff0
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3300000000000-BookingWagonCancellations.ts
@@ -0,0 +1,65 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Partial wagon cancellation with rebooking credit.
+ *
+ * One row per cancellation cycle on a PAID booking: the customer asks to drop
+ * N wagons, pays a per-wagon cancellation fee (rates row
+ * rate_type = 'CANCELLATION_FEE', rate_unit = 'PER_WAGON'), and the dropped cargo becomes a
+ * rebookable credit. The credit is redeemed by creating a fresh booking
+ * through the normal under-contract create path (which re-checks contract
+ * validity and caps), immediately marked PAID — the freight was already paid
+ * on the original booking, only the fee is new money.
+ *
+ * cancelled_quantities carries what was cut, in the booking's own terms:
+ * `{ bulkTons }` for bulk, `{ bySize: { "20": 4, "40": 3 } }` for container.
+ * Container numbers are NOT stored here — they are recovered at rebook time
+ * from the unit rows the reduction soft-deleted (same hybrid pattern as
+ * RemainderPlacementService).
+ */
+export class BookingWagonCancellations3300000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.booking_wagon_cancellations (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        booking_id uuid NOT NULL REFERENCES freight.bookings(id),
+        rebooked_booking_id uuid REFERENCES freight.bookings(id),
+        wagons_cancelled numeric(6,2) NOT NULL CHECK (wagons_cancelled > 0),
+        weight_tons numeric(12,3) NOT NULL DEFAULT 0,
+        cancelled_quantities jsonb NOT NULL,
+        credit_amount numeric(14,2) NOT NULL DEFAULT 0,
+        fee_rate_id uuid REFERENCES freight.rates(id),
+        fee_amount numeric(14,2) NOT NULL CHECK (fee_amount >= 0),
+        fee_currency varchar(8) NOT NULL DEFAULT 'ETB',
+        fee_invoice_id uuid REFERENCES freight.invoices(id),
+        fee_paid_at timestamptz,
+        status varchar(30) NOT NULL DEFAULT 'FEE_PENDING',
+        reason text,
+        requested_by_user_id uuid,
+        rebooked_at timestamptz,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        deleted_at timestamptz
+      )
+    `);
+    // One open (fee-unpaid) cancellation per booking — closes the double-click
+    // race without app-level locking.
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS uq_open_wagon_cancellation_per_booking
+        ON freight.booking_wagon_cancellations (booking_id)
+        WHERE status = 'FEE_PENDING' AND deleted_at IS NULL
+    `);
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_bwc_booking
+        ON freight.booking_wagon_cancellations (booking_id)
+    `);
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_bwc_status
+        ON freight.booking_wagon_cancellations (status)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.booking_wagon_cancellations`);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3310000000000-WagonStatusLogs.ts b/apps/edr-freight-api/src/migrations/3310000000000-WagonStatusLogs.ts
new file mode 100644
index 000000000..10c3d4799
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3310000000000-WagonStatusLogs.ts
@@ -0,0 +1,32 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Audit trail for wagon status flips (Available ⇄ Maintenance and any other
+ * bulk-status change): who moved which wagon from what to what, when, and why.
+ * Written inside the same transaction as the status update itself.
+ */
+export class WagonStatusLogs3310000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.wagon_status_logs (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        wagon_id uuid NOT NULL REFERENCES freight.wagons(id),
+        from_status varchar(30) NOT NULL,
+        to_status varchar(30) NOT NULL,
+        changed_by_user_id uuid,
+        note text,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        deleted_at timestamptz
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_wagon_status_logs_wagon
+        ON freight.wagon_status_logs (wagon_id, created_at DESC)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.wagon_status_logs`);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3320000000000-BulkContractTemplates.ts b/apps/edr-freight-api/src/migrations/3320000000000-BulkContractTemplates.ts
new file mode 100644
index 000000000..39a10ca90
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3320000000000-BulkContractTemplates.ts
@@ -0,0 +1,100 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+const CONTAINER_CODES = [
+  'IMPORT_CONTAINER_CUSTOMS',
+  'IMPORT_CONTAINER_NO_CUSTOMS',
+  'EXPORT_CONTAINER_CUSTOMS',
+  'EXPORT_CONTAINER_NO_CUSTOMS',
+  'INTERCITY_CONTAINER',
+];
+
+const BULK_CODES = [
+  'IMPORT_BULK_CUSTOMS',
+  'IMPORT_BULK_NO_CUSTOMS',
+  'EXPORT_BULK_CUSTOMS',
+  'EXPORT_BULK_NO_CUSTOMS',
+  'INTERCITY_BULK',
+];
+
+/**
+ * Bulk contract templates become staff-created, keyed by (cargo type, customs
+ * clearing) instead of the fixed direction codes. The five container templates
+ * stay seeded and become undeletable system rows; the five seeded bulk rows are
+ * retired (soft-deleted). cargo_types gains has_contract_template, marking
+ * which bulk commodities may carry their own template.
+ */
+export class BulkContractTemplates3320000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.cargo_types
+        ADD COLUMN IF NOT EXISTS has_contract_template boolean NOT NULL DEFAULT false
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE freight.contract_templates
+        ADD COLUMN IF NOT EXISTS cargo_type_id uuid REFERENCES freight.cargo_types(id),
+        ADD COLUMN IF NOT EXISTS with_customs boolean,
+        ADD COLUMN IF NOT EXISTS is_system boolean NOT NULL DEFAULT false
+    `);
+
+    // Generated bulk codes (BULK_<cargo code>_NO_CUSTOMS) outgrow varchar(40).
+    await queryRunner.query(`
+      ALTER TABLE freight.contract_templates
+        ALTER COLUMN code TYPE varchar(80)
+    `);
+
+    await queryRunner.query(
+      `UPDATE freight.contract_templates SET is_system = true WHERE code = ANY($1)`,
+      [CONTAINER_CODES],
+    );
+
+    // Retire the fixed bulk templates; staff recreate them per cargo type.
+    await queryRunner.query(
+      `UPDATE freight.contract_templates SET deleted_at = now()
+        WHERE code = ANY($1) AND deleted_at IS NULL`,
+      [BULK_CODES],
+    );
+
+    // Code stays unique among live rows only, so a deleted combo can be
+    // recreated under the same generated code.
+    await queryRunner.query(
+      `ALTER TABLE freight.contract_templates DROP CONSTRAINT IF EXISTS uq_contract_templates_code`,
+    );
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS uq_contract_templates_code
+        ON freight.contract_templates (code) WHERE deleted_at IS NULL
+    `);
+
+    // One template per (bulk cargo type, customs option) — the "same
+    // combination" rule, enforced even under concurrent creates.
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS uq_contract_templates_cargo_customs
+        ON freight.contract_templates (cargo_type_id, with_customs)
+        WHERE deleted_at IS NULL AND cargo_type_id IS NOT NULL
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX IF EXISTS freight.uq_contract_templates_cargo_customs`,
+    );
+    await queryRunner.query(`DROP INDEX IF EXISTS freight.uq_contract_templates_code`);
+    await queryRunner.query(`
+      ALTER TABLE freight.contract_templates
+        ADD CONSTRAINT uq_contract_templates_code UNIQUE (code)
+    `);
+    await queryRunner.query(
+      `UPDATE freight.contract_templates SET deleted_at = NULL WHERE code = ANY($1)`,
+      [BULK_CODES],
+    );
+    await queryRunner.query(`
+      ALTER TABLE freight.contract_templates
+        DROP COLUMN IF EXISTS cargo_type_id,
+        DROP COLUMN IF EXISTS with_customs,
+        DROP COLUMN IF EXISTS is_system
+    `);
+    await queryRunner.query(`
+      ALTER TABLE freight.cargo_types DROP COLUMN IF EXISTS has_contract_template
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3330000000000-EimsInvoiceRegistration.ts b/apps/edr-freight-api/src/migrations/3330000000000-EimsInvoiceRegistration.ts
new file mode 100644
index 000000000..1ff9bab35
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3330000000000-EimsInvoiceRegistration.ts
@@ -0,0 +1,73 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * EIMS registration state.
+ *
+ * `freight.invoices` gains the per-invoice registration outcome: which EIMS counter the invoice
+ * consumed, the returned IRN, and the last failure. The partial unique index on `eims_irn` is the
+ * database-level guarantee that one IRN can never be recorded against two invoices, independent of
+ * application logic.
+ *
+ * `freight.eims_system_state` is a single row per MoR system number holding the sequence the
+ * gateway expects: the next `SourceSystem.InvoiceCounter` and the `ReferenceDetails.PreviousIrn`
+ * of the last successful registration. Registration takes `FOR UPDATE` on this row, so the counter
+ * and the IRN chain stay consistent under concurrent submissions.
+ *
+ * The `in_flight_*` columns make a submission a *durable reservation*: the counter is consumed and
+ * the holder recorded in a committed transaction before the HTTP call, so a crash mid-flight leaves
+ * evidence instead of silently freeing the slot for a blind resubmission. `blocked_reason` is set
+ * when a submission ends ambiguously (timeout, network, 5xx) — the IRN is unknown, so every later
+ * document for this system number would chain to a stale `PreviousIrn` and registration stops until
+ * a human resolves it.
+ *
+ * `eims_ack_date` is varchar, not timestamptz: EIMS returns a Java ZonedDateTime string
+ * ("2025-03-21T08:33:32.707753413Z[Etc/UTC]") that no JS date parser accepts. It is stored
+ * verbatim so a compliance value is never mangled by a parse.
+ */
+export class EimsInvoiceRegistration3330000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.invoices
+        ADD COLUMN IF NOT EXISTS eims_status          varchar(20) NOT NULL DEFAULT 'NOT_SUBMITTED',
+        ADD COLUMN IF NOT EXISTS eims_irn             varchar(64),
+        ADD COLUMN IF NOT EXISTS eims_invoice_counter bigint,
+        ADD COLUMN IF NOT EXISTS eims_submitted_at    timestamptz,
+        ADD COLUMN IF NOT EXISTS eims_ack_date        varchar(64),
+        ADD COLUMN IF NOT EXISTS eims_last_error      jsonb
+    `);
+
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS ux_invoices_eims_irn
+        ON freight.invoices (eims_irn) WHERE eims_irn IS NOT NULL
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.eims_system_state (
+        id                   uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        system_number        varchar(32)  NOT NULL UNIQUE,
+        next_invoice_counter bigint       NOT NULL DEFAULT 1,
+        previous_irn         varchar(64),
+        in_flight_invoice_id uuid,
+        in_flight_counter    bigint,
+        blocked_reason       text,
+        created_at           timestamptz  NOT NULL DEFAULT now(),
+        updated_at           timestamptz  NOT NULL DEFAULT now(),
+        deleted_at           timestamptz
+      )
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.eims_system_state`);
+    await queryRunner.query(`DROP INDEX IF EXISTS freight.ux_invoices_eims_irn`);
+    await queryRunner.query(`
+      ALTER TABLE freight.invoices
+        DROP COLUMN IF EXISTS eims_status,
+        DROP COLUMN IF EXISTS eims_irn,
+        DROP COLUMN IF EXISTS eims_invoice_counter,
+        DROP COLUMN IF EXISTS eims_submitted_at,
+        DROP COLUMN IF EXISTS eims_ack_date,
+        DROP COLUMN IF EXISTS eims_last_error
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3340000000000-EimsDocumentNumberSequence.ts b/apps/edr-freight-api/src/migrations/3340000000000-EimsDocumentNumberSequence.ts
new file mode 100644
index 000000000..481b7489c
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3340000000000-EimsDocumentNumberSequence.ts
@@ -0,0 +1,34 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * EIMS document numbering.
+ *
+ * MoR validates `DocumentDetails.DocumentNumber` against `^(0|[1-9][0-9]{0,8})$` — a plain integer
+ * of at most nine digits. Our own `INV-YYYYMMDD-NNNNN` can therefore never be sent, so EIMS needs
+ * its own sequence, allocated from the same locked state row as the invoice counter and recorded
+ * on the invoice so a filed document can be traced back to it.
+ */
+export class EimsDocumentNumberSequence3340000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.eims_system_state
+        ADD COLUMN IF NOT EXISTS next_document_number bigint NOT NULL DEFAULT 1,
+        ADD COLUMN IF NOT EXISTS in_flight_document_number bigint
+    `);
+    await queryRunner.query(`
+      ALTER TABLE freight.invoices
+        ADD COLUMN IF NOT EXISTS eims_document_number varchar(16)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.invoices DROP COLUMN IF EXISTS eims_document_number
+    `);
+    await queryRunner.query(`
+      ALTER TABLE freight.eims_system_state
+        DROP COLUMN IF EXISTS next_document_number,
+        DROP COLUMN IF EXISTS in_flight_document_number
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3350000000000-SupportContent.ts b/apps/edr-freight-api/src/migrations/3350000000000-SupportContent.ts
new file mode 100644
index 000000000..168ee2c6d
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3350000000000-SupportContent.ts
@@ -0,0 +1,73 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Editable customer-facing copy for the portal's public pages (/help, /faq,
+ * /terms, /privacy) plus the shared support-contact block, with an append-only
+ * version log behind it.
+ *
+ * `payload` is opaque jsonb: the five documents have genuinely different shapes
+ * and the help page's blocks change with the copy, so typed columns would mean
+ * a migration per wording tweak. The shape is enforced by per-slug DTOs on
+ * write instead.
+ *
+ * No rows are inserted here — `SupportContentSeeder` fills the table on first
+ * boot and skips whenever it is non-empty, so a redeploy never overwrites
+ * admin edits the way a migration-embedded INSERT eventually would.
+ */
+export class SupportContent3350000000000 implements MigrationInterface {
+  name = "SupportContent3350000000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.support_documents (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        slug varchar(32) NOT NULL,
+        payload jsonb NOT NULL DEFAULT '{}'::jsonb,
+        version integer NOT NULL DEFAULT 1,
+        updated_by_id uuid,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        deleted_at timestamptz
+      );
+    `);
+
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS uq_support_documents_slug
+        ON freight.support_documents (slug);
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.support_document_versions (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        document_id uuid NOT NULL
+          REFERENCES freight.support_documents(id) ON DELETE CASCADE,
+        version integer NOT NULL,
+        payload jsonb NOT NULL,
+        actor_id uuid,
+        note varchar(255),
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        deleted_at timestamptz
+      );
+    `);
+
+    // Closes the concurrent-save race: two editors saving at once cannot both
+    // claim the same version number.
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS uq_support_doc_version
+        ON freight.support_document_versions (document_id, version);
+    `);
+
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_support_doc_versions_document
+        ON freight.support_document_versions (document_id);
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP TABLE IF EXISTS freight.support_document_versions;`,
+    );
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.support_documents;`);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3360000000000-SupportHelpSections.ts b/apps/edr-freight-api/src/migrations/3360000000000-SupportHelpSections.ts
new file mode 100644
index 000000000..5220d3a6c
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3360000000000-SupportHelpSections.ts
@@ -0,0 +1,112 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Converts the HELP document from its original fixed-block shape
+ * (`video` / `chat` / `channels` / `topics` / `checklist`) to the free-form
+ * `sections[]` builder, where every block is a heading plus markdown plus
+ * attached media.
+ *
+ * Only rows still in the old shape are touched — detected by the presence of a
+ * `channels` key — so this is a no-op on any environment seeded after the
+ * change, and re-running it does nothing.
+ *
+ * The payload literal is inlined rather than imported from
+ * `SUPPORT_CONTENT_DEFAULTS`: a migration must keep doing the same thing
+ * forever, and that constant will keep moving.
+ *
+ * The rewrite also bumps `version` and writes a matching history row. The live
+ * row's version always having a matching entry in
+ * `support_document_versions` is the invariant the history list and rollback
+ * both depend on, and a silent payload swap would break it.
+ */
+const HELP_SECTIONS = [
+  {
+    id: "help-walkthrough",
+    heading: "Portal walkthrough",
+    body: "A guided tour of the portal — registering your company, raising a booking against a contract, and settling an invoice.",
+    media: [
+      {
+        id: "help-walkthrough-video",
+        kind: "video",
+        src: "/assets/edr-portal-guide.webm",
+        caption: null,
+      },
+    ],
+  },
+  {
+    id: "help-chat",
+    heading: "Chat with our team",
+    body: "Signed-in customers can open a support conversation from the headset button at the bottom right of every portal page. You can send screenshots and documents in the chat, and replies appear there and as a notification.\n\n[Open the portal](/portal)",
+    media: [],
+  },
+  {
+    id: "help-contact",
+    heading: "Contact us",
+    body: "- **Email** — [{{supportEmail}}](mailto:{{supportEmail}}). Best for document issues and anything needing an attachment.\n- **Phone** — [{{supportPhone}}](tel:{{supportPhoneTel}}). Best for urgent problems with cargo already in transit.\n- **Head office** — {{supportOffice}}. Walk-in support during working hours.\n- **Support hours** — {{supportHours}}. Outside these hours, email us and we reply the next working day.",
+    media: [],
+  },
+  {
+    id: "help-topics",
+    heading: "Common topics",
+    body: "- **[Account & onboarding](/faq)** — registering your company, uploading your trade licence and TIN, and getting an operational profile approved.\n- **[Contracts](/faq)** — requesting a freight contract, reviewing its terms and signing it with your saved signature and stamp.\n- **[Bookings & tracking](/faq)** — raising a booking against a contract, adding last-mile transport and following the consignment along the corridor.\n- **[Invoices & payments](/faq)** — finding invoices, paying through the bank channels and confirming a payment that has not yet settled.",
+    media: [],
+  },
+  {
+    id: "help-checklist",
+    heading: "What to include when you contact us",
+    body: "- Your company name and the email you sign in with.\n- The reference of the contract, booking or invoice involved.\n- What you expected to happen and what happened instead.\n- A screenshot of any error message the portal showed.",
+    media: [],
+  },
+];
+
+export class SupportHelpSections3360000000000 implements MigrationInterface {
+  name = "SupportHelpSections3360000000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const rows: { id: string; version: number; payload: Record<string, unknown> }[] =
+      await queryRunner.query(`
+        SELECT id, version, payload
+        FROM freight.support_documents
+        WHERE slug = 'HELP' AND payload ? 'channels'
+      `);
+
+    for (const row of rows) {
+      const payload = {
+        title: row.payload.title ?? "Help & Support",
+        subtitle:
+          row.payload.subtitle ??
+          "Get answers fast — watch the walkthrough, browse the common topics, check the FAQ, or reach our team directly.",
+        sections: HELP_SECTIONS,
+      };
+      const version = row.version + 1;
+
+      await queryRunner.query(
+        `UPDATE freight.support_documents
+         SET payload = $1::jsonb, version = $2, updated_at = now()
+         WHERE id = $3`,
+        [JSON.stringify(payload), version, row.id],
+      );
+
+      await queryRunner.query(
+        `INSERT INTO freight.support_document_versions
+           (document_id, version, payload, actor_id, note)
+         VALUES ($1, $2, $3::jsonb, NULL, $4)`,
+        [
+          row.id,
+          version,
+          JSON.stringify(payload),
+          "Converted help page to free-form sections",
+        ],
+      );
+    }
+  }
+
+  /**
+   * Not reversible: the old fixed blocks cannot be recovered from markdown
+   * sections an editor may since have rewritten. The version history holds the
+   * pre-conversion payload if it is ever genuinely needed.
+   */
+  public async down(): Promise<void> {
+    // no-op
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3370000000000-BookingExportHandoverMode.ts b/apps/edr-freight-api/src/migrations/3370000000000-BookingExportHandoverMode.ts
new file mode 100644
index 000000000..42acfc8f9
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3370000000000-BookingExportHandoverMode.ts
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Export cargo reaches a train two ways, and until now only one was modelled.
+ *
+ * DIRECT_TO_TRAIN — the customer's truck pulls alongside and the cargo goes
+ * straight onto the wagon. It never enters a warehouse, so no GRN is ever
+ * raised; the Carriage Acceptance Sheet is the only document handed over.
+ *
+ * WAREHOUSE — cargo is received into the warehouse, GRN'd, then loaded. This is
+ * the existing flow and stays gated on the GRN.
+ *
+ * NULL means WAREHOUSE, so existing rows keep today's behaviour with no backfill.
+ */
+export class BookingExportHandoverMode3370000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.bookings
+        ADD COLUMN IF NOT EXISTS export_handover_mode varchar(20)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.bookings DROP COLUMN IF EXISTS export_handover_mode
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/3370000000000-SupportHelpInlineMedia.ts b/apps/edr-freight-api/src/migrations/3370000000000-SupportHelpInlineMedia.ts
new file mode 100644
index 000000000..3301056e4
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/3370000000000-SupportHelpInlineMedia.ts
@@ -0,0 +1,91 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Folds each help section's `media[]` array into its markdown body.
+ *
+ * Attachments used to hang off the section as a separate list, rendered after
+ * the text — which meant an author could not put a picture next to the sentence
+ * it illustrates, and had two different places to manage media. They are now
+ * embedded with markdown's image syntax, and the renderer picks `<img>` or
+ * `<video>` from the file extension.
+ *
+ * Existing entries are converted rather than dropped: an uploaded object
+ * becomes `![caption](minio:<key>)`, and a shipped asset path or external URL
+ * is kept verbatim. Sections are left alone once they have no `media` key, so
+ * re-running does nothing.
+ */
+interface LegacyMedia {
+  src: string;
+  caption?: string | null;
+}
+
+interface LegacySection {
+  id: string;
+  heading: string;
+  body: string;
+  media?: LegacyMedia[];
+}
+
+/** Uploaded objects are stored as keys; the `minio:` ref is signed on read. */
+function toMarkdown(item: LegacyMedia): string {
+  const isStoredObject = !/^(https?:\/\/|\/)/.test(item.src);
+  const target = isStoredObject ? `minio:${item.src}` : item.src;
+  return `![${item.caption ?? ""}](${target})`;
+}
+
+export class SupportHelpInlineMedia3370000000000 implements MigrationInterface {
+  name = "SupportHelpInlineMedia3370000000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const rows: {
+      id: string;
+      version: number;
+      payload: { sections?: LegacySection[] } & Record<string, unknown>;
+    }[] = await queryRunner.query(`
+      SELECT id, version, payload
+      FROM freight.support_documents
+      WHERE slug = 'HELP'
+    `);
+
+    for (const row of rows) {
+      const sections = row.payload.sections ?? [];
+      if (!sections.some((section) => section.media !== undefined)) continue;
+
+      const payload = {
+        ...row.payload,
+        sections: sections.map(({ media, ...section }) => {
+          const embeds = (media ?? []).map(toMarkdown);
+          return {
+            ...section,
+            body: [section.body, ...embeds].filter(Boolean).join("\n\n"),
+          };
+        }),
+      };
+      const version = row.version + 1;
+
+      await queryRunner.query(
+        `UPDATE freight.support_documents
+         SET payload = $1::jsonb, version = $2, updated_at = now()
+         WHERE id = $3`,
+        [JSON.stringify(payload), version, row.id],
+      );
+
+      await queryRunner.query(
+        `INSERT INTO freight.support_document_versions
+           (document_id, version, payload, actor_id, note)
+         VALUES ($1, $2, $3::jsonb, NULL, $4)`,
+        [
+          row.id,
+          version,
+          JSON.stringify(payload),
+          "Moved attachments inline into the section text",
+        ],
+      );
+    }
+  }
+
+  /** Not reversible — see the note on SupportHelpSections3360000000000. */
+  public async down(): Promise<void> {
+    // no-op
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/ai/ai.controller.ts b/apps/edr-freight-api/src/modules/ai/ai.controller.ts
index eb87fe97d..d71795066 100644
--- a/apps/edr-freight-api/src/modules/ai/ai.controller.ts
+++ b/apps/edr-freight-api/src/modules/ai/ai.controller.ts
@@ -1,15 +1,13 @@
 import { Body, Controller, HttpCode, HttpStatus, Post } from '@nestjs/common';
 import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { Public } from '@edr/api-common';
 
+import { BookingStaff } from '../../common/booking-guards';
 import { AiBookingRequestDto } from './dto/ai-booking-request.dto';
 import { AiBookingResult } from './types/ai-booking-result.type';
 import { MockAiService } from './mock-ai.service';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
-// @Public() — TODO: swap for real guard when this leaves dev/testing.
-// Safe while public: extracts + validates text only, never creates or
-// dispatches anything.
-@Public()
+@BookingStaff(FREIGHT_PERMS.bookings.view)
 @ApiTags('AI Assistant (mock)')
 @Controller('ai')
 export class AiController {
diff --git a/apps/edr-freight-api/src/modules/auth/freight-me.service.ts b/apps/edr-freight-api/src/modules/auth/freight-me.service.ts
index 006b482f4..6bcfd964d 100644
--- a/apps/edr-freight-api/src/modules/auth/freight-me.service.ts
+++ b/apps/edr-freight-api/src/modules/auth/freight-me.service.ts
@@ -35,10 +35,57 @@ export class FreightMeService {
     }
   }
 
+  /**
+   * Permissions granted to the position's TYPE (`iam.position_type_permissions`).
+   * A position type is the platform's notion of a role, and admin-created
+   * positions carry their grants there rather than on the position itself — but
+   * the JWT only ever snapshots direct position permissions. Without this, staff
+   * on such a position resolve to zero permissions and every permission-gated
+   * route rejects them (this is what locked GL officers out of their clearance
+   * detail pages). Resolved live from IAM, same as the position type above.
+   */
+  private async lookupPositionTypePermissions(
+    positionId: string | undefined,
+  ): Promise<string[]> {
+    if (!positionId) return [];
+    try {
+      const rows: { key: string }[] = await this.dataSource.query(
+        `SELECT DISTINCT perm.key
+           FROM iam.positions p
+           JOIN iam.position_type_permissions ptp
+             ON ptp.position_type_id = p.position_type_id
+           JOIN iam.permissions perm ON perm.id = ptp.permission_id
+          WHERE p.id = $1`,
+        [positionId],
+      );
+      return rows.map((r) => r.key).filter(Boolean);
+    } catch {
+      return []; // iam schema unreachable — degrade to position-only permissions
+    }
+  }
+
   async getEnrichedProfile(user: TCurrentUser) {
-    const positionType = await this.lookupPositionType(
-      user.employee?.position?.id,
+    const positionId = user.employee?.position?.id;
+    const [positionType, positionTypePermissionKeys] = await Promise.all([
+      this.lookupPositionType(positionId),
+      this.lookupPositionTypePermissions(positionId),
+    ]);
+
+    // Merge the type-level grants into the position's own permission list so
+    // BOTH consumers see them: `collectPermissionKeys` below, and the
+    // backoffice's `getPermissionKeys`, which walks this same nested array.
+    const positionPermissions = [
+      ...(user.employee?.position?.permissions ?? []),
+    ];
+    const seenPermissionKeys = new Set(
+      positionPermissions.map((p) => p?.key).filter(Boolean),
     );
+    for (const key of positionTypePermissionKeys) {
+      if (!seenPermissionKeys.has(key)) {
+        seenPermissionKeys.add(key);
+        positionPermissions.push({ key } as (typeof positionPermissions)[number]);
+      }
+    }
 
     const employee = user.employee
       ? [
@@ -56,7 +103,7 @@ export class FreightMeService {
                     name: user.employee.position.name,
                     isDelegate: user.employee.position.isDelegate,
                     parentPositionId: user.employee.position.parentPositionId,
-                    permissions: user.employee.position.permissions ?? [],
+                    permissions: positionPermissions,
                     positionType,
                   },
                 ]
@@ -65,7 +112,15 @@ export class FreightMeService {
         ]
       : [];
 
-    const permissionKeys = collectPermissionKeys(user);
+    // `collectPermissionKeys` reads the raw token (position-level only), so
+    // union the type-level grants in — the backoffice prefers this flat list
+    // over the nested array and would otherwise still see none of them.
+    const permissionKeys = [
+      ...new Set([
+        ...collectPermissionKeys(user),
+        ...positionTypePermissionKeys,
+      ]),
+    ];
 
     return {
       id: user.id,
diff --git a/apps/edr-freight-api/src/modules/auth/list-users.controller.ts b/apps/edr-freight-api/src/modules/auth/list-users.controller.ts
index e7fbfd771..e2f06f065 100644
--- a/apps/edr-freight-api/src/modules/auth/list-users.controller.ts
+++ b/apps/edr-freight-api/src/modules/auth/list-users.controller.ts
@@ -3,7 +3,8 @@ import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
 import { ListUsersQueryDto } from './dto/list-users-query.dto';
 import { ListUsersService } from './list-users.service';
-import { StaffReference } from '../../common/booking-guards';
+import { BookingStaff } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
 @ApiTags('auth')
 @Controller('staff/users')
@@ -12,7 +13,7 @@ export class ListUsersController {
   constructor(private readonly service: ListUsersService) {}
 
   @Get()
-  @StaffReference()
+  @BookingStaff(FREIGHT_PERMS.staff.users.view)
   @ApiOperation({
     summary: 'List IAM users (paginated) for backoffice pickers',
   })
diff --git a/apps/edr-freight-api/src/modules/auth/list-users.service.ts b/apps/edr-freight-api/src/modules/auth/list-users.service.ts
index cf7e22be2..c598e105a 100644
--- a/apps/edr-freight-api/src/modules/auth/list-users.service.ts
+++ b/apps/edr-freight-api/src/modules/auth/list-users.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { InjectRepository } from '@nestjs/typeorm';
 import { PaginatedResponse } from '@edr/types';
 import { User } from '@tria-plc/iamapi-common/entities/iam/user/user.entity';
@@ -19,6 +20,7 @@ import { paginateQuery } from '../../common/utils/pagination.util';
 export class ListUsersService {
   constructor(
     @InjectRepository(User) private readonly users: Repository<User>,
+    private readonly config: ConfigService,
   ) {}
 
   findAll(query: ListUsersQueryDto): Promise<PaginatedResponse<User>> {
@@ -40,6 +42,29 @@ export class ListUsersService {
       ])
       .orderBy(`user.${sortBy}`, query.sortOrder ?? 'ASC');
 
+    // Restrict to one IAM organization when configured. The org key differs per
+    // environment (dev seeds `edr_freight`, production uses the registered
+    // company key), so this is config rather than a constant. An unset key
+    // means no restriction; a key matching no organization matches no user —
+    // failing closed rather than silently widening to every org.
+    const orgKey = this.config.get<string>('FREIGHT_ORG_KEY');
+    if (orgKey) {
+      // EXISTS, not a join: a user with several employee rows would otherwise
+      // be returned once per row, duplicating them in the list and inflating
+      // `getManyAndCount`'s total.
+      qb.andWhere(
+        `EXISTS (
+           SELECT 1
+           FROM iam.employees emp
+           JOIN iam.organizations org ON org.id = emp.organization_id
+           WHERE emp.user_id = "user".id
+             AND org.key = :orgKey
+             AND org.deleted_at IS NULL
+         )`,
+        { orgKey },
+      );
+    }
+
     if (query.userType) {
       qb.andWhere('user.userType = :userType', { userType: query.userType });
     }
diff --git a/apps/edr-freight-api/src/modules/backoffice/backoffice.controller.ts b/apps/edr-freight-api/src/modules/backoffice/backoffice.controller.ts
index b3305ba68..d25fb74ba 100644
--- a/apps/edr-freight-api/src/modules/backoffice/backoffice.controller.ts
+++ b/apps/edr-freight-api/src/modules/backoffice/backoffice.controller.ts
@@ -10,18 +10,19 @@ import {
 } from "@nestjs/common";
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 
-import { FreightAdmin } from "../../common/booking-guards";
+import { BookingStaff } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { BackofficeService } from "./backoffice.service";
 import { CreateOrganizationUserDto } from "./dto/create-organization-user.dto";
 import { UpdateEmployeeUserRolesDto } from "./dto/update-employee-user-roles.dto";
 
 @ApiTags("backoffice")
 @Controller("backoffice")
-@FreightAdmin()
 export class BackofficeController {
   constructor(private readonly backofficeService: BackofficeService) {}
 
   @Post("organizations/:orgId/users")
+  @BookingStaff([FREIGHT_PERMS.staff.employeeRegistration.create, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Create an organization user without assigning positions" })
   createOrganizationUser(
     @Param("orgId", ParseUUIDPipe) organizationId: string,
@@ -31,6 +32,7 @@ export class BackofficeController {
   }
 
   @Get("organizations/:orgId/employees")
+  @BookingStaff([FREIGHT_PERMS.staff.roleAssignment.view, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Get deduplicated organization employees for backoffice" })
   getOrganizationEmployees(
     @Param("orgId", ParseUUIDPipe) organizationId: string,
@@ -44,6 +46,7 @@ export class BackofficeController {
   }
 
   @Get("organizations/:orgId/employee-users/:userId/roles")
+  @BookingStaff([FREIGHT_PERMS.staff.roleAssignment.view, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Get org-scoped roles assigned to an employee user" })
   getEmployeeUserRoles(
     @Param("orgId", ParseUUIDPipe) organizationId: string,
@@ -53,6 +56,7 @@ export class BackofficeController {
   }
 
   @Put("organizations/:orgId/employee-users/:userId/roles")
+  @BookingStaff([FREIGHT_PERMS.staff.roleAssignment.replace, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Replace org-scoped roles assigned to an employee user" })
   replaceEmployeeUserRoles(
     @Param("orgId", ParseUUIDPipe) organizationId: string,
diff --git a/apps/edr-freight-api/src/modules/backoffice/backoffice.service.ts b/apps/edr-freight-api/src/modules/backoffice/backoffice.service.ts
index 49384922e..f47b5e8b1 100644
--- a/apps/edr-freight-api/src/modules/backoffice/backoffice.service.ts
+++ b/apps/edr-freight-api/src/modules/backoffice/backoffice.service.ts
@@ -46,7 +46,8 @@ export class BackofficeService {
 
   /**
    * IAM user ids of every current employee across all organizations — used by
-   * the notification recipients resolver's `allBackoffice` selector.
+   * support chat for staff room membership. Notifications deliberately do NOT
+   * use this: they target a desk via `getEmployeeUserIdsByPermission`.
    */
   async getAllCurrentEmployeeUserIds(): Promise<string[]> {
     const employees = await this.employeeRepository.find({
@@ -63,24 +64,67 @@ export class BackofficeService {
    * IAM user ids of current employees (any org) holding ANY of the given
    * permission keys — used by the notification recipients resolver's
    * `permissionKeys` selector for department/role-scoped targeting.
+   *
+   * This MUST agree with the request-time guard (`hasFreightPermission`,
+   * common/freight-permission.util.ts), which counts four grant carriers plus
+   * the super_admin bypass. Counting fewer silently drops legitimate
+   * recipients: an earlier version joined only direct position permissions, on
+   * which `bookings:view` resolved to 2 users — against 21 through position
+   * TYPES, which is where admin-created positions actually keep their grants.
+   *
+   * Raw SQL rather than QueryBuilder because `Position.positionTypePermissions`
+   * declares its inverse side against PositionType, so a relation join emits
+   * `ptp.position_type_id = position.id` and silently matches nothing. Same
+   * approach as FreightMeService's position-type lookups.
    */
   async getEmployeeUserIdsByPermission(
     permissionKeys: string[],
   ): Promise<string[]> {
     if (!permissionKeys.length) return [];
-    const rows: { userId: string | null }[] = await this.employeeRepository
-      .createQueryBuilder("employee")
-      .innerJoin("employee.employeePositions", "employeePosition")
-      .innerJoin("employeePosition.position", "position")
-      .innerJoin("position.positionPermission", "positionPermission")
-      .innerJoin("positionPermission.permission", "permission")
-      .where("employee.isCurrent = :isCurrent", { isCurrent: true })
-      .andWhere("permission.key IN (:...permissionKeys)", { permissionKeys })
-      .select("DISTINCT employee.user_id", "userId")
-      .getRawMany();
-    return rows
-      .map((r) => r.userId)
-      .filter((id): id is string => Boolean(id));
+    const rows: { userId: string }[] = await this.dataSource.query(
+      `WITH target AS (SELECT id FROM iam.permissions WHERE key = ANY($1))
+       -- 1. IAM role grants (user_roles -> role_permissions).
+       SELECT e.user_id AS "userId"
+         FROM iam.employees e
+         JOIN iam.user_roles ur ON ur.user_id = e.user_id
+         JOIN iam.role_permissions rp ON rp.role_id = ur.role_id
+        WHERE e.is_current AND e.user_id IS NOT NULL
+          AND rp.permission_id IN (SELECT id FROM target)
+       UNION
+       -- 2. Direct position grants. A delegate keeps their own position AND
+       --    gains the one they stand in for, so both columns count.
+       SELECT e.user_id
+         FROM iam.employees e
+         JOIN iam.employee_positions ep
+           ON ep.employee_id = e.id AND ep.is_current
+         JOIN iam.position_permissions pp
+           ON pp.position_id IN (ep.position_id, ep.delegatee_position_id)
+        WHERE e.is_current AND e.user_id IS NOT NULL
+          AND pp.permission_id IN (SELECT id FROM target)
+       UNION
+       -- 3. Position TYPE grants — where admin-created positions keep theirs.
+       SELECT e.user_id
+         FROM iam.employees e
+         JOIN iam.employee_positions ep
+           ON ep.employee_id = e.id AND ep.is_current
+         JOIN iam.positions p
+           ON p.id IN (ep.position_id, ep.delegatee_position_id)
+         JOIN iam.position_type_permissions ptp
+           ON ptp.position_type_id = p.position_type_id
+        WHERE e.is_current AND e.user_id IS NOT NULL
+          AND ptp.permission_id IN (SELECT id FROM target)
+       UNION
+       -- 4. super_admin passes every freight permission check, so mirror that
+       --    here or admins go blind on desks nobody else has been granted yet.
+       SELECT e.user_id
+         FROM iam.employees e
+         JOIN iam.user_roles ur ON ur.user_id = e.user_id
+         JOIN iam.roles r ON r.id = ur.role_id
+        WHERE e.is_current AND e.user_id IS NOT NULL
+          AND r.key = 'super_admin'`,
+      [permissionKeys],
+    );
+    return rows.map((r) => r.userId);
   }
 
   async createOrganizationUser(
diff --git a/apps/edr-freight-api/src/modules/billing/billing.controller.ts b/apps/edr-freight-api/src/modules/billing/billing.controller.ts
index 49772316a..5bf1448fd 100644
--- a/apps/edr-freight-api/src/modules/billing/billing.controller.ts
+++ b/apps/edr-freight-api/src/modules/billing/billing.controller.ts
@@ -1,25 +1,44 @@
 import {
+  Body,
   Controller,
   Get,
   Param,
   ParseUUIDPipe,
+  Post,
   Query,
   Res,
+  UploadedFile,
+  UseInterceptors,
 } from "@nestjs/common";
-import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger";
+import { FileInterceptor } from "@nestjs/platform-express";
+import {
+  ApiBearerAuth,
+  ApiConsumes,
+  ApiOperation,
+  ApiTags,
+} from "@nestjs/swagger";
 import type { Response } from "express";
 
 import { CurrentUser } from "@edr/api-common";
 import type { TCurrentUser } from "@tria-plc/api-common/modules/auth/types/current-user.type";
 
-import { BookingView } from "../../common/booking-guards";
+import { BookingStaff } from "../../common/booking-guards";
+import { resolveAuthUserId } from "../../common/resolve-auth-user-id";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
+import { actorLabel } from "../warehouses/current-actor.util";
 import { UserTradeAccessService } from "../user-trade-access/user-trade-access.service";
 import { BillingService } from "./billing.service";
 import { FilterInvoiceDto } from "./dto/filter-invoice.dto";
 
 @ApiTags("billing")
 @Controller("billing")
-@BookingView()
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.invoices.view,
+  FREIGHT_PERMS.invoices.export,
+  FREIGHT_PERMS.invoices.confirmOffline,
+])
 @ApiBearerAuth()
 export class BillingController {
   constructor(
@@ -50,7 +69,38 @@ export class BillingController {
     return this.billingService.findById(id);
   }
 
+  @Get("offline-usd")
+  @ApiOperation({
+    summary:
+      "Finance worklist: USD invoices settled offline by bank transfer, with booking pay-window context",
+  })
+  findOfflineUsd(@Query() query: FilterInvoiceDto) {
+    return this.billingService.findOfflineUsdPaginated(query);
+  }
+
+  @Post("invoices/:id/confirm-offline")
+  @BookingStaff(FREIGHT_PERMS.invoices.confirmOffline)
+  @UseInterceptors(FileInterceptor("file"))
+  @ApiConsumes("multipart/form-data")
+  @ApiOperation({
+    summary:
+      "Finance confirms a USD invoice paid by bank transfer — slip file required, settles the full balance",
+  })
+  confirmOffline(
+    @Param("id", ParseUUIDPipe) id: string,
+    @UploadedFile() file: Express.Multer.File | undefined,
+    @Body("reference") reference: string | undefined,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    return this.billingService.confirmOfflinePayment(id, file, {
+      reference: reference?.trim() || null,
+      userId: resolveAuthUserId(user),
+      userName: actorLabel(user) ?? null,
+    });
+  }
+
   @Get("invoices/:id/document")
+  @BookingStaff(FREIGHT_PERMS.invoices.export)
   @ApiOperation({ summary: "Download the sealed invoice PDF" })
   async document(@Param("id", ParseUUIDPipe) id: string, @Res() res: Response) {
     const { filename, buffer } = await this.billingService.document(id);
@@ -58,6 +108,7 @@ export class BillingController {
   }
 
   @Get("invoices/:id/receipt")
+  @BookingStaff(FREIGHT_PERMS.invoices.export)
   @ApiOperation({ summary: "Download the sealed payment receipt PDF" })
   async receipt(@Param("id", ParseUUIDPipe) id: string, @Res() res: Response) {
     const { filename, buffer } = await this.billingService.receipt(id);
diff --git a/apps/edr-freight-api/src/modules/billing/billing.module.ts b/apps/edr-freight-api/src/modules/billing/billing.module.ts
index a67e6f6ba..7ec5c333b 100644
--- a/apps/edr-freight-api/src/modules/billing/billing.module.ts
+++ b/apps/edr-freight-api/src/modules/billing/billing.module.ts
@@ -13,6 +13,7 @@ import { InvoiceRepository } from "./invoice.repository";
 import { InvoiceLineRepository } from "./invoice-line.repository";
 import { PaymentModule } from "../payment/payment.module";
 import { CompaniesModule } from "../companies/companies.module";
+import { FilesModule } from "../files/files.module";
 
 @Module({
   imports: [
@@ -21,6 +22,7 @@ import { CompaniesModule } from "../companies/companies.module";
     CompaniesModule,
     DocumentsModule,
     UserTradeAccessModule,
+    FilesModule,
   ],
   controllers: [BillingController, PortalBillingController, PaymentController],
   providers: [BillingService, InvoiceRepository, InvoiceLineRepository],
diff --git a/apps/edr-freight-api/src/modules/billing/billing.service.spec.ts b/apps/edr-freight-api/src/modules/billing/billing.service.spec.ts
index 1356f8cfa..576c7b166 100644
--- a/apps/edr-freight-api/src/modules/billing/billing.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/billing/billing.service.spec.ts
@@ -79,6 +79,7 @@ describe("BillingService.generateInvoice", () => {
       {} as never, // payment
       {} as never, // companies
       {} as never, // invoiceDocuments
+      {} as never, // files
     );
   });
 
@@ -140,6 +141,7 @@ describe("BillingService.markInvoiceAsPaid", () => {
       {} as never, // payment
       {} as never, // companies
       {} as never, // invoiceDocuments
+      {} as never, // files
     );
 
     await service.markInvoiceAsPaid("inv-1", "pay-1", mg as never);
@@ -193,6 +195,7 @@ describe("BillingService.markInvoiceAsPaid", () => {
       {} as never, // payment
       {} as never, // companies
       {} as never, // invoiceDocuments
+      {} as never, // files
     );
 
     await service.markInvoiceAsPaid("inv-1", "pay-1", mg as never);
@@ -236,6 +239,7 @@ describe("BillingService.settleByPaymentId", () => {
       {} as never, // payment
       {} as never, // companies
       {} as never, // invoiceDocuments
+      {} as never, // files
     );
     return { service, mg, events };
   }
@@ -347,6 +351,7 @@ describe("BillingService.recordPayment", () => {
       {} as never, // payment
       {} as never, // companies
       {} as never, // invoiceDocuments
+      {} as never, // files
     );
     return { service, mg, events };
   }
@@ -462,6 +467,7 @@ describe("BillingService.expirePayable — locked write runs in a transaction",
       {} as never,
       {} as never,
       {} as never,
+      {} as never,
     );
     return { service, defaultManager, txManager, transaction };
   };
@@ -533,6 +539,7 @@ describe("BillingService.issuePayable", () => {
       {} as never,
       {} as never,
       {} as never,
+      {} as never,
     );
     return { service, manager };
   };
@@ -622,6 +629,7 @@ describe("BillingService — CAC Bank (OTP debit)", () => {
       payment as never,
       {} as never,
       {} as never,
+      {} as never,
     );
     return { service, repo };
   };
@@ -668,3 +676,67 @@ describe("BillingService — CAC Bank (OTP debit)", () => {
     expect(confirmOtp).toHaveBeenCalledWith("intent-1", "123456");
   });
 });
+
+describe("BillingService — CBE bill amounts carry cents, never rounded", () => {
+  // CBE settles to the cent (/cbe/payment gates on amountsMatchToTheCent), so the
+  // bill must quote the exact balance. Rounding UP overcharged the payer by up to
+  // a birr; rounding DOWN underpaid while markInvoiceAsPaid still wrote paidAmount
+  // = totalAmount. payInvoice and billQuery must agree, or /cbe/payment mismatches.
+  const invoice = {
+    id: "inv-1",
+    status: Freight.InvoiceStatus.Pending,
+    source: Freight.InvoiceSource.Booking,
+    sourceId: "booking-1",
+    type: "PREPAID",
+    invoiceNumber: "INV-20260101-00001",
+    currency: "ETB",
+    // .43 — cents that must survive all the way to the bill.
+    balanceAmount: 12345.43,
+    totalAmount: 12345.43,
+    company: { name: "Acme PLC" },
+    paymentId: null,
+    dueAt: null,
+  };
+
+  const build = (payment: Record<string, unknown> = {}) => {
+    const repo = {
+      findOne: jest.fn().mockResolvedValue(invoice),
+      update: jest.fn().mockResolvedValue(undefined),
+    };
+    const service = new BillingService(
+      { getRepository: () => repo } as never,
+      {} as never,
+      {} as never,
+      makeEvents() as never,
+      payment as never,
+      {} as never,
+      {} as never,
+      {} as never,
+    );
+    return { service, repo };
+  };
+
+  it("opens the intent for the exact balance, cents included", async () => {
+    const initiate = jest.fn().mockResolvedValue({
+      intentId: "intent-1",
+      immediateSuccess: false,
+      response: { intentId: "intent-1", status: "REQUIRES_ACTION" },
+    });
+    const { service } = build({ initiate });
+
+    await service.payInvoice("inv-1", { method: "CBE_BILL" });
+
+    expect(initiate).toHaveBeenCalledWith(
+      expect.objectContaining({ amountMinor: 12345.43 }),
+    );
+  });
+
+  it("quotes the same exact amount on bill-query as payInvoice opened", async () => {
+    const { service } = build();
+
+    await expect(service.billQuery("booking-1")).resolves.toMatchObject({
+      stillPayable: true,
+      currentAmountMinor: 12345.43,
+    });
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/billing/billing.service.ts b/apps/edr-freight-api/src/modules/billing/billing.service.ts
index ea4413638..9a31466f0 100644
--- a/apps/edr-freight-api/src/modules/billing/billing.service.ts
+++ b/apps/edr-freight-api/src/modules/billing/billing.service.ts
@@ -12,6 +12,7 @@ import { DataSource, EntityManager, In } from "typeorm";
 
 import { Booking } from "../bookings/entities/booking.entity";
 import { CompaniesService } from "../companies/companies.service";
+import { FilesService } from "../files/files.service";
 import { applyBookingRefDirectionScope } from "../user-trade-access/trade-scope.util";
 import { PaymentService } from "../payment/payment.service";
 import { InitiateResponseDto, IntentStatusDto } from "../payment/payments.dto";
@@ -35,6 +36,14 @@ export interface PayInvoiceOptions {
   failureUrl?: string;
 }
 
+/** Booking context attached to a finance offline-USD invoice row. */
+export interface OfflineUsdBookingInfo {
+  id: string;
+  reference: string;
+  paymentDeadline: Date | null;
+  paymentStatus: string;
+}
+
 /** A single manual/offline settlement to record against an invoice. */
 export interface RecordPaymentInput {
   /** Amount settled by this payment; must be > 0. */
@@ -150,6 +159,7 @@ export class BillingService {
     private readonly payment: PaymentService,
     private readonly companies: CompaniesService,
     private readonly invoiceDocuments: InvoiceDocumentService,
+    private readonly files: FilesService,
   ) { }
 
   // ── Reads ──────────────────────────────────────────────────────────────────
@@ -214,6 +224,146 @@ export class BillingService {
     return { items, total };
   }
 
+  /**
+   * Finance's offline-settlement worklist: USD invoices (paid by bank transfer,
+   * never through the gateway), open ones by default or a single status when
+   * filtered. Booking-sourced rows carry the booking's reference and pay-window
+   * deadline so the UI can show the countdown and link to the booking.
+   */
+  async findOfflineUsdPaginated(
+    filter: {
+      status?: Freight.InvoiceStatus;
+      search?: string;
+      page?: number;
+      pageSize?: number;
+    } = {},
+  ): Promise<{
+    items: (Invoice & { booking: OfflineUsdBookingInfo | null })[];
+    total: number;
+  }> {
+    const page = filter.page && filter.page > 0 ? filter.page : 1;
+    const pageSize =
+      filter.pageSize && filter.pageSize > 0 ? filter.pageSize : 20;
+
+    const qb = this.dataSource
+      .getRepository(Invoice)
+      .createQueryBuilder("invoice")
+      .leftJoinAndSelect("invoice.company", "company")
+      .where("UPPER(invoice.currency) = 'USD'")
+      .orderBy("invoice.issuedAt", "DESC")
+      .skip((page - 1) * pageSize)
+      .take(pageSize);
+
+    if (filter.status) {
+      qb.andWhere("invoice.status = :status", { status: filter.status });
+    } else {
+      qb.andWhere("invoice.status IN (:...open)", { open: OPEN_STATUSES });
+    }
+    if (filter.search) {
+      qb.andWhere(
+        "(invoice.invoiceNumber ILIKE :search OR invoice.sourceId ILIKE :search)",
+        { search: `%${filter.search}%` },
+      );
+    }
+
+    const [items, total] = await qb.getManyAndCount();
+
+    const bookingIds = items
+      .filter((i) => i.source === "booking")
+      .map((i) => i.sourceId);
+    const bookings = bookingIds.length
+      ? await this.dataSource.getRepository(Booking).find({
+          where: { id: In(bookingIds) },
+          select: ["id", "reference", "paymentDeadline", "paymentStatus"],
+        })
+      : [];
+    const byId = new Map(bookings.map((b) => [b.id, b]));
+
+    return {
+      items: items.map((inv) => {
+        const b = byId.get(inv.sourceId);
+        return {
+          ...inv,
+          booking: b
+            ? {
+                id: b.id,
+                reference: b.reference,
+                paymentDeadline: b.paymentDeadline ?? null,
+                paymentStatus: b.paymentStatus,
+              }
+            : null,
+        } as Invoice & { booking: OfflineUsdBookingInfo | null };
+      }),
+      total,
+    };
+  }
+
+  /**
+   * Finance confirms a USD invoice as paid by bank transfer: stores the slip
+   * against the invoice and settles the FULL outstanding balance through
+   * {@link recordPayment}, which flips the invoice to PAID and (for bookings)
+   * emits `booking.invoice.paid` — the same event an online payment fires, so
+   * the booking advances exactly as if it had been paid through the gateway.
+   *
+   * Guarded by the booking's pay window: past the deadline the booking expires
+   * like any unpaid one, so confirmation is refused.
+   */
+  async confirmOfflinePayment(
+    invoiceId: string,
+    file: Express.Multer.File | undefined,
+    input: {
+      reference?: string | null;
+      userId?: string | null;
+      userName?: string | null;
+    },
+  ): Promise<Invoice> {
+    const invoice = await this.invoices.findById(invoiceId);
+    if (!invoice) throw new NotFoundException(`Invoice ${invoiceId} not found`);
+    if (invoice.currency?.toUpperCase() !== "USD") {
+      throw new BadRequestException(
+        "Offline confirmation is only for USD invoices — this invoice is paid online.",
+      );
+    }
+    if (!file) {
+      throw new BadRequestException("The bank payment slip file is required.");
+    }
+
+    if (invoice.source === "booking") {
+      const booking = await this.dataSource.getRepository(Booking).findOne({
+        where: { id: invoice.sourceId },
+        select: ["id", "paymentDeadline"],
+      });
+      const deadline = booking?.paymentDeadline;
+      if (deadline && new Date(deadline).getTime() < Date.now()) {
+        throw new BadRequestException(
+          "The payment window has closed — this booking can no longer be confirmed as paid.",
+        );
+      }
+    }
+
+    const slip = await this.files.upload({
+      resource: "invoice",
+      resourceId: invoice.id,
+      code: "OFFLINE_PAYMENT_SLIP",
+      file,
+      title: "Bank payment slip",
+      uploadedByUserId: input.userId ?? null,
+      uploadedByName: input.userName ?? null,
+    });
+
+    return this.recordPayment(invoiceId, {
+      amount: Number(invoice.balanceAmount),
+      method: "BANK_TRANSFER",
+      reference: input.reference || slip.name,
+      metadata: {
+        offline: true,
+        slipFileId: slip.id,
+        confirmedByUserId: input.userId ?? null,
+        confirmedByName: input.userName ?? null,
+      },
+    });
+  }
+
   /** Invoice header plus its line items. */
   async findById(id: string): Promise<Invoice & { lines: InvoiceLine[] }> {
     const invoice = await this.invoices.findById(id, {
@@ -1191,7 +1341,11 @@ export class BillingService {
       // service branches on a domain-specific reference type.
       referenceType: PaymentReferenceType.SHIPMENT,
       orderRef: invoice.invoiceNumber.replace(/-/g, "_"),
-      amountMinor: Math.round(Number(invoice.balanceAmount)),
+      // Exact balance, cents included. CBE bills this verbatim and /cbe/payment
+      // matches the debited amount to the cent (amountsMatchToTheCent), so any
+      // rounding here would overcharge the payer and leave the invoice balance
+      // non-zero. billQuery quotes the same unrounded value.
+      amountMinor: round2(Number(invoice.balanceAmount)),
       currency: invoice.currency,
       reason: `Payment for invoice ${invoice.invoiceNumber}`,
       method: opts.method ?? "TELEBIRR",
@@ -1336,7 +1490,10 @@ export class BillingService {
     });
 
     if (open) {
-      const balance = Math.round(Number(open.balanceAmount ?? open.totalAmount));
+      // Unrounded, matching payInvoice — the amount CBE quotes at the counter has
+      // to be the amount the intent was opened for, to the cent, or /cbe/payment
+      // sees a mismatch.
+      const balance = round2(Number(open.balanceAmount ?? open.totalAmount));
       const expired = open.dueAt && open.dueAt.getTime() < Date.now();
       return {
         stillPayable: balance > 0 && !expired,
@@ -1371,7 +1528,7 @@ export class BillingService {
     return {
       stillPayable: false,
       payerName: latest.company?.name ?? null,
-      currentAmountMinor: Math.round(Number(latest.totalAmount)),
+      currentAmountMinor: round2(Number(latest.totalAmount)),
       currency: latest.currency,
       paymentReason: `Freight invoice ${latest.invoiceNumber}`,
       reason: closedInvoiceReason(latest.status),
diff --git a/apps/edr-freight-api/src/modules/billing/eims-invoice.mapper.spec.ts b/apps/edr-freight-api/src/modules/billing/eims-invoice.mapper.spec.ts
new file mode 100644
index 000000000..fa0876310
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/billing/eims-invoice.mapper.spec.ts
@@ -0,0 +1,287 @@
+import {
+  EimsMapperContext,
+  EimsMapperInvoice,
+  EimsSellerDetails,
+  formatEimsDate,
+  toEimsInvoice,
+} from "./eims-invoice.mapper";
+
+const seller: EimsSellerDetails = {
+  City: null,
+  Email: "finance@edr.et",
+  HouseNumber: null,
+  LegalName: "Ethio-Djibouti Railway S.C.",
+  Locality: null,
+  Phone: "0911223344",
+  Region: "13",
+  SubCity: null,
+  Tin: "0016324478",
+  VatNumber: "3215840010",
+  Wereda: "574",
+};
+
+const invoice = (over: Partial<EimsMapperInvoice> = {}): EimsMapperInvoice => ({
+  invoiceNumber: "INV-20260807-00042",
+  currency: "ETB",
+  issuedAt: new Date(2026, 7, 7, 9, 5, 3),
+  totalAmount: "11000.00",
+  company: {
+    name: "ABC Trading PLC",
+    tin: "0999930000",
+    vatNumber: "123475885858",
+    phone: "0912345678",
+    email: "buyer@abc.et",
+    region: "13",
+    zone: "SHA",
+    woreda: "574",
+    kebele: "03",
+    houseNo: "NEW",
+    country: "Ethiopia",
+  },
+  lines: [
+    { chargeType: "RAIL_FREIGHT", description: "Addis → Djibouti", quantity: "1.00", unitRate: "10000.00", amount: "10000.00" },
+    { chargeType: "HAZARD_SURCHARGE", description: null, quantity: "2.00", unitRate: "500.00", amount: "1000.00", metadata: { unit: "CTR" } },
+  ],
+  ...over,
+});
+
+const context = (over: Partial<EimsMapperContext> = {}): EimsMapperContext => ({
+  systemNumber: "B0360154BA",
+  systemType: "SYS",
+  documentNumber: "24",
+  invoiceCounter: 7,
+  previousIrn: "",
+  cashierName: null,
+  salesPersonName: null,
+  transactionType: "B2B",
+  payment: { mode: "CASH", term: "IMMIDIATE" },
+  taxForLine: () => ({ code: "VAT15", ratePercent: 15, exciseTaxValue: 0 }),
+  natureOfSupplies: "Service",
+  unitDefault: "PCS",
+  incomeWithholdValue: 0,
+  transactionWithholdValue: 0,
+  buyerRegionCodes: { "Addis Ababa": "13" },
+  buyerWeredaCodes: {},
+  ...over,
+});
+
+describe("toEimsInvoice", () => {
+  it("emits the ten EIMS sections with the collection's field names", () => {
+    const doc = toEimsInvoice(invoice(), seller, context());
+
+    expect(Object.keys(doc)).toEqual([
+      "BuyerDetails",
+      "DocumentDetails",
+      "ItemList",
+      "PaymentDetails",
+      "ReferenceDetails",
+      "SellerDetails",
+      "SourceSystem",
+      "TransactionType",
+      "ValueDetails",
+      "Version",
+    ]);
+    expect(doc.Version).toBe("1");
+    expect(doc.DocumentDetails).toEqual({ DocumentNumber: "24", Date: "07-08-2026T09:05:03", Type: "INV" });
+    expect(doc.SourceSystem.InvoiceCounter).toBe(7);
+    expect(doc.SellerDetails).toBe(seller);
+  });
+
+  it("maps the buyer from the company row and leaves unmodelled fields null", () => {
+    const doc = toEimsInvoice(invoice(), seller, context());
+
+    expect(doc.BuyerDetails).toEqual({
+      City: null,
+      Email: "buyer@abc.et",
+      HouseNumber: "NEW",
+      IdNumber: null,
+      IdType: null,
+      Tin: "0999930000",
+      LegalName: "ABC Trading PLC",
+      Phone: "0912345678",
+      Region: "13",
+      Country: null,
+      Zone: "SHA",
+      Kebele: "03",
+      VatNumber: "123475885858",
+      Wereda: "574",
+    });
+  });
+
+  it("applies per-line tax and totals it into ValueDetails", () => {
+    const doc = toEimsInvoice(
+      invoice(),
+      seller,
+      context({
+        taxForLine: (line) =>
+          line.chargeType === "RAIL_FREIGHT"
+            ? { code: "VAT15", ratePercent: 15, exciseTaxValue: 0 }
+            : { code: "EXEMPT", ratePercent: 0, exciseTaxValue: 50 },
+      }),
+    );
+
+    expect(doc.ItemList[0]).toMatchObject({
+      LineNumber: 1,
+      ItemCode: "RAIL_FREIGHT",
+      ProductDescription: "Addis → Djibouti",
+      Quantity: 1,
+      UnitPrice: 10000,
+      PreTaxValue: 10000,
+      TaxCode: "VAT15",
+      TaxAmount: 1500,
+      ExciseTaxValue: 0,
+      TotalLineAmount: 11500,
+      Unit: "PCS",
+      NatureOfSupplies: "service",
+      HarmonizationCode: null,
+    });
+    expect(doc.ItemList[1]).toMatchObject({
+      LineNumber: 2,
+      ProductDescription: "HAZARD_SURCHARGE",
+      TaxCode: "EXEMPT",
+      TaxAmount: 0,
+      ExciseTaxValue: 50,
+      TotalLineAmount: 1050,
+      Unit: "CTR",
+    });
+    expect(doc.ValueDetails).toEqual({
+      Discount: null,
+      ExciseValue: 50,
+      IncomeWithholdValue: 0,
+      TaxValue: 1500,
+      TotalValue: 12550,
+      TransactionWithholdValue: 0,
+      InvoiceCurrency: "ETB",
+    });
+  });
+
+  it("passes PreviousIrn through verbatim and defaults RelatedDocument to null", () => {
+    expect(toEimsInvoice(invoice(), seller, context()).ReferenceDetails).toEqual({
+      PreviousIrn: "",
+      RelatedDocument: null,
+    });
+    expect(
+      toEimsInvoice(invoice(), seller, context({ previousIrn: null, relatedDocument: "CN-9" }))
+        .ReferenceDetails,
+    ).toEqual({ PreviousIrn: null, RelatedDocument: "CN-9" });
+  });
+
+  it("emits ExchangeRate only when supplied", () => {
+    expect(toEimsInvoice(invoice(), seller, context()).ValueDetails.ExchangeRate).toBeUndefined();
+
+    const usd = toEimsInvoice(
+      invoice({ currency: "USD" }),
+      seller,
+      context({ exchangeRate: 132.5 }),
+    );
+    expect(usd.ValueDetails).toMatchObject({ InvoiceCurrency: "USD", ExchangeRate: 132.5 });
+  });
+
+  it("honours a caller-supplied date formatter", () => {
+    const doc = toEimsInvoice(invoice(), seller, context({ formatDate: () => "2026-08-07T09:05:03Z" }));
+    expect(doc.DocumentDetails.Date).toBe("2026-08-07T09:05:03Z");
+  });
+
+  it("throws when tax treatment cannot be resolved for a line", () => {
+    expect(() =>
+      toEimsInvoice(
+        invoice(),
+        seller,
+        context({ taxForLine: () => ({ code: "", ratePercent: 15, exciseTaxValue: 0 }) }),
+      ),
+    ).toThrow(/unresolved tax treatment for line 1/);
+  });
+
+  it("throws on a missing buyer TIN, no lines, or an unissued invoice", () => {
+    expect(() => toEimsInvoice(invoice({ company: null }), seller, context())).toThrow(/buyer company TIN/);
+    expect(() => toEimsInvoice(invoice({ lines: [] }), seller, context())).toThrow(/has no lines/);
+    expect(() => toEimsInvoice(invoice({ issuedAt: null }), seller, context())).toThrow(/not issued/);
+  });
+
+  it("throws when the lines do not sum to the invoice total", () => {
+    expect(() => toEimsInvoice(invoice({ totalAmount: "9000.00" }), seller, context())).toThrow(
+      /lines sum to 11000 but the invoice total is 9000/,
+    );
+  });
+
+  it("throws on a non-ETB invoice with no exchange rate", () => {
+    expect(() => toEimsInvoice(invoice({ currency: "USD" }), seller, context())).toThrow(/needs an exchangeRate/);
+  });
+});
+
+describe("toEimsInvoice — MoR field constraints", () => {
+  it("passes a buyer region through when it is already a MoR code", () => {
+    const doc = toEimsInvoice(invoice(), seller, context());
+    expect(doc.BuyerDetails.Region).toBe("13");
+  });
+
+  it("maps a region name to its code, ignoring case and spacing", () => {
+    const doc = toEimsInvoice(
+      invoice({ company: { ...invoice().company!, region: "  addis   ababa " } }),
+      seller,
+      context({ buyerRegionCodes: { "Addis Ababa": "13" } }),
+    );
+    expect(doc.BuyerDetails.Region).toBe("13");
+  });
+
+  it("refuses to file a buyer whose region has no mapping", () => {
+    expect(() =>
+      toEimsInvoice(
+        invoice({ company: { ...invoice().company!, region: "Somewhere Else" } }),
+        seller,
+        context(),
+      ),
+    ).toThrow(/not a MoR Region code and has no mapping/);
+  });
+
+  it("refuses a buyer with no region at all rather than guessing one", () => {
+    expect(() =>
+      toEimsInvoice(
+        invoice({ company: { ...invoice().company!, region: null } }),
+        seller,
+        context(),
+      ),
+    ).toThrow(/buyer Region \(unset\)/);
+  });
+
+  it("passes a buyer wereda through when it is already a MoR code", () => {
+    const doc = toEimsInvoice(invoice(), seller, context());
+    expect(doc.BuyerDetails.Wereda).toBe("574");
+  });
+
+  it("maps a wereda name to its code", () => {
+    const doc = toEimsInvoice(
+      invoice({ company: { ...invoice().company!, woreda: "Yeka" } }),
+      seller,
+      context({ buyerWeredaCodes: { Yeka: "99" } }),
+    );
+    expect(doc.BuyerDetails.Wereda).toBe("99");
+  });
+
+  it("refuses to file a buyer whose wereda has no mapping", () => {
+    expect(() =>
+      toEimsInvoice(
+        invoice({ company: { ...invoice().company!, woreda: "Yeka" } }),
+        seller,
+        context({ buyerWeredaCodes: {} }),
+      ),
+    ).toThrow(/buyer Wereda "Yeka".*EIMS_BUYER_WEREDA_CODES/);
+  });
+
+  it("emits NatureOfSupplies lowercase, whatever case it was configured in", () => {
+    const doc = toEimsInvoice(invoice(), seller, context({ natureOfSupplies: "Service" }));
+    expect(doc.ItemList[0].NatureOfSupplies).toBe("service");
+  });
+
+  it("rejects a NatureOfSupplies MoR does not accept", () => {
+    expect(() =>
+      toEimsInvoice(invoice(), seller, context({ natureOfSupplies: "Services" })),
+    ).toThrow(/must be one of goods, service/);
+  });
+});
+
+describe("formatEimsDate", () => {
+  it("renders the observed dd-MM-yyyyTHH:mm:ss shape with zero padding", () => {
+    expect(formatEimsDate(new Date(2025, 2, 21, 0, 0, 0))).toBe("21-03-2025T00:00:00");
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/billing/eims-invoice.mapper.ts b/apps/edr-freight-api/src/modules/billing/eims-invoice.mapper.ts
new file mode 100644
index 000000000..0c4b40829
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/billing/eims-invoice.mapper.ts
@@ -0,0 +1,441 @@
+/**
+ * Pure mapper from an EDR invoice onto the Ethiopian MoR EIMS registration document
+ * (`POST https://core.mor.gov.et/v1/register`).
+ *
+ * Field names, casing and section layout are taken verbatim from the supplied
+ * `EimsCoreApiMockCollection2.postman_collection.json`. Note the payload spells the district
+ * `Wereda` even though the collection *variable* is named `sellerWoreda`.
+ *
+ * Scope: mapping only — no HTTP, no signing, no persistence, no counter allocation. Everything
+ * that does not live on the invoice (document number, counters, previous IRN, seller identity,
+ * tax treatment) is supplied by the caller and is never guessed here.
+ *
+ * Values that the collection only *demonstrates* by example — the date format, the meaning of an
+ * empty `PreviousIrn`, the `SystemType` enum, `PaymentTerm` values — are treated as observed, not
+ * authoritative: they are passed through or overridable rather than validated against a fixed set.
+ */
+
+import { round2 } from "./invoice-settlement.util";
+
+/** Only proven-required constant: the 400 SCHEMA ERROR sample rejects a payload without it. */
+const EIMS_VERSION = "1";
+
+/** The only `DocumentDetails.Type` observed in the supplied material. */
+const EIMS_DOCUMENT_TYPE = "INV";
+
+export interface EimsBuyerDetails {
+  City: string | null;
+  Email: string | null;
+  HouseNumber: string | null;
+  IdNumber: string | null;
+  IdType: string | null;
+  Tin: string;
+  LegalName: string;
+  Phone: string | null;
+  Region: string | null;
+  Country: string | null;
+  Zone: string | null;
+  Kebele: string | null;
+  VatNumber: string | null;
+  Wereda: string | null;
+}
+
+export interface EimsSellerDetails {
+  City: string | null;
+  Email: string | null;
+  HouseNumber: string | null;
+  LegalName: string;
+  Locality: string | null;
+  Phone: string | null;
+  /** MoR region *code* (e.g. "13"), not a region name. */
+  Region: string | null;
+  SubCity: string | null;
+  Tin: string;
+  VatNumber: string | null;
+  /** MoR wereda *code* (e.g. "574"). */
+  Wereda: string | null;
+}
+
+export interface EimsDocumentDetails {
+  DocumentNumber: string;
+  /** Observed format `dd-MM-yyyyTHH:mm:ss`. Rule seen in the collection: within 3 days of now. */
+  Date: string;
+  Type: string;
+}
+
+export interface EimsInvoiceItem {
+  Discount: number;
+  ExciseTaxValue: number;
+  HarmonizationCode: string | null;
+  NatureOfSupplies: string;
+  ItemCode: string;
+  ProductDescription: string;
+  PreTaxValue: number;
+  Quantity: number;
+  LineNumber: number;
+  TaxAmount: number;
+  TaxCode: string;
+  TotalLineAmount: number;
+  Unit: string;
+  UnitPrice: number;
+}
+
+export interface EimsPaymentDetails {
+  Mode: string;
+  PaymentTerm: string;
+}
+
+export interface EimsReferenceDetails {
+  PreviousIrn: string | null;
+  RelatedDocument: string | null;
+}
+
+export interface EimsSourceSystem {
+  CashierName: string | null;
+  InvoiceCounter: number;
+  SalesPersonName: string | null;
+  SystemNumber: string;
+  SystemType: string;
+}
+
+export interface EimsValueDetails {
+  Discount: number | null;
+  ExciseValue: number;
+  IncomeWithholdValue: number;
+  TaxValue: number;
+  TotalValue: number;
+  TransactionWithholdValue: number;
+  InvoiceCurrency: string;
+  /** Absent from the register sample, present on the verify response. Emitted only when supplied. */
+  ExchangeRate?: number;
+}
+
+export interface EimsInvoiceRequest {
+  BuyerDetails: EimsBuyerDetails;
+  DocumentDetails: EimsDocumentDetails;
+  ItemList: EimsInvoiceItem[];
+  PaymentDetails: EimsPaymentDetails;
+  ReferenceDetails: EimsReferenceDetails;
+  SellerDetails: EimsSellerDetails;
+  SourceSystem: EimsSourceSystem;
+  TransactionType: string;
+  ValueDetails: EimsValueDetails;
+  Version: string;
+}
+
+/** `body` of a successful `POST /v1/register`, as observed in the collection. */
+export interface EimsRegisterResponseBody {
+  irn: string;
+  ackDate: string;
+  signedQR: string;
+  signedInvoice: string;
+  status: string;
+  documentNumber: string;
+  errorMessage: string | null;
+}
+
+/** Numeric columns arrive from pg as strings; every money field is normalised through `num`. */
+export interface EimsMapperLine {
+  chargeType: string;
+  description?: string | null;
+  quantity: number | string;
+  unitRate: number | string;
+  amount: number | string;
+  metadata?: Record<string, unknown> | null;
+}
+
+export interface EimsMapperCompany {
+  name: string;
+  tin: string;
+  vatNumber?: string | null;
+  phone?: string | null;
+  email?: string | null;
+  region?: string | null;
+  zone?: string | null;
+  woreda?: string | null;
+  kebele?: string | null;
+  houseNo?: string | null;
+  country?: string | null;
+}
+
+/**
+ * Structurally what `BillingService.findById` returns — the only read path that loads the header,
+ * the buyer company and the lines together.
+ */
+export interface EimsMapperInvoice {
+  invoiceNumber: string;
+  currency: string;
+  issuedAt?: Date | string | null;
+  totalAmount: number | string;
+  company?: EimsMapperCompany | null;
+  lines: EimsMapperLine[];
+}
+
+/**
+ * Tax treatment for a single line. EIMS models `TaxCode`/`TaxAmount`/`ExciseTaxValue` per item, and
+ * different charge types may eventually be treated differently, so this is resolved per line.
+ *
+ * Nothing in this repo can supply it: `Invoice.taxAmount` is hardcoded to 0 with no caller ever
+ * setting it, `invoice_lines` has no tax column, and the rate catalogue has no fiscal field. That
+ * is the absence of a tax model, not evidence of zero-rating — hence no default here.
+ */
+export interface EimsLineTax {
+  code: string;
+  ratePercent: number;
+  exciseTaxValue: number;
+}
+
+export interface EimsMapperContext {
+  systemNumber: string;
+  /** Observed values: POS, MAN, CRM, EFD, SYS (the collection prose also mentions ERP). */
+  systemType: string;
+  /** Caller decides the source — our own `invoiceNumber` or a dedicated EIMS sequence. */
+  documentNumber: string;
+  invoiceCounter: number;
+  /** Passed through verbatim; the collection shows `""` used for an unchained document. */
+  previousIrn: string | null;
+  cashierName: string | null;
+  salesPersonName: string | null;
+  /** B2B / B2C — a tax classification, so the caller states it. */
+  transactionType: string;
+  payment: { mode: string; term: string };
+  /** Must return a treatment for every line, or throw. */
+  taxForLine: (line: EimsMapperLine, lineNumber: number) => EimsLineTax;
+  natureOfSupplies: string;
+  /** Used when a line carries no `metadata.unit`. */
+  unitDefault: string;
+  incomeWithholdValue: number;
+  transactionWithholdValue: number;
+  /** Null for an ordinary invoice; set only for a real related-document case. */
+  relatedDocument?: string | null;
+  /** MoR numeric country code for the buyer; our DB stores the country name. */
+  buyerCountryCode?: string | null;
+  /**
+   * Region name → MoR numeric code, for buyers whose stored region is free text.
+   *
+   * `companies.region` holds names ("Addis Ababa") while MoR validates `BuyerDetails.Region`
+   * against `^[0-9]{1,3}$`. A stored value that is already a code passes through; anything else
+   * must be in this map or the mapping **fails locally** — sending a guessed region code onto a
+   * tax document is worse than refusing to file.
+   */
+  buyerRegionCodes: Record<string, string>;
+  /**
+   * Wereda name → MoR code, same shape as `buyerRegionCodes`. `companies.woreda` holds names
+   * ("Yeka") or codes inconsistently; unlike Region, MoR has never named a Wereda regex in an
+   * error, so this is precautionary rather than confirmed — but the fix is identical either way:
+   * fail locally on an unmapped name rather than file a guess.
+   */
+  buyerWeredaCodes: Record<string, string>;
+  buyerIdType?: string | null;
+  buyerIdNumber?: string | null;
+  buyerCity?: string | null;
+  /** Required when the invoice currency is not ETB. */
+  exchangeRate?: number | null;
+  invoiceDiscount?: number | null;
+  /** Override while the observed `dd-MM-yyyyTHH:mm:ss` format is unconfirmed by MoR. */
+  formatDate?: (issuedAt: Date) => string;
+}
+
+/**
+ * MoR's own constraint on `Region`: one to three digits, confirmed by its 400 SCHEMA ERROR. Reused
+ * as the pass-through test for `Wereda` too — every Wereda value MoR has actually shown us (seller
+ * "12"/"13", the collection's "574") fits the same shape, though MoR has not named a Wereda regex
+ * the way it named Region's.
+ */
+const LOCATION_CODE = /^[0-9]{1,3}$/;
+
+/**
+ * The only two values MoR accepts for `NatureOfSupplies`, lowercase.
+ *
+ * Its schema branches on this as a `oneOf` with a `const` per branch, so `"Service"` fails the
+ * whole `ItemList` — the error reads "must be the constant value 'service'".
+ */
+const NATURE_OF_SUPPLIES = ["goods", "service"] as const;
+
+const num = (v: number | string): number => {
+  const n = Number(v);
+  if (!Number.isFinite(n)) throw new Error(`EIMS mapping: expected a numeric value, got ${String(v)}`);
+  return n;
+};
+
+const pad = (n: number, width = 2): string => String(n).padStart(width, "0");
+
+/** Observed EIMS document-date format: `dd-MM-yyyyTHH:mm:ss`, no timezone marker. */
+export const formatEimsDate = (issuedAt: Date): string =>
+  `${pad(issuedAt.getDate())}-${pad(issuedAt.getMonth() + 1)}-${issuedAt.getFullYear()}` +
+  `T${pad(issuedAt.getHours())}:${pad(issuedAt.getMinutes())}:${pad(issuedAt.getSeconds())}`;
+
+/**
+ * Map one loaded invoice onto an EIMS registration document.
+ *
+ * Throws rather than emitting a payload EIMS would reject opaquely: missing buyer TIN, no lines,
+ * an unissued invoice, unresolved line tax, a line/total mismatch, or a non-ETB invoice with no
+ * exchange rate.
+ */
+/**
+ * A buyer's location value (Region or Wereda) as a MoR code: passed through when already numeric,
+ * otherwise looked up by name (case- and space-insensitive). Throws when neither applies — sending
+ * a guessed code onto a tax document is worse than refusing to file.
+ */
+function resolveLocationCode(
+  field: "Region" | "Wereda",
+  value: string | null | undefined,
+  codes: Record<string, string>,
+  envVar: string,
+  invoiceNumber: string,
+): string {
+  const raw = (value ?? "").trim();
+  if (LOCATION_CODE.test(raw)) return raw;
+
+  const key = raw.toLowerCase().replace(/\s+/g, " ");
+  const mapped = Object.entries(codes).find(
+    ([name]) => name.trim().toLowerCase().replace(/\s+/g, " ") === key,
+  )?.[1];
+  if (mapped && LOCATION_CODE.test(mapped)) return mapped;
+
+  throw new Error(
+    `EIMS mapping: invoice ${invoiceNumber} has buyer ${field} ${raw ? `"${raw}"` : "(unset)"}, ` +
+      `which is not a MoR ${field} code and has no mapping. Add it to ${envVar}.`,
+  );
+}
+
+export function toEimsInvoice(
+  invoice: EimsMapperInvoice,
+  seller: EimsSellerDetails,
+  context: EimsMapperContext,
+): EimsInvoiceRequest {
+  const company = invoice.company;
+  if (!company || !company.tin?.trim()) {
+    throw new Error(`EIMS mapping: invoice ${invoice.invoiceNumber} has no buyer company TIN`);
+  }
+  if (!invoice.lines?.length) {
+    throw new Error(`EIMS mapping: invoice ${invoice.invoiceNumber} has no lines`);
+  }
+  if (!invoice.issuedAt) {
+    throw new Error(`EIMS mapping: invoice ${invoice.invoiceNumber} is not issued (issuedAt is null)`);
+  }
+  if (invoice.currency !== "ETB" && context.exchangeRate == null) {
+    throw new Error(
+      `EIMS mapping: invoice ${invoice.invoiceNumber} is in ${invoice.currency} and needs an exchangeRate`,
+    );
+  }
+
+  const issuedAt = invoice.issuedAt instanceof Date ? invoice.issuedAt : new Date(invoice.issuedAt);
+  if (Number.isNaN(issuedAt.getTime())) {
+    throw new Error(`EIMS mapping: invoice ${invoice.invoiceNumber} has an unparseable issuedAt`);
+  }
+
+  const natureOfSupplies = context.natureOfSupplies.trim().toLowerCase();
+  if (!NATURE_OF_SUPPLIES.includes(natureOfSupplies as (typeof NATURE_OF_SUPPLIES)[number])) {
+    throw new Error(
+      `EIMS mapping: NatureOfSupplies must be one of ${NATURE_OF_SUPPLIES.join(", ")}, ` +
+        `got "${context.natureOfSupplies}"`,
+    );
+  }
+
+  const ItemList: EimsInvoiceItem[] = invoice.lines.map((line, index) => {
+    const lineNumber = index + 1;
+    const tax = context.taxForLine(line, lineNumber);
+    if (!tax || !tax.code || !Number.isFinite(tax.ratePercent) || !Number.isFinite(tax.exciseTaxValue)) {
+      throw new Error(
+        `EIMS mapping: unresolved tax treatment for line ${lineNumber} (${line.chargeType}) ` +
+          `on invoice ${invoice.invoiceNumber}`,
+      );
+    }
+
+    const PreTaxValue = round2(num(line.amount));
+    const TaxAmount = round2((PreTaxValue * tax.ratePercent) / 100);
+    const ExciseTaxValue = round2(tax.exciseTaxValue);
+    const unit = typeof line.metadata?.unit === "string" ? line.metadata.unit : context.unitDefault;
+
+    return {
+      Discount: 0,
+      ExciseTaxValue,
+      HarmonizationCode: null,
+      NatureOfSupplies: natureOfSupplies,
+      ItemCode: line.chargeType,
+      ProductDescription: line.description?.trim() || line.chargeType,
+      PreTaxValue,
+      Quantity: round2(num(line.quantity)),
+      LineNumber: lineNumber,
+      TaxAmount,
+      TaxCode: tax.code,
+      TotalLineAmount: round2(PreTaxValue + TaxAmount + ExciseTaxValue),
+      Unit: unit,
+      UnitPrice: round2(num(line.unitRate)),
+    };
+  });
+
+  const preTaxTotal = round2(ItemList.reduce((sum, item) => sum + item.PreTaxValue, 0));
+  const invoiceTotal = round2(num(invoice.totalAmount));
+  if (Math.abs(preTaxTotal - invoiceTotal) > 0.01) {
+    throw new Error(
+      `EIMS mapping: invoice ${invoice.invoiceNumber} lines sum to ${preTaxTotal} ` +
+        `but the invoice total is ${invoiceTotal}`,
+    );
+  }
+
+  const ValueDetails: EimsValueDetails = {
+    Discount: context.invoiceDiscount ?? null,
+    ExciseValue: round2(ItemList.reduce((sum, item) => sum + item.ExciseTaxValue, 0)),
+    IncomeWithholdValue: context.incomeWithholdValue,
+    TaxValue: round2(ItemList.reduce((sum, item) => sum + item.TaxAmount, 0)),
+    TotalValue: round2(ItemList.reduce((sum, item) => sum + item.TotalLineAmount, 0)),
+    TransactionWithholdValue: context.transactionWithholdValue,
+    InvoiceCurrency: invoice.currency,
+  };
+  if (context.exchangeRate != null) ValueDetails.ExchangeRate = context.exchangeRate;
+
+  return {
+    BuyerDetails: {
+      City: context.buyerCity ?? null,
+      Email: company.email ?? null,
+      HouseNumber: company.houseNo ?? null,
+      IdNumber: context.buyerIdNumber ?? null,
+      IdType: context.buyerIdType ?? null,
+      Tin: company.tin,
+      LegalName: company.name,
+      Phone: company.phone ?? null,
+      Region: resolveLocationCode(
+        "Region",
+        company.region,
+        context.buyerRegionCodes,
+        "EIMS_BUYER_REGION_CODES",
+        invoice.invoiceNumber,
+      ),
+      Country: context.buyerCountryCode ?? null,
+      Zone: company.zone ?? null,
+      Kebele: company.kebele ?? null,
+      VatNumber: company.vatNumber ?? null,
+      Wereda: resolveLocationCode(
+        "Wereda",
+        company.woreda,
+        context.buyerWeredaCodes,
+        "EIMS_BUYER_WEREDA_CODES",
+        invoice.invoiceNumber,
+      ),
+    },
+    DocumentDetails: {
+      DocumentNumber: context.documentNumber,
+      Date: (context.formatDate ?? formatEimsDate)(issuedAt),
+      Type: EIMS_DOCUMENT_TYPE,
+    },
+    ItemList,
+    PaymentDetails: { Mode: context.payment.mode, PaymentTerm: context.payment.term },
+    ReferenceDetails: {
+      PreviousIrn: context.previousIrn,
+      RelatedDocument: context.relatedDocument ?? null,
+    },
+    SellerDetails: seller,
+    SourceSystem: {
+      CashierName: context.cashierName,
+      InvoiceCounter: context.invoiceCounter,
+      SalesPersonName: context.salesPersonName,
+      SystemNumber: context.systemNumber,
+      SystemType: context.systemType,
+    },
+    TransactionType: context.transactionType,
+    ValueDetails,
+    Version: EIMS_VERSION,
+  };
+}
diff --git a/apps/edr-freight-api/src/modules/billing/entities/invoice.entity.ts b/apps/edr-freight-api/src/modules/billing/entities/invoice.entity.ts
index 23c332f80..411d15ebe 100644
--- a/apps/edr-freight-api/src/modules/billing/entities/invoice.entity.ts
+++ b/apps/edr-freight-api/src/modules/billing/entities/invoice.entity.ts
@@ -1,6 +1,7 @@
 import { BaseEntity } from "@edr/api-common";
 import { Freight } from "@edr/types";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import type { EimsInvoiceError, EimsInvoiceStatus } from "../../eims/eims-registration.types";
 import { PaymentEntity } from "../../payment/entities/payment.entity";
 import { Company } from "../../companies/entities/company.entity";
 import { CompanyProfile } from "../../companies/entities/company-profile.entity";
@@ -105,4 +106,31 @@ export class Invoice extends BaseEntity {
 
   @Column({ name: "due_at", type: "timestamptz" })
   dueAt!: Date;
+
+  /** MoR EIMS registration state. Set only by the EIMS module; billing never writes these. */
+  @Column({ name: "eims_status", type: "varchar", length: 20, default: "NOT_SUBMITTED" })
+  eimsStatus!: EimsInvoiceStatus;
+
+  /** Invoice Reference Number returned by EIMS. Unique across invoices (partial index). */
+  @Column({ name: "eims_irn", type: "varchar", length: 64, nullable: true })
+  eimsIrn?: string | null;
+
+  /** The numeric `DocumentDetails.DocumentNumber` filed for this invoice. */
+  @Column({ name: "eims_document_number", type: "varchar", length: 16, nullable: true })
+  eimsDocumentNumber?: string | null;
+
+  /** The `SourceSystem.InvoiceCounter` this invoice consumed. */
+  @Column({ name: "eims_invoice_counter", type: "bigint", nullable: true })
+  eimsInvoiceCounter?: number | null;
+
+  @Column({ name: "eims_submitted_at", type: "timestamptz", nullable: true })
+  eimsSubmittedAt?: Date | null;
+
+  /** EIMS acknowledgement timestamp, stored verbatim — it is a Java ZonedDateTime string. */
+  @Column({ name: "eims_ack_date", type: "varchar", length: 64, nullable: true })
+  eimsAckDate?: string | null;
+
+  /** Sanitized last failure: the gateway's own error fields only, never our signed envelope. */
+  @Column({ name: "eims_last_error", type: "jsonb", nullable: true })
+  eimsLastError?: EimsInvoiceError | null;
 }
diff --git a/apps/edr-freight-api/src/modules/billing/portal-billing.controller.ts b/apps/edr-freight-api/src/modules/billing/portal-billing.controller.ts
index 981233df0..90f6a32a4 100644
--- a/apps/edr-freight-api/src/modules/billing/portal-billing.controller.ts
+++ b/apps/edr-freight-api/src/modules/billing/portal-billing.controller.ts
@@ -12,6 +12,7 @@ import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger";
 import type { Response } from "express";
 import { CurrentUser } from "@edr/api-common";
 
+import { PortalCustomer } from "../../common/booking-guards";
 import {
   type AuthUserPayload,
   resolveAuthUserId,
@@ -28,6 +29,7 @@ import { ConfirmOtpDto, PayInvoiceDto } from "./dto/pay-invoice.dto";
 @ApiTags("billing")
 @ApiBearerAuth()
 @Controller("billing")
+@PortalCustomer()
 export class PortalBillingController {
   constructor(private readonly billingService: BillingService) {}
 
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
index cd803d719..91b8362e4 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
@@ -20,6 +20,10 @@ import { FirstMileService } from "../first-mile/first-mile.service";
 import { BookingBatchService } from "../train-scheduling/booking-batch.service";
 import { PriceLineItemDto } from "./dto/generate-price-response.dto";
 import { BookingsRepository } from "./bookings.repository";
+import {
+  BookingWagonCancellationService,
+  WAGON_CANCEL_FEE_INVOICE_TYPE,
+} from "./booking-wagon-cancellation.service";
 import { Booking } from "./entities/booking.entity";
 
 /** Snapshot written onto `booking.pricingBreakdown` by the pricing service. */
@@ -58,6 +62,8 @@ export class BookingInvoiceService {
     private readonly firstMile: FirstMileService,
     @Inject(forwardRef(() => BookingBatchService))
     private readonly bookingBatch: BookingBatchService,
+    @Inject(forwardRef(() => BookingWagonCancellationService))
+    private readonly wagonCancellations: BookingWagonCancellationService,
   ) { }
 
   /**
@@ -90,6 +96,21 @@ export class BookingInvoiceService {
     return this.billing.generateInvoice(input);
   }
 
+  /**
+   * Cancel the booking's open PREPAID invoice, if any — used when a
+   * changes-requested resubmit restates the cargo, so the re-priced booking can
+   * be re-invoiced. Throws when the invoice already has payments recorded
+   * (cargo must not change out from under recorded money).
+   */
+  async cancelUnpaidInvoiceForBooking(bookingId: string): Promise<void> {
+    const existing = await this.billing.findPayable(
+      Freight.InvoiceSource.Booking,
+      bookingId,
+      "PREPAID",
+    );
+    if (existing) await this.billing.cancelInvoice(existing.id);
+  }
+
   /**
    * React to a booking invoice being paid — the settlement branch point. Per-type
    * reactions live here (not in the payment process): each invoice type advances
@@ -108,6 +129,11 @@ export class BookingInvoiceService {
         await this.bookingBatch.reviveOfferForInvoice(payload.invoiceId);
         await this.advanceBookingOnPayment(payload.sourceId);
         break;
+      case WAGON_CANCEL_FEE_INVOICE_TYPE:
+        // Partial wagon cancellation: the fee settled — reduce the booking and
+        // release the cancelled wagons (T2 of the cancellation cycle).
+        await this.wagonCancellations.onFeePaid(payload.invoiceId);
+        break;
       default:
         this.logger.warn(
           `Unhandled booking invoice type "${payload.type}" paid (${payload.invoiceId})`,
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.spec.ts b/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.spec.ts
index 2c21d804c..9a5960295 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.spec.ts
@@ -1,5 +1,6 @@
 import { BookingLifecycleNotifierService } from './booking-lifecycle-notifier.service';
 import type { Booking } from './entities/booking.entity';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
 /**
  * Who hears "Operations wants changes" depends on who owns the booking. A
@@ -74,3 +75,39 @@ describe('BookingLifecycleNotifierService — operation changes requested', () =
     expect(inbox.notify.mock.calls[0][0].recipients).toEqual({ companyId: 'co-1' });
   });
 });
+
+/**
+ * Staff notifications used to go to every employee in every organization. They
+ * now target a desk — and the two desks are disjoint: the GL presets hold no
+ * bookings:view and no intake keys, so intake pings would be noise they cannot
+ * act on. Both branches run through the same `inAppStaff` helper, which is the
+ * easy place to lose the distinction again.
+ */
+describe('BookingLifecycleNotifierService — staff desk targeting', () => {
+  const booking = () =>
+    ({ id: 'b-1', reference: 'BKG-0001', companyId: 'co-1' }) as Booking;
+
+  let inbox: { notify: jest.Mock };
+  let service: BookingLifecycleNotifierService;
+
+  beforeEach(() => {
+    inbox = { notify: jest.fn().mockResolvedValue(undefined) };
+    service = new BookingLifecycleNotifierService(
+      { directSend: jest.fn().mockResolvedValue(undefined) } as never,
+      inbox as never,
+      { query: jest.fn().mockResolvedValue([]) } as never,
+    );
+  });
+
+  it('routes intake items to the booking desk and clearance items to the clearance desk', () => {
+    service.submittedToStaff(booking());
+    service.clearanceDocsUploadedToStaff(booking());
+
+    expect(inbox.notify.mock.calls[0][0].recipients).toEqual({
+      permissionKeys: [FREIGHT_PERMS.bookings.getNotification],
+    });
+    expect(inbox.notify.mock.calls[1][0].recipients).toEqual({
+      permissionKeys: [FREIGHT_PERMS.bookings.clearanceGetNotification],
+    });
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.ts
index 6245195eb..eff15ec3d 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-lifecycle-notifier.service.ts
@@ -10,7 +10,17 @@ import {
 import { Booking } from './entities/booking.entity';
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
-import { resolveCompanyNotifyPhone } from '../notifications/resolve-company-phone.util';
+import { resolveCompanyNotifyContact } from '../notifications/resolve-company-phone.util';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
+
+/**
+ * Clearance items are worked by the GL desks, which hold no bookings:view and
+ * no intake keys — so they take their own selector rather than the booking
+ * desk's. Every override using this deep-links to a clearance page.
+ */
+const CLEARANCE_DESK = {
+  permissionKeys: [FREIGHT_PERMS.bookings.clearanceGetNotification],
+};
 
 /**
  * Customer + staff notifications for the booking lifecycle: review, clearance
@@ -45,10 +55,13 @@ export class BookingLifecycleNotifierService {
     logLabel: string,
   ): Promise<void> {
     this.logger.log(`${logLabel} — ${this.ref(b)}`);
-    const phone = b.companyId
-      ? await resolveCompanyNotifyPhone(this.dataSource, b.companyId)
-      : null;
-    const email = b.company?.email ?? b.company?.generalManagerEmail ?? null;
+    // Both channels come from the same resolver: the company row's own columns
+    // are only half the story (see companyNotifyEmailExpr), and reading them off
+    // the loaded entity silently dropped every mail to a company whose address
+    // lives in `attributes`.
+    const { phone, email } = b.companyId
+      ? await resolveCompanyNotifyContact(this.dataSource, b.companyId)
+      : { phone: null, email: null };
 
     if (phone) {
       try {
@@ -89,7 +102,11 @@ export class BookingLifecycleNotifierService {
     });
   }
 
-  /** Persist + push an in-app item to every backoffice staff user. */
+  /**
+   * Persist + push an in-app item to the booking desk — staff holding
+   * `bookings:get_notification`. Callers whose item belongs to a different desk
+   * override `recipients` (see {@link CLEARANCE_DESK}).
+   */
   private inAppStaff(
     b: Booking,
     title: string,
@@ -97,7 +114,7 @@ export class BookingLifecycleNotifierService {
     overrides: Partial<NotifyInput> = {},
   ): void {
     void this.inbox.notify({
-      recipients: { allBackoffice: true },
+      recipients: { permissionKeys: [FREIGHT_PERMS.bookings.getNotification] },
       audience: NotificationAudience.BACKOFFICE,
       type: NotificationType.REQUEST_SUBMITTED,
       title,
@@ -274,6 +291,7 @@ export class BookingLifecycleNotifierService {
       `the customs declaration can be filed.${note ? ` Note: "${note}"` : ''}`;
     this.logger.log(`TRANSIT ASSIGNEE REQUESTED — ${this.ref(b)}`);
     this.inAppStaff(b, `Transit assignee needed — ${b.reference}`, msg, {
+      recipients: CLEARANCE_DESK,
       type: NotificationType.CLEARANCE_REVIEW,
       link: `/dashboard/gl-djibouti/clearance/${b.id}`,
     });
@@ -288,6 +306,7 @@ export class BookingLifecycleNotifierService {
         `The customs declaration can now be filed.`;
     this.logger.log(`TRANSIT ASSIGNEE ASSIGNED — ${this.ref(b)}`);
     this.inAppStaff(b, `Transit assignee set — ${b.reference}`, msg, {
+      recipients: CLEARANCE_DESK,
       type: NotificationType.CLEARANCE_REVIEW,
       link: `/dashboard/bookings/${b.id}/clearance`,
     });
@@ -395,6 +414,7 @@ export class BookingLifecycleNotifierService {
       'Clearance documents uploaded',
       `Customer uploaded clearance documents for booking ${this.ref(b)} — review them in the clearance queue.`,
       {
+        recipients: CLEARANCE_DESK,
         type: NotificationType.CLEARANCE_REVIEW,
         link: `/dashboard/bookings/${b.id}/clearance`,
       },
@@ -422,6 +442,7 @@ export class BookingLifecycleNotifierService {
       `The customer requested a change to the draft declaration on booking ${this.ref(b)}: ` +
       `"${note}". Send a corrected draft from the clearance page.`;
     this.inAppStaff(b, `Draft declaration change requested — ${this.ref(b)}`, msg, {
+      recipients: CLEARANCE_DESK,
       type: NotificationType.CLEARANCE_REVIEW,
       link: `/dashboard/bookings/${b.id}/clearance`,
     });
@@ -440,6 +461,7 @@ export class BookingLifecycleNotifierService {
       'Payment slip uploaded',
       `Customer uploaded the ${label} payment slip for booking ${this.ref(b)}.`,
       {
+        recipients: CLEARANCE_DESK,
         type: NotificationType.PAYMENT_RECEIVED,
         link: `/dashboard/bookings/${b.id}/clearance`,
       },
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 df81fd5f6..4ebebe879 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
@@ -279,7 +279,10 @@ export class BookingPricingService {
 
     return {
       lineItems,
-      totalAmount: total,
+      // Grand total keeps its cents, matching the line items it sums — rounding
+      // to whole birr made the total disagree with the breakdown (135,375.61 of
+      // lines shown as a 135,376.00 total) and CBE bills this figure to the cent.
+      totalAmount: round2(total),
       currency: booking.paymentCurrency,
       usedRates: [...usedRatesMap.values()],
       appliedModifiers: ruleResult.appliedModifiers,
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
index 181c47b2d..7cc92be87 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
@@ -8,6 +8,9 @@ import {
   Optional,
 } from "@nestjs/common";
 import { EventEmitter2, OnEvent } from "@nestjs/event-emitter";
+import { DataSource } from "typeorm";
+
+import { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
 
 import {
   BookingBatchService,
@@ -56,11 +59,18 @@ export class BookingTransitionService {
     private readonly bookingClearanceService: BookingClearanceService,
     @Inject(forwardRef(() => ClearanceWorkflowService))
     private readonly workflowService: ClearanceWorkflowService,
-        private readonly invoiceService: BookingInvoiceService,
+    // forwardRef: booking-invoice.service now pulls in the wagon-cancellation
+    // service, whose cross-module imports close a require cycle through this
+    // file — without it the class is undefined at decorator time.
+    @Inject(forwardRef(() => BookingInvoiceService))
+    private readonly invoiceService: BookingInvoiceService,
     private readonly containerValidationService: ContainerValidationService,
     private readonly notifier: BookingLifecycleNotifierService,
     private readonly events: EventEmitter2,
     @Optional() private readonly milestoneService?: ClearanceMilestoneService,
+    // Optional + last so the hand-constructed service in *.spec.ts files keeps
+    // compiling; Nest injects it normally at runtime.
+    @Optional() private readonly dataSource?: DataSource,
   ) {}
 
   private isPhasedCustoms(booking: Booking): boolean {
@@ -429,6 +439,20 @@ export class BookingTransitionService {
     return fresh;
   }
 
+  /**
+   * Customer self-service cancel, allowed only before payment — no fee.
+   * SELECTED_FOR_BATCH releases the wagon hold immediately; earlier statuses
+   * take the plain cancel path (open invoices expired, nothing reserved yet).
+   * Anything past payment falls through to cancel()'s status assertion.
+   */
+  async customerCancel(bookingId: string, reason?: string): Promise<Booking> {
+    const booking = await this.bookingsService.findById(bookingId);
+    if (booking.status === "SELECTED_FOR_BATCH") {
+      return this.cancelHold(bookingId, reason);
+    }
+    return this.cancel(bookingId, reason ?? "Customer cancelled before payment");
+  }
+
   async cancel(bookingId: string, reason: string): Promise<Booking> {
     const booking = await this.bookingsService.findById(bookingId);
     assertBookingStatus(booking, [
@@ -978,6 +1002,15 @@ export class BookingTransitionService {
     // booking through the space checks below AND is persisted so the accept /
     // reserve path locks onto that train (pickExportSchedule honors it).
     const requestedId = isExportTrain ? (requestedTrainScheduleId ?? null) : null;
+    // Export rail rides the exact train the customer picked — never an
+    // auto-assigned one. Both portal flows (clearance + contract completion)
+    // surface a picker, so a missing id is an invalid submission, not a
+    // legitimate "let the system choose".
+    if (isExportTrain && !requestedId) {
+      throw new BadRequestException(
+        "Select a train for the chosen shipment day.",
+      );
+    }
     const scheduledBooking = {
       ...booking,
       scheduledDate: date,
@@ -1244,6 +1277,12 @@ export class BookingTransitionService {
       /** Flat list of physical container numbers on this booking (for the
        *  customer truck-assignment container picker). */
       containerNumbers: string[];
+      /** The allocated train, when the booking is placed on a schedule. */
+      trainSchedule?: {
+        trainNumber: string | null;
+        reference: string | null;
+        scheduledDepartureDate: Date | null;
+      } | null;
     }
   > {
     // This enrichment runs AFTER the transition has committed. A failure here
@@ -1296,6 +1335,32 @@ export class BookingTransitionService {
         `enrichBookingResponse: batch-offer lookup failed for ${booking.id}: ${(err as Error).message}`,
       );
     }
+    // Allocated train: number + schedule reference for the detail headers
+    // (portal and backoffice). Degrades to null like every fragile field here.
+    let trainSchedule: {
+      trainNumber: string | null;
+      reference: string | null;
+      scheduledDepartureDate: Date | null;
+    } | null = null;
+    if (booking.trainScheduleId && this.dataSource) {
+      try {
+        const s = await this.dataSource.getRepository(TrainSchedule).findOne({
+          where: { id: booking.trainScheduleId },
+        });
+        if (s) {
+          trainSchedule = {
+            trainNumber: s.trainNumber ?? null,
+            reference: s.reference ?? null,
+            scheduledDepartureDate: s.scheduledDepartureDate ?? null,
+          };
+        }
+      } catch (err) {
+        this.logger.warn(
+          `enrichBookingResponse: train-schedule lookup failed for ${booking.id}: ${(err as Error).message}`,
+        );
+      }
+    }
+
     // Physical container numbers entered at booking time (booking_container
     // units), flattened for the customer truck-assignment container picker.
     const containerNumbers = (booking.bookingContainers ?? [])
@@ -1310,6 +1375,7 @@ export class BookingTransitionService {
       nextStep,
       activeBatchOffer,
       containerNumbers,
+      trainSchedule,
     };
   }
 }
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-wagon-cancellation.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-wagon-cancellation.service.ts
new file mode 100644
index 000000000..b62fdfca0
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/bookings/booking-wagon-cancellation.service.ts
@@ -0,0 +1,1126 @@
+import {
+  BadRequestException,
+  ConflictException,
+  forwardRef,
+  Inject,
+  Injectable,
+  Logger,
+  NotFoundException,
+} from '@nestjs/common';
+import { Freight, NotificationAudience, NotificationType } from '@edr/types';
+import { DataSource, EntityManager, In } from 'typeorm';
+
+import { BillingService } from '../billing/billing.service';
+import { ContractBookingService } from '../contracts/contract-booking.service';
+import { ClearanceMilestoneService } from '../contracts/clearance-milestone.service';
+import { CreateBookingUnderContractDto } from '../contracts/dto/create-booking-under-contract.dto';
+import { ClearanceMilestone } from '../contracts/entities/clearance-milestone.entity';
+import { FirstMileService } from '../first-mile/first-mile.service';
+import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
+import { wagonsPerUnitForSize } from '../rule-engine/container-type.util';
+import { Rate } from '../rule-engine/entities/rate.entity';
+import { BookingBatchService } from '../train-scheduling/booking-batch.service';
+import { TrainSchedulingService } from '../train-scheduling/services/train-scheduling.service';
+import { WagonAllocationBulkLoad } from '../train-schedules/entities/wagon-allocation-bulk-load.entity';
+import { WagonAllocationContainerItem } from '../train-schedules/entities/wagon-allocation-container-item.entity';
+import { WagonBookingAllocation } from '../train-schedules/entities/wagon-booking-allocation.entity';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
+import {
+  BookingWagonCancellationsRepository,
+  WagonCancellationListFilter,
+} from './booking-wagon-cancellations.repository';
+import { BookingsRepository } from './bookings.repository';
+import {
+  RebookCancelledWagonsDto,
+  RequestWagonCancellationDto,
+} from './dto/wagon-cancellation.dto';
+import { Booking } from './entities/booking.entity';
+import { BookingContainer } from './entities/booking-container.entity';
+import { BookingContainerUnit } from './entities/booking-container-unit.entity';
+import {
+  BookingWagonCancellation,
+  CancelledQuantities,
+  CancelledUnitSnapshot,
+} from './entities/booking-wagon-cancellation.entity';
+
+/**
+ * rates.rate_type of the cancellation fee — an existing rate-engine type
+ * (trigger CANCELLATION, never auto-applied to booking pricing). Staff
+ * configure it in the normal rates UI; the wagon flow requires the PER_WAGON
+ * unit so the fee scales with the cancelled wagon count.
+ */
+export const WAGON_CANCELLATION_FEE_RATE_TYPE = 'CANCELLATION_FEE';
+/** invoices.type of the fee invoice — the settlement branch key in BookingInvoiceService. */
+export const WAGON_CANCEL_FEE_INVOICE_TYPE = 'WAGON_CANCEL_FEE';
+
+const round2 = (n: number): number => Math.round(n * 100) / 100;
+const round3 = (n: number): number => Math.round(n * 1000) / 1000;
+
+interface RequestedCut {
+  wagons: number;
+  weightTons: number;
+  quantities: CancelledQuantities;
+}
+
+/**
+ * Partial wagon cancellation on a PAID booking, with a rebooking credit.
+ *
+ * Lifecycle (one ledger row per cycle, see BookingWagonCancellation):
+ *  T1 request  — validate + price the fee, open the fee invoice. Nothing else
+ *                moves: the wagons stay allocated until the fee is money.
+ *  T2 fee paid — reduce the booking in place (applySplit mechanics: soft-delete
+ *                the cut units LIFO), release the surplus wagon allocations,
+ *                snapshot the cut units on the ledger row → CREDIT_AVAILABLE.
+ *  T3 rebook   — customer picks a day only. The credit becomes a REAL booking
+ *                via ContractBookingService.createUnderContract (which re-checks
+ *                contract validity + caps), immediately marked PAID — the
+ *                freight was paid on the original booking; only the fee was new
+ *                money. Clearance milestones are copied from the source booking
+ *                (the cargo is already cleared; clearance follows cargo, not
+ *                train date).
+ *
+ * The cycle is repeatable by construction: the rebooked booking is a normal
+ * PAID booking, so it can itself be partially cancelled again.
+ */
+@Injectable()
+export class BookingWagonCancellationService {
+  private readonly logger = new Logger(BookingWagonCancellationService.name);
+
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly repo: BookingWagonCancellationsRepository,
+    private readonly bookingsRepository: BookingsRepository,
+    private readonly billing: BillingService,
+    @Inject(forwardRef(() => ContractBookingService))
+    private readonly contractBooking: ContractBookingService,
+    @Inject(forwardRef(() => ClearanceMilestoneService))
+    private readonly clearanceMilestones: ClearanceMilestoneService,
+    @Inject(forwardRef(() => BookingBatchService))
+    private readonly bookingBatch: BookingBatchService,
+    @Inject(forwardRef(() => TrainSchedulingService))
+    private readonly trainScheduling: TrainSchedulingService,
+    @Inject(forwardRef(() => FirstMileService))
+    private readonly firstMile: FirstMileService,
+    private readonly inbox: NotificationInboxService,
+  ) {}
+
+  // ── T1: request ────────────────────────────────────────────────────────────
+
+  /** Fee/credit preview for the confirm dialog — same math as the request, no writes. */
+  async previewCancellation(
+    bookingId: string,
+    dto: RequestWagonCancellationDto,
+  ): Promise<{
+    wagons: number;
+    weightTons: number;
+    feePerWagon: number;
+    feeAmount: number;
+    feeCurrency: string;
+    creditAmount: number;
+  }> {
+    const booking = await this.loadCancellableBooking(bookingId);
+    const cut = await this.resolveRequestedCut(booking, dto);
+    const rate = await this.feeRate();
+    const feeAmount = round2(Number(rate.rateValue) * cut.wagons);
+    return {
+      wagons: cut.wagons,
+      weightTons: cut.weightTons,
+      feePerWagon: Number(rate.rateValue),
+      feeAmount,
+      feeCurrency: rate.currency,
+      creditAmount: this.creditFor(booking, cut.wagons),
+    };
+  }
+
+  async requestCancellation(
+    bookingId: string,
+    dto: RequestWagonCancellationDto,
+    userId?: string,
+  ): Promise<BookingWagonCancellation> {
+    const booking = await this.loadCancellableBooking(bookingId);
+    const open = await this.repo.findOpenForBooking(bookingId);
+    if (open) {
+      throw new ConflictException(
+        'This booking already has a cancellation awaiting its fee. Pay or withdraw it first.',
+      );
+    }
+
+    const cut = await this.resolveRequestedCut(booking, dto);
+    const rate = await this.feeRate();
+    const feeAmount = round2(Number(rate.rateValue) * cut.wagons);
+    const creditAmount = this.creditFor(booking, cut.wagons);
+
+    const row = await this.repo.create({
+      bookingId,
+      wagonsCancelled: cut.wagons,
+      weightTons: cut.weightTons,
+      cancelledQuantities: cut.quantities,
+      creditAmount,
+      feeRateId: rate.id,
+      feeAmount,
+      feeCurrency: rate.currency,
+      status: 'FEE_PENDING',
+      reason: dto.reason ?? null,
+      requestedByUserId: userId ?? null,
+    });
+
+    // The fee invoice rides the booking's own invoice list (source=booking), so
+    // the portal's existing invoice/pay stack picks it up with zero new payment
+    // code. Settlement branches on type in BookingInvoiceService.
+    const invoice = await this.billing.generateInvoice({
+      source: Freight.InvoiceSource.Booking,
+      sourceId: bookingId,
+      type: WAGON_CANCEL_FEE_INVOICE_TYPE,
+      companyId: booking.companyId,
+      companyProfileId: booking.companyProfileId,
+      currency: rate.currency,
+      lines: [
+        {
+          chargeType: 'CANCELLATION_FEE',
+          description: `Wagon cancellation fee — ${cut.wagons} wagon(s) of booking ${booking.reference}`,
+          quantity: cut.wagons,
+          unitRate: Number(rate.rateValue),
+          amount: feeAmount,
+          currency: rate.currency,
+          metadata: { wagonCancellationId: row.id },
+        },
+      ],
+      totalAmount: feeAmount,
+      status: Freight.InvoiceStatus.Issued,
+    });
+    let updated = await this.repo.update(row.id, { feeInvoiceId: invoice.id });
+
+    // Policy: the cancelled wagons leave the schedule NOW — capacity frees for
+    // other customers immediately; the fee is still owed before the credit can
+    // be rebooked. A withdraw/void re-allocates (or errors when the train has
+    // no room left). If this release fails, T2 releases instead (flag unset).
+    try {
+      const released = await this.releaseAtRequest(bookingId, cut);
+      if (released) {
+        updated = await this.repo.update(row.id, {
+          cancelledQuantities: { ...cut.quantities, releasedAtRequest: true },
+        });
+      }
+    } catch (err) {
+      this.logger.error(
+        `Request-time wagon release failed for cancellation ${row.id}: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+
+    this.notifyStaff(
+      booking,
+      'Wagon cancellation requested',
+      `${booking.reference}: customer asked to cancel ${cut.wagons} wagon(s); fee invoice ${invoice.invoiceNumber} issued.`,
+    );
+    return updated ?? row;
+  }
+
+  /**
+   * Void a FEE_PENDING request (customer withdraw or staff void). The wagons
+   * left the schedule at request time, so voiding must first put them back:
+   * the schedule's auto-allocation is re-run and the result verified — if the
+   * train has no room left, the void FAILS with a clear error and the request
+   * stays FEE_PENDING (pay the fee and rebook the credit instead).
+   */
+  async withdraw(cancellationId: string): Promise<BookingWagonCancellation> {
+    const row = await this.mustFind(cancellationId);
+    if (row.status !== 'FEE_PENDING') {
+      throw new BadRequestException(
+        `Only a fee-pending cancellation can be withdrawn (status is ${row.status}).`,
+      );
+    }
+
+    if (row.cancelledQuantities.releasedAtRequest) {
+      const booking = await this.bookingsRepository.findById(row.bookingId);
+      const scheduleId = booking?.trainScheduleId;
+      if (booking && scheduleId) {
+        try {
+          await this.trainScheduling.tryAutoWagonAllocation(scheduleId);
+        } catch (err) {
+          this.logger.warn(
+            `Re-allocation on withdraw failed for booking ${row.bookingId}: ${err instanceof Error ? err.message : String(err)}`,
+          );
+        }
+        // ponytail: allocation rows ≈ wagons (20ft pairs share one row/wagon);
+        // switch to a weight-based check if mixed loads ever make this lie.
+        const rows = await this.dataSource.getRepository(WagonBookingAllocation).count({
+          where: { bookingId: row.bookingId },
+        });
+        if (rows < Math.round(Number(booking.wagonsRequired ?? 0))) {
+          throw new ConflictException(
+            'The train has no free wagon space left to restore the cancelled wagons — the request cannot be withdrawn. Pay the cancellation fee and rebook the credit on another day instead.',
+          );
+        }
+      }
+    }
+
+    if (row.feeInvoiceId) await this.billing.cancelInvoice(row.feeInvoiceId);
+    return (await this.repo.update(row.id, { status: 'WITHDRAWN' }))!;
+  }
+
+  // ── T2: fee settled ─────────────────────────────────────────────────────────
+
+  /**
+   * The fee invoice settled — reduce the booking and free the wagons. Called
+   * from BookingInvoiceService's paid handler. Idempotent: a duplicate webhook
+   * finds the row already past FEE_PENDING and returns.
+   */
+  async onFeePaid(feeInvoiceId: string): Promise<void> {
+    const row = await this.repo.findByFeeInvoiceId(feeInvoiceId);
+    if (!row) {
+      this.logger.warn(`No wagon cancellation for paid fee invoice ${feeInvoiceId}.`);
+      return;
+    }
+    if (row.status !== 'FEE_PENDING') return;
+
+    // The fee can settle after loading started (slow payment). Never cut
+    // loaded cargo: leave the row FEE_PENDING and alert staff to resolve
+    // (reschedule the cut or refund the fee by hand). Skipped when the wagons
+    // already left the schedule at request time — loading of the KEPT wagons
+    // is then irrelevant to this cut.
+    const releasedEarly = !!row.cancelledQuantities.releasedAtRequest;
+    const bookingNow = await this.bookingsRepository.findById(row.bookingId);
+    const movingNow = releasedEarly
+      ? 0
+      : await this.dataSource.getRepository(WagonBookingAllocation).count({
+          where: { bookingId: row.bookingId, status: In(['LOADED', 'DEPARTED']) },
+        });
+    if (!releasedEarly && (bookingNow?.loadedAt || movingNow > 0)) {
+      this.logger.error(
+        `Wagon cancellation ${row.id}: fee paid but loading already started on booking ${row.bookingId} — left FEE_PENDING for manual resolution.`,
+      );
+      if (bookingNow) {
+        this.notifyStaff(
+          bookingNow,
+          'Wagon cancellation fee paid after loading started',
+          `${bookingNow.reference}: the customer paid the cancellation fee for ${row.wagonsCancelled} wagon(s), but loading has already started. Resolve manually (adjust the cut or refund the fee).`,
+        );
+      }
+      return;
+    }
+
+    await this.dataSource.transaction(async (manager) => {
+      const booking = await manager.getRepository(Booking).findOne({
+        where: { id: row.bookingId },
+        lock: { mode: 'pessimistic_write' },
+      });
+      if (!booking) throw new NotFoundException(`Booking ${row.bookingId} not found.`);
+
+      const quantities = { ...row.cancelledQuantities };
+      let droppedWeight = 0;
+
+      if (quantities.bySize && Object.keys(quantities.bySize).length) {
+        // Specific-wagon requests already carry the exact unit snapshots;
+        // quantity requests trim LIFO and snapshot here.
+        const units = quantities.units?.length
+          ? await this.reduceContainerUnitsExact(manager, booking, quantities.units)
+          : await this.reduceContainerLines(manager, booking, quantities.bySize);
+        quantities.units = units;
+        droppedWeight = round3(units.reduce((s, u) => s + Number(u.vgmTons || 0), 0));
+        if (!releasedEarly) {
+          await this.releaseContainerAllocations(
+            manager,
+            booking.id,
+            units.map((u) => u.containerNumber),
+          );
+        }
+      } else {
+        droppedWeight = Number(quantities.bulkTons ?? row.weightTons);
+        await this.reduceBulk(manager, booking, droppedWeight);
+        if (!releasedEarly) {
+          await this.releaseBulkAllocations(
+            manager,
+            booking.id,
+            Number(row.wagonsCancelled),
+            quantities.allocationIds,
+          );
+        }
+      }
+
+      // Mirror applySplit's bookkeeping: preSplitQuantities feeds the ONE_TIME
+      // exact-remainder assertion at rebook time; isSplit releases the
+      // single-active-booking slot so the rebooked booking may be created.
+      const preSplitQuantities =
+        booking.preSplitQuantities ?? (await this.currentQuantities(manager, booking, droppedWeight));
+
+      await manager.getRepository(Booking).update(booking.id, {
+        wagonsRequired: round2(Number(booking.wagonsRequired ?? 0) - Number(row.wagonsCancelled)),
+        cargoTotalWeightVgm: round3(Number(booking.cargoTotalWeightVgm) - droppedWeight),
+        totalAmount: round2(Number(booking.totalAmount) - Number(row.creditAmount)),
+        isSplit: true,
+        preSplitQuantities,
+      } as never);
+
+      await manager.getRepository(BookingWagonCancellation).update(row.id, {
+        status: 'CREDIT_AVAILABLE',
+        feePaidAt: new Date(),
+        weightTons: droppedWeight,
+        cancelledQuantities: quantities,
+      });
+    });
+
+    const booking = await this.bookingsRepository.findById(row.bookingId);
+    if (booking) {
+      this.notifyCustomer(
+        booking,
+        'Wagon cancellation confirmed',
+        `${row.wagonsCancelled} wagon(s) of ${booking.reference} are cancelled. Your paid freight is kept as credit — rebook any day while your contract is valid.`,
+      );
+    }
+    this.logger.log(
+      `Wagon cancellation ${row.id}: fee paid, booking ${row.bookingId} reduced by ${row.wagonsCancelled} wagon(s).`,
+    );
+  }
+
+  // ── T3: rebook ──────────────────────────────────────────────────────────────
+
+  async rebook(
+    cancellationId: string,
+    dto: RebookCancelledWagonsDto,
+    userId?: string,
+  ): Promise<{ cancellation: BookingWagonCancellation; bookingId: string }> {
+    const row = await this.mustFind(cancellationId);
+    if (row.status !== 'CREDIT_AVAILABLE') {
+      throw new BadRequestException(
+        `This credit cannot be rebooked (status is ${row.status}).`,
+      );
+    }
+    const source = await this.bookingsRepository.findById(row.bookingId);
+    if (!source) throw new NotFoundException(`Booking ${row.bookingId} not found.`);
+    if (!source.contractId) {
+      throw new BadRequestException('The original booking has no contract to rebook under.');
+    }
+    // Friendly pre-check; createUnderContract re-asserts inside its own guards.
+    if (
+      source.contractValidUntil &&
+      new Date(source.contractValidUntil).getTime() < Date.now()
+    ) {
+      throw new BadRequestException(
+        'Contract validity has expired — ask EDR staff to extend the contract before rebooking.',
+      );
+    }
+
+    const createDto = this.buildRebookDto(row, dto.scheduledDate);
+    const created = await this.contractBooking.createUnderContract(
+      source.contractId,
+      createDto,
+      { id: userId ?? source.createdByUserId ?? undefined },
+      // System actor: carries the create-booking key so the GL gate passes on
+      // Path B (customs-clearance) contracts; harmless on Path A.
+      { permissions: [{ key: FREIGHT_PERMS.contracts.createBooking }] },
+    );
+    const newBookingId = created.booking.id;
+
+    // The freight is already paid (credit) — mark PAID and let the existing
+    // paid-booking machinery place it. No invoice is generated for it.
+    await this.dataSource.getRepository(Booking).update(newBookingId, {
+      paymentStatus: 'PAID',
+      status: 'PAID',
+    });
+    await this.copyClearanceState(source, newBookingId);
+
+    try {
+      await this.firstMile.acceptBooking(newBookingId);
+    } catch (err) {
+      this.logger.error(
+        `First-mile accept failed for rebooked ${newBookingId}: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+    try {
+      await this.bookingBatch.ensurePaidBookingAllocated(newBookingId);
+    } catch (err) {
+      this.logger.error(
+        `Allocation failed for rebooked ${newBookingId}: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+
+    const updated = (await this.repo.update(row.id, {
+      status: 'REBOOKED',
+      rebookedBookingId: newBookingId,
+      rebookedAt: new Date(),
+    }))!;
+
+    this.notifyCustomer(
+      source,
+      'Cancelled wagons rebooked',
+      `Your ${row.wagonsCancelled} cancelled wagon(s) from ${source.reference} are rebooked for ${dto.scheduledDate}. No new freight charge — your credit covered it.`,
+      newBookingId,
+    );
+    return { cancellation: updated, bookingId: newBookingId };
+  }
+
+  // ── History ────────────────────────────────────────────────────────────────
+
+  list(filter: WagonCancellationListFilter) {
+    return this.repo.list(filter);
+  }
+
+  findById(id: string): Promise<BookingWagonCancellation> {
+    return this.mustFind(id);
+  }
+
+  // ── internals ──────────────────────────────────────────────────────────────
+
+  private async mustFind(id: string): Promise<BookingWagonCancellation> {
+    const row = await this.repo.findById(id);
+    if (!row) throw new NotFoundException(`Wagon cancellation ${id} not found.`);
+    return row;
+  }
+
+  /** PAID booking, not yet moving, with a contract to rebook under later. */
+  private async loadCancellableBooking(bookingId: string): Promise<Booking> {
+    const booking = await this.bookingsRepository.findById(bookingId);
+    if (!booking) throw new NotFoundException(`Booking ${bookingId} not found.`);
+    if (booking.paymentStatus !== 'PAID' || booking.status !== 'PAID') {
+      throw new BadRequestException(
+        'Only a paid booking can cancel wagons. Before payment, cancel the booking itself — no fee applies.',
+      );
+    }
+    if (!booking.contractId) {
+      throw new BadRequestException(
+        'Wagon cancellation needs a contract booking (the credit is rebooked under the contract).',
+      );
+    }
+    // Cancellation is allowed strictly BEFORE loading/dispatch: both signals
+    // checked — per-wagon allocation status and the booking-level loading stamp
+    // (some flows confirm loading on the booking without flipping allocations).
+    if (booking.loadedAt) {
+      throw new BadRequestException(
+        'Cargo loading is confirmed for this booking — wagons can no longer be cancelled.',
+      );
+    }
+    const moving = await this.dataSource.getRepository(WagonBookingAllocation).count({
+      where: { bookingId, status: In(['LOADED', 'DEPARTED']) },
+    });
+    if (moving > 0) {
+      throw new BadRequestException(
+        'Loading has started for this booking — wagons can no longer be cancelled.',
+      );
+    }
+    return booking;
+  }
+
+  /** Validate the requested cut against the live booking and size it in wagons/tons. */
+  private async resolveRequestedCut(
+    booking: Booking,
+    dto: RequestWagonCancellationDto,
+  ): Promise<RequestedCut> {
+    const totalWagons = Number(booking.wagonsRequired ?? 0);
+    if (totalWagons <= 0) {
+      throw new BadRequestException('This booking has no wagon requirement to cancel from.');
+    }
+
+    if (dto.wagonAllocationIds?.length) {
+      return this.resolveCutFromAllocations(booking, dto.wagonAllocationIds, totalWagons);
+    }
+
+    if (booking.freightType === 'CONTAINER') {
+      if (!dto.containers?.length) {
+        throw new BadRequestException('Specify the container units to cancel per size.');
+      }
+      const lines = await this.dataSource.getRepository(BookingContainer).find({
+        where: { bookingId: booking.id },
+      });
+      const liveBySize = new Map<string, number>();
+      for (const line of lines) {
+        const size = line.containerSize ?? '';
+        liveBySize.set(size, (liveBySize.get(size) ?? 0) + Number(line.quantity ?? 0));
+      }
+      const bySize: Record<string, number> = {};
+      let wagons = 0;
+      for (const cut of dto.containers) {
+        const live = liveBySize.get(cut.containerSize) ?? 0;
+        if (cut.quantity > live) {
+          throw new BadRequestException(
+            `Cannot cancel ${cut.quantity} × ${cut.containerSize}ft — the booking only has ${live}.`,
+          );
+        }
+        bySize[cut.containerSize] = cut.quantity;
+        wagons += cut.quantity * wagonsPerUnitForSize(Number(cut.containerSize));
+      }
+      wagons = round2(wagons);
+      if (wagons >= totalWagons) {
+        throw new BadRequestException(
+          'That would cancel the whole booking — use booking cancellation instead of a partial wagon cancel.',
+        );
+      }
+      // Snapshot the LIFO-picked physical units up front (read-only — cargo is
+      // cut only when the fee settles) so the wagons carrying them can be
+      // released from the schedule at request time and the portal can show
+      // which containers are leaving.
+      const unitRepo = this.dataSource.getRepository(BookingContainerUnit);
+      const units: CancelledUnitSnapshot[] = [];
+      let requested = 0;
+      for (const cut of dto.containers) {
+        requested += cut.quantity;
+        let need = cut.quantity;
+        const sizeLines = lines
+          .filter((l) => (l.containerSize ?? '') === cut.containerSize)
+          .sort((a, b) => +new Date(b.createdAt) - +new Date(a.createdAt));
+        for (const line of sizeLines) {
+          if (need <= 0) break;
+          const us = await unitRepo.find({
+            where: { bookingContainerId: line.id },
+            order: { sortOrder: 'DESC', createdAt: 'DESC' },
+            take: need,
+          });
+          for (const u of us) {
+            units.push({
+              containerSize: cut.containerSize,
+              containerNumber: u.containerNumber,
+              sealNumber: u.sealNumber ?? null,
+              vgmTons: Number(u.vgmTons),
+              isHazardous: u.isHazardous,
+              isReefer: u.isReefer,
+            });
+            need--;
+          }
+        }
+      }
+      const weightShare = round3(
+        Number(booking.cargoTotalWeightVgm) * (wagons / totalWagons),
+      );
+      return {
+        wagons,
+        weightTons: weightShare,
+        // Bookings without unit records fall back to the T2 LIFO trim.
+        quantities: { bySize, ...(units.length === requested ? { units } : {}) },
+      };
+    }
+
+    // BULK: the customer cancels wagons; tons follow the booking's own
+    // tons-per-wagon ratio.
+    const wagons = round2(Number(dto.wagons ?? 0));
+    if (!wagons || wagons <= 0) {
+      throw new BadRequestException('Specify how many wagons to cancel.');
+    }
+    if (wagons >= totalWagons) {
+      throw new BadRequestException(
+        'That would cancel the whole booking — use booking cancellation instead of a partial wagon cancel.',
+      );
+    }
+    // ponytail: proportional sizing (tons/wagon = total/wagons). PER_ITEM item
+    // rounding happens here too; switch to items_per_wagon_map sizing if bulk
+    // PER_ITEM cancels ever need to be exact per item.
+    let tons = Number(booking.cargoTotalWeightVgm) * (wagons / totalWagons);
+    const isPerItem = booking.bulkTotalWeightTons != null;
+    tons = isPerItem ? Math.floor(tons) : round3(tons);
+    if (tons <= 0) {
+      throw new BadRequestException('The requested cut is too small to release cargo.');
+    }
+    return { wagons, weightTons: tons, quantities: { bulkTons: tons } };
+  }
+
+  /**
+   * Specific-wagon cancellation: the customer picked wagons in the Wagons tab.
+   * Everything is derived from the selected allocations — container bookings
+   * get their exact unit snapshots up front (T2 then cuts precisely these,
+   * not a LIFO guess), bulk gets the wagons' actual allocated tonnage.
+   */
+  private async resolveCutFromAllocations(
+    booking: Booking,
+    allocationIds: string[],
+    totalWagons: number,
+  ): Promise<RequestedCut> {
+    const allocations = await this.dataSource.getRepository(WagonBookingAllocation).find({
+      where: { id: In(allocationIds), bookingId: booking.id },
+      relations: { containerItems: true },
+    });
+    if (allocations.length !== allocationIds.length) {
+      throw new BadRequestException(
+        'Some selected wagons no longer belong to this booking — refresh and pick again.',
+      );
+    }
+    const notCancellable = allocations.filter(
+      (a) => a.status !== 'PLANNED' && a.status !== 'RESERVED',
+    );
+    if (notCancellable.length) {
+      throw new BadRequestException(
+        'A selected wagon is already loaded or departed and cannot be cancelled.',
+      );
+    }
+
+    const wagons = allocations.length;
+    if (wagons >= totalWagons) {
+      throw new BadRequestException(
+        'That would cancel the whole booking — use booking cancellation instead of a partial wagon cancel.',
+      );
+    }
+
+    if (booking.freightType !== 'CONTAINER') {
+      const allocated = allocations.reduce(
+        (s, a) => s + Number(a.allocatedWeightTons || 0),
+        0,
+      );
+      const tons =
+        allocated > 0
+          ? round3(allocated)
+          : round3(Number(booking.cargoTotalWeightVgm) * (wagons / totalWagons));
+      return {
+        wagons,
+        weightTons: tons,
+        quantities: { bulkTons: tons, allocationIds },
+      };
+    }
+
+    // Container: the selected wagons' items name the exact physical boxes.
+    const numbers = allocations
+      .flatMap((a) => a.containerItems ?? [])
+      .map((i) => i.containerNumber)
+      .filter((n): n is string => !!n);
+    if (!numbers.length) {
+      throw new BadRequestException(
+        'The selected wagons carry no container records — cancel by quantity instead.',
+      );
+    }
+    const lines = await this.dataSource.getRepository(BookingContainer).find({
+      where: { bookingId: booking.id },
+    });
+    const unitRepo = this.dataSource.getRepository(BookingContainerUnit);
+    const units: CancelledUnitSnapshot[] = [];
+    const bySize: Record<string, number> = {};
+    for (const line of lines) {
+      const size = line.containerSize ?? '';
+      const lineUnits = await unitRepo.find({ where: { bookingContainerId: line.id } });
+      for (const u of lineUnits) {
+        if (!numbers.includes(u.containerNumber)) continue;
+        units.push({
+          containerSize: size,
+          containerNumber: u.containerNumber,
+          sealNumber: u.sealNumber ?? null,
+          vgmTons: Number(u.vgmTons),
+          isHazardous: u.isHazardous,
+          isReefer: u.isReefer,
+        });
+        bySize[size] = (bySize[size] ?? 0) + 1;
+      }
+    }
+    if (units.length !== numbers.length) {
+      throw new BadRequestException(
+        'Wagon container records are out of sync with the booking — contact EDR support.',
+      );
+    }
+    return {
+      wagons,
+      weightTons: round3(units.reduce((s, u) => s + Number(u.vgmTons || 0), 0)),
+      quantities: { bySize, units, allocationIds },
+    };
+  }
+
+  /** Credit = the cancelled share of the ORIGINAL price (old-price rebooking). */
+  private creditFor(booking: Booking, wagons: number): number {
+    const totalWagons = Number(booking.wagonsRequired ?? 0);
+    if (totalWagons <= 0) return 0;
+    return round2(Number(booking.totalAmount) * (wagons / totalWagons));
+  }
+
+  private async feeRate(): Promise<Rate> {
+    const rate = await this.dataSource.getRepository(Rate).findOne({
+      where: {
+        rateType: WAGON_CANCELLATION_FEE_RATE_TYPE,
+        rateUnit: 'PER_WAGON',
+        status: 'LIVE',
+      },
+      order: { createdAt: 'DESC' },
+    });
+    if (!rate) {
+      throw new BadRequestException(
+        'No LIVE per-wagon CANCELLATION_FEE rate is configured — ask EDR to set it in the rate engine (unit PER_WAGON).',
+      );
+    }
+    return rate;
+  }
+
+  /**
+   * Trim `bySize` units off the booking's container lines, newest line first,
+   * LIFO within a line — the exact applySplit mechanics. Returns snapshots of
+   * every physical unit soft-deleted, for later reconstruction.
+   */
+  private async reduceContainerLines(
+    manager: EntityManager,
+    booking: Booking,
+    bySize: Record<string, number>,
+  ): Promise<CancelledUnitSnapshot[]> {
+    const snapshots: CancelledUnitSnapshot[] = [];
+    for (const [size, toDrop] of Object.entries(bySize)) {
+      let remaining = toDrop;
+      const lines = await manager.getRepository(BookingContainer).find({
+        where: { bookingId: booking.id, containerSize: size },
+        order: { createdAt: 'DESC' },
+      });
+      const live = lines.reduce((s, l) => s + Number(l.quantity ?? 0), 0);
+      if (live < toDrop) {
+        throw new BadRequestException(
+          `Booking changed since the request: only ${live} × ${size}ft left, cannot cancel ${toDrop}.`,
+        );
+      }
+      for (const line of lines) {
+        if (remaining <= 0) break;
+        const qty = Number(line.quantity ?? 0);
+        const drop = Math.min(remaining, qty);
+        remaining -= drop;
+
+        const units = await manager.getRepository(BookingContainerUnit).find({
+          where: { bookingContainerId: line.id },
+          order: { sortOrder: 'DESC', createdAt: 'DESC' },
+          take: drop,
+        });
+        for (const u of units) {
+          snapshots.push({
+            containerSize: size,
+            containerNumber: u.containerNumber,
+            sealNumber: u.sealNumber ?? null,
+            vgmTons: Number(u.vgmTons),
+            isHazardous: u.isHazardous,
+            isReefer: u.isReefer,
+          });
+        }
+        if (units.length < drop) {
+          throw new BadRequestException(
+            `Booking line ${line.id} has ${units.length} physical unit record(s) but ${drop} must be cancelled — units out of sync.`,
+          );
+        }
+        const droppedVgm = round3(units.reduce((s, u) => s + Number(u.vgmTons || 0), 0));
+
+        if (drop === qty) {
+          await manager.getRepository(BookingContainer).softDelete(line.id);
+          await manager
+            .getRepository(BookingContainerUnit)
+            .softDelete(units.map((u) => u.id));
+          continue;
+        }
+        await manager.getRepository(BookingContainerUnit).softDelete(units.map((u) => u.id));
+        const keptUnits = await manager.getRepository(BookingContainerUnit).find({
+          where: { bookingContainerId: line.id },
+        });
+        await manager.getRepository(BookingContainer).update(line.id, {
+          quantity: qty - drop,
+          wagonsRequired: round2((qty - drop) * wagonsPerUnitForSize(Number(size))),
+          totalVgmTons: round3(Number(line.totalVgmTons) - droppedVgm),
+          hazardousQuantity: keptUnits.filter((u) => u.isHazardous).length,
+          reeferQuantity: keptUnits.filter((u) => u.isReefer).length,
+        });
+      }
+    }
+    return snapshots;
+  }
+
+  /**
+   * Release the cancelled wagons from the schedule at REQUEST time. Returns
+   * true when something was actually released (booking was on a train) — the
+   * caller then stamps `releasedAtRequest` so T2 skips its release step.
+   */
+  private async releaseAtRequest(bookingId: string, cut: RequestedCut): Promise<boolean> {
+    const had = await this.dataSource.getRepository(WagonBookingAllocation).count({
+      where: { bookingId },
+    });
+    if (had === 0) return false;
+
+    await this.dataSource.transaction(async (manager) => {
+      if (cut.quantities.units?.length) {
+        await this.releaseContainerAllocations(
+          manager,
+          bookingId,
+          cut.quantities.units.map((u) => u.containerNumber),
+        );
+      } else if (!cut.quantities.bySize) {
+        await this.releaseBulkAllocations(
+          manager,
+          bookingId,
+          cut.wagons,
+          cut.quantities.allocationIds,
+        );
+      }
+      // Container booking without unit records: nothing to match on — the
+      // wagons release at T2 via the LIFO trim instead.
+    });
+
+    const left = await this.dataSource.getRepository(WagonBookingAllocation).count({
+      where: { bookingId },
+    });
+    return left < had;
+  }
+
+  /**
+   * Cut EXACTLY the snapshotted units (specific-wagon cancellation): soft-delete
+   * them and rebalance each affected line. Returns the snapshots of the units
+   * actually cut, so drift since the request fails loudly instead of guessing.
+   */
+  private async reduceContainerUnitsExact(
+    manager: EntityManager,
+    booking: Booking,
+    wanted: CancelledUnitSnapshot[],
+  ): Promise<CancelledUnitSnapshot[]> {
+    const numbers = wanted.map((u) => u.containerNumber);
+    const lines = await manager.getRepository(BookingContainer).find({
+      where: { bookingId: booking.id },
+    });
+    const cut: CancelledUnitSnapshot[] = [];
+    for (const line of lines) {
+      const size = line.containerSize ?? '';
+      const lineUnits = await manager.getRepository(BookingContainerUnit).find({
+        where: { bookingContainerId: line.id },
+      });
+      const doomed = lineUnits.filter((u) => numbers.includes(u.containerNumber));
+      if (!doomed.length) continue;
+
+      await manager.getRepository(BookingContainerUnit).softDelete(doomed.map((u) => u.id));
+      for (const u of doomed) {
+        cut.push({
+          containerSize: size,
+          containerNumber: u.containerNumber,
+          sealNumber: u.sealNumber ?? null,
+          vgmTons: Number(u.vgmTons),
+          isHazardous: u.isHazardous,
+          isReefer: u.isReefer,
+        });
+      }
+      const kept = lineUnits.filter((u) => !numbers.includes(u.containerNumber));
+      if (!kept.length) {
+        await manager.getRepository(BookingContainer).softDelete(line.id);
+        continue;
+      }
+      const doomedVgm = round3(doomed.reduce((s, u) => s + Number(u.vgmTons || 0), 0));
+      await manager.getRepository(BookingContainer).update(line.id, {
+        quantity: kept.length,
+        wagonsRequired: round2(kept.length * wagonsPerUnitForSize(Number(size))),
+        totalVgmTons: round3(Number(line.totalVgmTons) - doomedVgm),
+        hazardousQuantity: kept.filter((u) => u.isHazardous).length,
+        reeferQuantity: kept.filter((u) => u.isReefer).length,
+      });
+    }
+    if (cut.length !== wanted.length) {
+      throw new BadRequestException(
+        `Booking changed since the request: ${cut.length}/${wanted.length} selected container(s) still on it.`,
+      );
+    }
+    return cut;
+  }
+
+  private async reduceBulk(
+    manager: EntityManager,
+    booking: Booking,
+    tons: number,
+  ): Promise<void> {
+    if (tons >= Number(booking.cargoTotalWeightVgm)) {
+      throw new BadRequestException(
+        'Booking changed since the request: the cut no longer leaves any cargo.',
+      );
+    }
+    if (booking.bulkTotalWeightTons != null) {
+      const share = tons / Number(booking.cargoTotalWeightVgm);
+      await manager.getRepository(Booking).update(booking.id, {
+        bulkTotalWeightTons: round3(Number(booking.bulkTotalWeightTons) * (1 - share)),
+      });
+    }
+  }
+
+  /**
+   * Free the wagon capacity of the cancelled container units. Items are matched
+   * by container number; an allocation left with no items is deleted whole
+   * (hard delete — the unassignBooking convention for allocation rows).
+   * A booking not yet placed on a train simply has nothing to release.
+   */
+  private async releaseContainerAllocations(
+    manager: EntityManager,
+    bookingId: string,
+    containerNumbers: string[],
+  ): Promise<void> {
+    if (!containerNumbers.length) return;
+    const allocations = await manager.getRepository(WagonBookingAllocation).find({
+      where: { bookingId },
+      relations: { containerItems: true },
+    });
+    for (const alloc of allocations) {
+      const items = alloc.containerItems ?? [];
+      const cut = items.filter(
+        (i) => i.containerNumber && containerNumbers.includes(i.containerNumber),
+      );
+      if (!cut.length) continue;
+      await manager
+        .getRepository(WagonAllocationContainerItem)
+        .delete(cut.map((i) => i.id));
+      if (cut.length === items.length) {
+        await manager.getRepository(WagonBookingAllocation).delete(alloc.id);
+      } else {
+        const cutWeight = cut.reduce((s, i) => s + Number(i.grossWeightTons ?? 0), 0);
+        await manager.getRepository(WagonBookingAllocation).update(alloc.id, {
+          allocatedWeightTons: round3(Number(alloc.allocatedWeightTons) - cutWeight),
+        });
+      }
+    }
+  }
+
+  /**
+   * Free whole bulk wagons — the customer-picked allocations when given
+   * (specific-wagon cancel), topping up newest-first for any picked id that no
+   * longer exists (re-batch between request and fee payment).
+   */
+  private async releaseBulkAllocations(
+    manager: EntityManager,
+    bookingId: string,
+    wagons: number,
+    pickedIds?: string[],
+  ): Promise<void> {
+    const toFree = Math.round(wagons);
+    if (toFree <= 0) return;
+    let allocations: WagonBookingAllocation[] = [];
+    if (pickedIds?.length) {
+      allocations = await manager.getRepository(WagonBookingAllocation).find({
+        where: { id: In(pickedIds), bookingId },
+      });
+    }
+    if (allocations.length < toFree) {
+      const have = new Set(allocations.map((a) => a.id));
+      const fill = await manager.getRepository(WagonBookingAllocation).find({
+        where: { bookingId },
+        order: { createdAt: 'DESC' },
+      });
+      for (const a of fill) {
+        if (allocations.length >= toFree) break;
+        if (!have.has(a.id)) allocations.push(a);
+      }
+    }
+    allocations = allocations.slice(0, toFree);
+    if (!allocations.length) return;
+    const ids = allocations.map((a) => a.id);
+    await manager
+      .getRepository(WagonAllocationBulkLoad)
+      .delete({ wagonBookingAllocationId: In(ids) });
+    await manager.getRepository(WagonBookingAllocation).delete(ids);
+  }
+
+  /** Pre-reduction quantities snapshot (only when the booking was never split before). */
+  private async currentQuantities(
+    manager: EntityManager,
+    booking: Booking,
+    _droppedWeight: number,
+  ): Promise<{ bulkTons?: number; bySize?: Record<string, number> }> {
+    if (booking.freightType !== 'CONTAINER') {
+      return { bulkTons: Number(booking.cargoTotalWeightVgm) };
+    }
+    // Lines were already reduced inside this transaction — read them with
+    // deleted rows included to reconstruct the pre-cut ledger.
+    const lines = await manager.getRepository(BookingContainer).find({
+      where: { bookingId: booking.id },
+      withDeleted: true,
+    });
+    const bySize: Record<string, number> = {};
+    for (const line of lines) {
+      const size = line.containerSize ?? '';
+      bySize[size] = (bySize[size] ?? 0) + Number(line.quantity ?? 0);
+    }
+    return { bySize };
+  }
+
+  /** The create-DTO that reconstructs the cancelled cargo on the chosen day. */
+  private buildRebookDto(
+    row: BookingWagonCancellation,
+    scheduledDate: string,
+  ): CreateBookingUnderContractDto {
+    const dto: CreateBookingUnderContractDto = { scheduledDate };
+    const q = row.cancelledQuantities;
+
+    if (q.bySize && Object.keys(q.bySize).length) {
+      const units = q.units ?? [];
+      dto.containers = Object.entries(q.bySize).map(([size, quantity]) => {
+        const sized = units.filter((u) => u.containerSize === size);
+        if (sized.length !== quantity) {
+          throw new BadRequestException(
+            `Credit is missing unit snapshots for size ${size} (${sized.length}/${quantity}) — contact EDR support.`,
+          );
+        }
+        return {
+          containerSize: size,
+          quantity,
+          units: sized.map((u) => ({
+            containerNumber: u.containerNumber,
+            sealNumber: u.sealNumber ?? undefined,
+            vgmTons: u.vgmTons,
+            isHazardous: u.isHazardous,
+            isReefer: u.isReefer,
+          })),
+          hazardousQuantity: sized.filter((u) => u.isHazardous).length,
+          reeferQuantity: sized.filter((u) => u.isReefer).length,
+        };
+      });
+      return dto;
+    }
+
+    dto.bulkLines = [{ cargoWeightTons: Number(q.bulkTons ?? row.weightTons) }];
+    return dto;
+  }
+
+  /**
+   * Carry the source booking's finished clearance onto the rebooked one: the
+   * cargo is already cleared; a new train date needs no new customs cycle.
+   * Seeds the standard milestone set idempotently, then mirrors every
+   * non-pending milestone status from the source by milestone code.
+   */
+  private async copyClearanceState(source: Booking, newBookingId: string): Promise<void> {
+    const repo = this.dataSource.getRepository(ClearanceMilestone);
+    const sourceMilestones = await repo.find({ where: { bookingId: source.id } });
+    if (!sourceMilestones.length) return;
+
+    try {
+      await this.clearanceMilestones.ensureBookingMilestones(
+        newBookingId,
+        source.tradeDirection,
+      );
+      const targets = await repo.find({ where: { bookingId: newBookingId } });
+      const byCode = new Map(targets.map((m) => [m.milestoneCode, m]));
+      for (const src of sourceMilestones) {
+        if (src.status === 'PENDING') continue;
+        const target = byCode.get(src.milestoneCode);
+        if (!target) continue;
+        await repo.update(target.id, {
+          status: src.status,
+          triggeredAt: src.triggeredAt,
+          triggeredByUserId: src.triggeredByUserId,
+          triggeredByDoc: src.triggeredByDoc,
+          note: src.note,
+          metadata: src.metadata,
+        });
+      }
+      if (source.clearanceCurrentPhase) {
+        await this.dataSource.getRepository(Booking).update(newBookingId, {
+          clearanceCurrentPhase: source.clearanceCurrentPhase,
+          preClearanceFinalizedAt: source.preClearanceFinalizedAt,
+          dutyRequired: source.dutyRequired,
+        });
+      }
+    } catch (err) {
+      // Clearance copy must never lose a paid rebooking — staff can re-complete
+      // milestones by hand if this ever fails.
+      this.logger.error(
+        `Clearance copy ${source.id} → ${newBookingId} failed: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+  }
+
+  private notifyCustomer(booking: Booking, title: string, body: string, linkBookingId?: string): void {
+    void this.inbox.notify({
+      recipients: { companyId: booking.companyId },
+      audience: NotificationAudience.PORTAL,
+      type: NotificationType.BOOKING_STATUS,
+      title,
+      body,
+      link: `/bookings/${linkBookingId ?? booking.id}`,
+      data: { bookingId: linkBookingId ?? booking.id, reference: booking.reference },
+    });
+  }
+
+  private notifyStaff(booking: Booking, title: string, body: string): void {
+    void this.inbox.notify({
+      recipients: { permissionKeys: [FREIGHT_PERMS.bookings.getNotification] },
+      audience: NotificationAudience.BACKOFFICE,
+      type: NotificationType.BOOKING_STATUS,
+      title,
+      body,
+      // The portal path `/bookings/:id` used to be sent here, which 404s in the
+      // dashboard. The staff view of these lives on the queue page.
+      link: '/dashboard/wagon-cancellations',
+      data: { bookingId: booking.id, reference: booking.reference },
+    });
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-wagon-cancellations.repository.ts b/apps/edr-freight-api/src/modules/bookings/booking-wagon-cancellations.repository.ts
new file mode 100644
index 000000000..64cde269f
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/bookings/booking-wagon-cancellations.repository.ts
@@ -0,0 +1,85 @@
+import { BaseRepository } from '@edr/api-common';
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository, SelectQueryBuilder } from 'typeorm';
+
+import { BookingWagonCancellation } from './entities/booking-wagon-cancellation.entity';
+
+export interface WagonCancellationListFilter {
+  status?: string[];
+  /** Booking reference / company name search (staff list). */
+  search?: string;
+  companyId?: string;
+  bookingId?: string;
+  from?: Date;
+  to?: Date;
+  page?: number;
+  pageSize?: number;
+}
+
+@Injectable()
+export class BookingWagonCancellationsRepository extends BaseRepository<BookingWagonCancellation> {
+  constructor(
+    @InjectRepository(BookingWagonCancellation)
+    repository: Repository<BookingWagonCancellation>,
+  ) {
+    super(repository);
+  }
+
+  /** The one open (fee-unpaid) cancellation of a booking, if any. */
+  findOpenForBooking(bookingId: string): Promise<BookingWagonCancellation | null> {
+    return this.repository.findOne({
+      where: { bookingId, status: 'FEE_PENDING' },
+    });
+  }
+
+  findByFeeInvoiceId(feeInvoiceId: string): Promise<BookingWagonCancellation | null> {
+    return this.repository.findOne({ where: { feeInvoiceId } });
+  }
+
+  /** Paged history — staff see everything, customers are scoped by companyId. */
+  async list(
+    filter: WagonCancellationListFilter,
+  ): Promise<{ items: BookingWagonCancellation[]; total: number }> {
+    const page = Math.max(1, filter.page ?? 1);
+    const pageSize = Math.min(100, Math.max(1, filter.pageSize ?? 10));
+
+    const qb = this.baseQuery();
+    if (filter.bookingId) {
+      qb.andWhere('(bwc.booking_id = :bookingId OR bwc.rebooked_booking_id = :bookingId)', {
+        bookingId: filter.bookingId,
+      });
+    }
+    if (filter.companyId) {
+      qb.andWhere('booking.company_id = :companyId', { companyId: filter.companyId });
+    }
+    if (filter.status?.length) {
+      qb.andWhere('bwc.status IN (:...statuses)', { statuses: filter.status });
+    }
+    if (filter.search) {
+      qb.andWhere('(booking.reference ILIKE :search OR company.name ILIKE :search)', {
+        search: `%${filter.search}%`,
+      });
+    }
+    if (filter.from) qb.andWhere('bwc.created_at >= :from', { from: filter.from });
+    if (filter.to) qb.andWhere('bwc.created_at <= :to', { to: filter.to });
+
+    // Property path (not raw column): skip/take builds a distinct-id subquery
+    // and the ORDER BY must resolve inside it.
+    const [items, total] = await qb
+      .orderBy('bwc.createdAt', 'DESC')
+      .skip((page - 1) * pageSize)
+      .take(pageSize)
+      .getManyAndCount();
+    return { items, total };
+  }
+
+  private baseQuery(): SelectQueryBuilder<BookingWagonCancellation> {
+    return this.repository
+      .createQueryBuilder('bwc')
+      .leftJoinAndSelect('bwc.booking', 'booking')
+      .leftJoinAndSelect('booking.company', 'company')
+      .leftJoinAndSelect('bwc.rebookedBooking', 'rebookedBooking')
+      .leftJoinAndSelect('bwc.feeInvoice', 'feeInvoice');
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
index 837d0d801..f10b5f021 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
@@ -15,13 +15,17 @@ import {
   UnauthorizedException,
   UploadedFile,
   UploadedFiles,
-  UseGuards,
   UseInterceptors,
 } from '@nestjs/common';
 import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
-import { JwtGuard } from '@tria-plc/api-common/modules/auth/services/jwt.guard';
-import { BookingStaff, BookingView } from '../../common/booking-guards';
+import {
+  BookingStaff,
+  BookingView,
+  MixedAudience,
+  PortalCustomer,
+  WagonCancellationView,
+} from '../../common/booking-guards';
 import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { AnyFilesInterceptor, FileInterceptor } from '@nestjs/platform-express';
 import {
@@ -73,7 +77,14 @@ import { LastMileService } from '../last-mile/last-mile.service';
 import { GenerateGrnDto } from './dto/generate-grn.dto';
 import { ContainerReceiptService } from './container-receipt.service';
 import { SignContractDto } from './dto/sign-contract.dto';
+import { SetExportHandoverModeDto } from './dto/set-export-handover-mode.dto';
 import { UpdateBookingDto } from './dto/update-booking.dto';
+import { BookingWagonCancellationService } from './booking-wagon-cancellation.service';
+import {
+  FilterWagonCancellationsDto,
+  RebookCancelledWagonsDto,
+  RequestWagonCancellationDto,
+} from './dto/wagon-cancellation.dto';
 import {
   type AuthUserPayload,
   resolveAuthUserId,
@@ -153,9 +164,11 @@ export class BookingsController {
     private readonly firstMileService: FirstMileService,
     private readonly lastMileService: LastMileService,
     private readonly userTradeAccessService: UserTradeAccessService,
+    private readonly wagonCancellationService: BookingWagonCancellationService,
   ) {}
 
   @Post()
+  @MixedAudience([])
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({ summary: "Create a new freight booking (DRAFT)" })
@@ -196,6 +209,7 @@ export class BookingsController {
   }
 
   @Patch(":id")
+  @MixedAudience([])
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({
@@ -212,6 +226,7 @@ export class BookingsController {
   }
 
   @Get()
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "List freight bookings (paginated)" })
   async findAll(
     @Query() filter: FilterBookingDto,
@@ -287,6 +302,7 @@ export class BookingsController {
   }
 
   @Get("my")
+  @PortalCustomer()
   @ApiOperation({
     summary: "List the current customer's bookings ready for payment",
     description:
@@ -317,6 +333,7 @@ export class BookingsController {
   }
 
   @Get("reference-data")
+  @MixedAudience([])
   @ApiOperation({ summary: "Booking form catalog" })
   @ApiOkResponse({ type: BookingReferenceDataDto })
   getReferenceData(): Promise<BookingReferenceDataDto> {
@@ -324,6 +341,7 @@ export class BookingsController {
   }
 
   @Get("by-reference/:reference")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "Get booking by reference" })
   async findByReference(
     @Param("reference") reference: string,
@@ -341,6 +359,7 @@ export class BookingsController {
   }
 
   @Get(":id")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "Get booking by ID" })
   async findOne(
     @Param("id", ParseUUIDPipe) id: string,
@@ -362,6 +381,7 @@ export class BookingsController {
   }
 
   @Get(':id/available-days')
+  @MixedAudience([])
   @ApiOperation({
     summary:
       'Days bookable for THIS booking (cargo-aware wagon-TYPE gate; days only, no capacity counts)',
@@ -384,6 +404,7 @@ export class BookingsController {
   }
 
   @Get(':id/day-availability')
+  @MixedAudience([])
   @ApiOperation({
     summary:
       'Advisory free-wagon count for a shipment day (planning hint, not enforced). ' +
@@ -409,6 +430,7 @@ export class BookingsController {
   }
 
   @Get(':id/mile-summary')
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({
     summary: 'First/last-mile operational summary for a booking (customer-safe)',
   })
@@ -436,6 +458,7 @@ export class BookingsController {
   }
 
   @Post(':id/customer-truck-assignment')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Customer assigns external truck and driver for terminal pickup' })
   async assignCustomerTruck(
     @Param('id', ParseUUIDPipe) id: string,
@@ -451,6 +474,7 @@ export class BookingsController {
   }
 
   @Get(':id/customer-truck-assignment/freight-order')
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({
     summary:
       'Download freight order copies. The 2 gate copies always print; ?copies=1,2,8 adds waybill-style copies (catalog indexes 1-8).',
@@ -477,6 +501,7 @@ export class BookingsController {
   }
 
   @Get(':id/carriage-acceptance-sheet')
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({
     summary:
       'Download the carriage acceptance sheet (one per booking, lists every allocated wagon)',
@@ -496,7 +521,156 @@ export class BookingsController {
     res.send(buffer);
   }
 
+  @Get(':id/wagons')
+  @ApiOperation({
+    summary:
+      'Allocated wagons for a booking (JSON) — empty until the paid booking is placed on a train',
+  })
+  async wagonAllocations(
+    @Param('id', ParseUUIDPipe) id: string,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    const booking = await this.bookingsService.findById(id);
+    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+      await this.bookingsService.assertCustomerCanAccessBooking(user?.id, booking);
+    }
+    return this.bookingsService.wagonAllocations(id);
+  }
+
+  // ── Partial wagon cancellation (paid bookings) ────────────────────────────
+  // Customer endpoints are ownership-scoped (no portal permission keys); the
+  // staff history/void/rebook variants are permission-gated below.
+
+  @Post(':id/wagon-cancellations/preview')
+  @ApiOperation({ summary: 'Preview the fee/credit of a partial wagon cancellation (no writes)' })
+  async previewWagonCancellation(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: RequestWagonCancellationDto,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    const booking = await this.bookingsService.findById(id);
+    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+      await this.bookingsService.assertCustomerCanAccessBooking(user?.id, booking);
+    }
+    return this.wagonCancellationService.previewCancellation(id, dto);
+  }
+
+  @Post(':id/wagon-cancellations')
+  @ApiOperation({
+    summary:
+      'Request a partial wagon cancellation on a PAID booking — opens the cancellation-fee invoice; wagons are released only once the fee settles',
+  })
+  async requestWagonCancellation(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: RequestWagonCancellationDto,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    const booking = await this.bookingsService.findById(id);
+    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+      await this.bookingsService.assertCustomerCanAccessBooking(user?.id, booking);
+    }
+    return this.wagonCancellationService.requestCancellation(id, dto, user?.id);
+  }
+
+  @Get(':id/wagon-cancellations')
+  @ApiOperation({ summary: 'Wagon-cancellation history of one booking (owner or staff)' })
+  async listBookingWagonCancellations(
+    @Param('id', ParseUUIDPipe) id: string,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    const booking = await this.bookingsService.findById(id);
+    const staff =
+      hasFreightPermission(user, FREIGHT_PERMS.bookings.view) ||
+      hasFreightPermission(user, FREIGHT_PERMS.bookings.wagonCancellationView);
+    if (!staff) {
+      await this.bookingsService.assertCustomerCanAccessBooking(user?.id, booking);
+    }
+    return this.wagonCancellationService.list({ bookingId: id, pageSize: 100 });
+  }
+
+  @Get('wagon-cancellations/my')
+  @ApiOperation({ summary: 'Wagon-cancellation history of the calling customer (paginated, filterable)' })
+  async listMyWagonCancellations(
+    @Query() filter: FilterWagonCancellationsDto,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    const companyId = await this.bookingsService.resolveCustomerCompanyId(user?.id ?? '');
+    if (!companyId) throw new ForbiddenException('No customer company for this user.');
+    return this.wagonCancellationService.list({
+      companyId,
+      status: filter.statuses,
+      search: filter.search,
+      from: filter.from ? new Date(filter.from) : undefined,
+      to: filter.to ? new Date(filter.to) : undefined,
+      page: filter.page,
+      pageSize: filter.pageSize,
+    });
+  }
+
+  @Get('wagon-cancellations/history')
+  @WagonCancellationView()
+  @ApiOperation({ summary: 'All wagon cancellations (staff, paginated, filterable)' })
+  async listAllWagonCancellations(@Query() filter: FilterWagonCancellationsDto) {
+    return this.wagonCancellationService.list({
+      status: filter.statuses,
+      search: filter.search,
+      from: filter.from ? new Date(filter.from) : undefined,
+      to: filter.to ? new Date(filter.to) : undefined,
+      page: filter.page,
+      pageSize: filter.pageSize,
+    });
+  }
+
+  @Post('wagon-cancellations/:cancellationId/withdraw')
+  @ApiOperation({ summary: 'Withdraw a fee-pending wagon cancellation (owner, or staff with the void permission)' })
+  async withdrawWagonCancellation(
+    @Param('cancellationId', ParseUUIDPipe) cancellationId: string,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    await this.assertWagonCancellationActor(
+      cancellationId,
+      user,
+      FREIGHT_PERMS.bookings.wagonCancellationVoid,
+    );
+    return this.wagonCancellationService.withdraw(cancellationId);
+  }
+
+  @Post('wagon-cancellations/:cancellationId/rebook')
+  @ApiOperation({
+    summary:
+      'Rebook a wagon-cancellation credit: pick a shipment day only — the new booking is created under the contract and marked PAID (freight already paid; contract must still be valid)',
+  })
+  async rebookWagonCancellation(
+    @Param('cancellationId', ParseUUIDPipe) cancellationId: string,
+    @Body() dto: RebookCancelledWagonsDto,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    await this.assertWagonCancellationActor(
+      cancellationId,
+      user,
+      FREIGHT_PERMS.bookings.wagonCancellationRebook,
+    );
+    return this.wagonCancellationService.rebook(cancellationId, dto, user?.id);
+  }
+
+  /** Owner-or-staff gate shared by the per-cancellation actions. */
+  private async assertWagonCancellationActor(
+    cancellationId: string,
+    user: TCurrentUser,
+    staffPermission: string,
+  ): Promise<void> {
+    if (hasFreightPermission(user, staffPermission)) return;
+    const row = await this.wagonCancellationService.findById(cancellationId);
+    const booking = await this.bookingsService.findById(row.bookingId);
+    await this.bookingsService.assertCustomerCanAccessBooking(user?.id, booking);
+  }
+
   @Get(':id/customer-trucks')
+  @MixedAudience([
+    FREIGHT_PERMS.bookings.view,
+    FREIGHT_PERMS.bookings.operations,
+    FREIGHT_PERMS.warehouseInventory.view,
+  ])
   @ApiOperation({ summary: 'List customer self-haul trucks (multi-truck) for a booking' })
   async listCustomerTrucks(
     @Param('id', ParseUUIDPipe) id: string,
@@ -510,6 +684,7 @@ export class BookingsController {
   }
 
   @Post(':id/customer-trucks')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Add a customer self-haul truck carrying 1–2 of the booking containers' })
   async addCustomerTruck(
     @Param('id', ParseUUIDPipe) id: string,
@@ -524,6 +699,7 @@ export class BookingsController {
   }
 
   @Post(':id/customer-trucks/bulk')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Bulk add customer trucks from array payload (Excel parsed)' })
   async bulkAddCustomerTrucks(
     @Param('id', ParseUUIDPipe) id: string,
@@ -538,6 +714,7 @@ export class BookingsController {
   }
 
   @Patch(':id/customer-trucks/:assignmentId')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Edit a not-yet-arrived customer truck (plate/driver/type + containers)' })
   async updateCustomerTruck(
     @Param('id', ParseUUIDPipe) id: string,
@@ -553,6 +730,7 @@ export class BookingsController {
   }
 
   @Delete(':id/customer-trucks/:assignmentId')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Remove a not-yet-arrived customer truck from a booking' })
   async removeCustomerTruck(
     @Param('id', ParseUUIDPipe) id: string,
@@ -567,6 +745,7 @@ export class BookingsController {
   }
 
   @Get(':id/customer-trucks/loadable-containers')
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: 'Booking containers not yet loaded onto a truck' })
   async loadableContainers(
     @Param('id', ParseUUIDPipe) id: string,
@@ -579,7 +758,20 @@ export class BookingsController {
     return this.customerTruckService.getLoadableContainers(id);
   }
 
+  @Patch(':id/export-handover-mode')
+  @BookingStaff(FREIGHT_PERMS.bookings.operations)
+  @ApiOperation({
+    summary: 'Export only: choose direct truck-to-train (no warehouse, no GRN) or warehouse first',
+  })
+  setExportHandoverMode(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() dto: SetExportHandoverModeDto,
+  ) {
+    return this.bookingsService.setExportHandoverMode(id, dto.exportHandoverMode);
+  }
+
   @Post(':id/customer-trucks/:assignmentId/load')
+  @BookingStaff(FREIGHT_PERMS.bookings.operations)
   @ApiOperation({ summary: 'Truck_dispatch: load selected containers onto a truck (staff)' })
   async loadCustomerTruck(
     @Param('id', ParseUUIDPipe) id: string,
@@ -594,6 +786,7 @@ export class BookingsController {
   }
 
   @Post(':id/customer-trucks/:assignmentId/depart')
+  @BookingStaff(FREIGHT_PERMS.bookings.operations)
   @ApiOperation({
     summary: 'Register an import truck leaving: containers loaded + weighed gross (staff)',
   })
@@ -611,6 +804,7 @@ export class BookingsController {
   }
 
   @Get(':id/received-pending-grn')
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: 'Containers received into port but not yet on a GRN' })
   async receivedPendingGrn(
     @Param('id', ParseUUIDPipe) id: string,
@@ -624,6 +818,7 @@ export class BookingsController {
   }
 
   @Post(':id/generate-grn')
+  @BookingStaff(FREIGHT_PERMS.bookings.operations)
   @ApiOperation({
     summary:
       'Generate a GRN over the received containers (all received, or a subset) — one GRN per batch',
@@ -641,6 +836,7 @@ export class BookingsController {
   }
 
   @Get(':id/tracking')
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({
     summary: "Shipment tracking timeline for a booking",
     description:
@@ -663,6 +859,7 @@ export class BookingsController {
   }
 
   @Delete(":id")
+  @MixedAudience([])
   @HttpCode(204)
   @ApiOperation({ summary: "Soft-delete DRAFT booking" })
   remove(@Param("id", ParseUUIDPipe) id: string) {
@@ -670,6 +867,7 @@ export class BookingsController {
   }
 
   @Post(":id/documents")
+  @MixedAudience([])
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({ summary: "Upload documents for a booking (DRAFT only)" })
@@ -682,6 +880,7 @@ export class BookingsController {
   }
 
   @Post(":id/generate-price")
+  @MixedAudience([])
   @ApiOperation({
     summary: "Generate price preview (DRAFT or CHANGES_REQUESTED)",
     description:
@@ -693,6 +892,7 @@ export class BookingsController {
   }
 
   @Post(":id/submit")
+  @MixedAudience([])
   @ApiOperation({
     summary: "Customer submit booking",
     description:
@@ -704,6 +904,7 @@ export class BookingsController {
   }
 
   @Post(":id/confirm-submit")
+  @MixedAudience([])
   @ApiOperation({
     summary: "Confirm submit after price change",
     description:
@@ -715,6 +916,7 @@ export class BookingsController {
   }
 
   @Post(":id/reject")
+  @PortalCustomer()
   @ApiOperation({
     summary: "Customer reject price estimate",
     description:
@@ -745,6 +947,7 @@ export class BookingsController {
   }
 
   @Get(':id/clearance')
+  @MixedAudience([FREIGHT_PERMS.bookings.clearanceView, FREIGHT_PERMS.bookings.reviewDocuments])
   @ApiOperation({
     summary:
       "Document-clearance grid (required docs + upload + GL review status)",
@@ -754,6 +957,7 @@ export class BookingsController {
   }
 
   @Post(":id/clearance/documents")
+  @PortalCustomer()
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({
@@ -770,7 +974,10 @@ export class BookingsController {
     return this.transitionService.enrichBookingResponse(booking);
   }
 
+  // Customer requests the operation; GL ET also resubmits here on the
+  // customer's behalf after operations requests changes (BookingChangesRequestedAlert).
   @Post(":id/clearance/proceed")
+  @MixedAudience(FREIGHT_PERMS.contracts.createBooking)
   @ApiOperation({
     summary:
       "Customer requests operation with a schedule day " +
@@ -789,6 +996,7 @@ export class BookingsController {
   }
 
   @Get(":id/export-trains")
+  @MixedAudience([])
   @ApiOperation({
     summary:
       "Export train picker: the day's export trains on the booking's corridor " +
@@ -990,6 +1198,7 @@ export class BookingsController {
   }
 
   @Post(':id/clearance/draft-declaration/accept')
+  @PortalCustomer()
   @ApiOperation({
     summary:
       'Customer accepts the draft customs declaration — unlocks the real customs declaration step for GL Ethiopia',
@@ -1000,6 +1209,7 @@ export class BookingsController {
   }
 
   @Post(':id/clearance/draft-declaration/change')
+  @PortalCustomer()
   @ApiOperation({
     summary:
       'Customer requests a change to the draft customs declaration with a reason — GL Ethiopia sends a corrected draft (repeatable)',
@@ -1026,6 +1236,7 @@ export class BookingsController {
   }
 
   @Post(':id/clearance/duty-slip')
+  @PortalCustomer()
   @UseInterceptors(FileInterceptor('file'))
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Customer uploads duty/tax payment slip on booking' })
@@ -1177,7 +1388,7 @@ export class BookingsController {
   }
 
   @Post(":id/government-expedite")
-  @BookingStaff(FREIGHT_PERMS.bookings.staffAccept)
+  @BookingStaff(FREIGHT_PERMS.bookings.governmentExpedite)
   @ApiOperation({
     summary: "Expedite government booking to PAID / ELIGIBLE for scheduling",
   })
@@ -1201,6 +1412,7 @@ export class BookingsController {
   }
 
   @Get(":id/contract/view")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOkResponse({ type: ContractViewDto })
   @ApiOperation({ summary: "Contract HTML view for portal and backoffice" })
   getContractView(
@@ -1212,6 +1424,7 @@ export class BookingsController {
   }
 
   @Get(":id/contract/document")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "Download contract PDF" })
   async downloadContractDocument(
     @Param("id", ParseUUIDPipe) id: string,
@@ -1227,6 +1440,7 @@ export class BookingsController {
   }
 
   @Get(":id/contract")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "Download contract file (alias)" })
   async downloadContract(
     @Param("id", ParseUUIDPipe) id: string,
@@ -1236,7 +1450,7 @@ export class BookingsController {
   }
 
   @Post(":id/contract/sign")
-  @UseGuards(JwtGuard)
+  @MixedAudience(FREIGHT_PERMS.bookings.signStaff)
   @ApiOperation({ summary: "Apply digital signature (customer or staff)" })
   async signContract(
     @Param("id", ParseUUIDPipe) id: string,
@@ -1257,18 +1471,21 @@ export class BookingsController {
   }
 
   @Get(":id/contract/signatures")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "List contract signatures" })
   getContractSignatures(@Param("id", ParseUUIDPipe) id: string) {
     return this.contractService.getSignatures(id);
   }
 
   @Get(":id/summary")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "Contract summary string for dashboard" })
   getSummary(@Param("id", ParseUUIDPipe) id: string) {
     return this.contractService.getSummary(id);
   }
 
   @Post(":id/customer/sign")
+  @PortalCustomer()
   @ApiOperation({
     summary: "Customer digital signature (deprecated — use POST contract/sign)",
   })
@@ -1335,7 +1552,21 @@ export class BookingsController {
     return this.transitionService.enrichBookingResponse(booking);
   }
 
+  @Post(":id/customer-cancel")
+  @ApiOperation({
+    summary:
+      "Customer cancels their own booking before payment — no cancellation fee",
+  })
+  async customerCancel(
+    @Param("id", ParseUUIDPipe) id: string,
+    @Body() dto: RejectBookingDto,
+  ) {
+    const booking = await this.transitionService.customerCancel(id, dto.reason);
+    return this.transitionService.enrichBookingResponse(booking);
+  }
+
   @Post(":id/cancel-hold")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Customer cancels an unpaid hold (SELECTED_FOR_BATCH → CANCELLED); " +
@@ -1350,18 +1581,21 @@ export class BookingsController {
   }
 
   @Post(":id/consolidation")
+  @PortalCustomer()
   @ApiOperation({ summary: "Request freight consolidation" })
   requestConsolidation(@Param("id", ParseUUIDPipe) id: string) {
     return this.bookingsService.requestConsolidation(id);
   }
 
   @Delete(":id/consolidation")
+  @PortalCustomer()
   @ApiOperation({ summary: "Remove consolidation pairing" })
   removeConsolidation(@Param("id", ParseUUIDPipe) id: string) {
     return this.bookingsService.removeConsolidation(id);
   }
 
   @Get(":id/consolidation")
+  @MixedAudience(FREIGHT_PERMS.bookings.view)
   @ApiOperation({ summary: "Get consolidation details" })
   getConsolidationDetails(@Param("id", ParseUUIDPipe) id: string) {
     return this.bookingsService.getConsolidationDetails(id);
diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.module.ts b/apps/edr-freight-api/src/modules/bookings/bookings.module.ts
index 84354d860..658629592 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.module.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.module.ts
@@ -25,6 +25,7 @@ import { BookingLifecycleNotifierService } from './booking-lifecycle-notifier.se
 import { BookingTransitionService } from './booking-transition.service';
 import { NotificationsModule } from '../notifications/notifications.module';
 import { NotificationInboxModule } from '../notification-inbox/notification-inbox.module';
+import { BookingAllocationController } from './booking-allocation.controller';
 import { BookingsController } from './bookings.controller';
 // import { PayController } from './pay.controller';
 import { BookingsRepository } from './bookings.repository';
@@ -38,6 +39,9 @@ import { BookingRateSnapshot } from './entities/booking-rate-snapshot.entity';
 import { BookingContractSignature } from './entities/booking-contract-signature.entity';
 import { BookingReviewNote } from './entities/booking-review-note.entity';
 import { Booking } from './entities/booking.entity';
+import { BookingWagonCancellation } from './entities/booking-wagon-cancellation.entity';
+import { BookingWagonCancellationsRepository } from './booking-wagon-cancellations.repository';
+import { BookingWagonCancellationService } from './booking-wagon-cancellation.service';
 import { CustomerTruckAssignment } from './entities/customer-truck-assignment.entity';
 import { CustomerTruckContainer } from './entities/customer-truck-container.entity';
 import { CustomerTruckAssignmentsRepository } from './customer-truck-assignments.repository';
@@ -65,6 +69,7 @@ import { VehiclesModule } from "../vehicles/vehicles.module";
       BookingReviewNote,
       BookingContractSignature,
       BookingContainerAllocation,
+      BookingWagonCancellation,
       CustomerTruckAssignment,
       CustomerTruckContainer,
     ]),
@@ -88,7 +93,7 @@ import { VehiclesModule } from "../vehicles/vehicles.module";
     SignaturesModule,
     registerExchangeModule(),
   ],
-  controllers: [BookingsController],
+  controllers: [BookingsController, BookingAllocationController],
   providers: [
     BookingsService,
     BookingsRepository,
@@ -109,6 +114,8 @@ import { VehiclesModule } from "../vehicles/vehicles.module";
     CustomerTruckAssignmentsRepository,
     CustomerTruckService,
     ContainerReceiptService,
+    BookingWagonCancellationsRepository,
+    BookingWagonCancellationService,
   ],
   exports: [
     BookingsService,
@@ -120,6 +127,7 @@ import { VehiclesModule } from "../vehicles/vehicles.module";
     ConsolidationService,
     CustomerTruckService,
     ContainerReceiptService,
+    BookingWagonCancellationService,
   ],
 })
 export class BookingsModule { }
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 12c56ac13..2fb9b3032 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
@@ -13,7 +13,7 @@ import { insertWithGeneratedReference } from '@edr/api-common';
 // import { CustomersService } from '../customers/customers.service';
 import { CompaniesService } from '../companies/companies.service';
 import { CompanyKind, CompanyStatus } from '../companies/entities/company.entity';
-import { TrainSchedulingService } from '../train-scheduling/train-scheduling.service';
+import { TrainSchedulingService } from '../train-scheduling/services/train-scheduling.service';
 import { eatDay } from '../train-scheduling/batch-window.util';
 import { FilesService } from '../files/files.service';
 import { MinioService } from '../minio/minio.service';
@@ -28,7 +28,7 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { DataSource, In } from 'typeorm';
 
 import { deriveTradeDirection } from '../../common/derive-trade-direction.util';
-import { assertExportReceivedWithGrn } from '../../common/export-received-gate';
+import { assertExportReceivedWithGrn, DIRECT_TO_TRAIN } from '../../common/export-received-gate';
 import { Yard } from '../rule-engine/entities/yard.entity';
 import { ServiceType } from '../rule-engine/entities/service-type.entity';
 import { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
@@ -92,6 +92,7 @@ interface CarriageAcceptanceWagonRow {
 interface CarriageAcceptanceReceivedRow {
   allocatedWeightTons: string | null;
   containerNumbers: string | null;
+  sealNumbers?: string | null;
 }
 
 const URGENT_PRIORITY_THRESHOLD = 1000;
@@ -285,10 +286,28 @@ export class BookingsService {
     // Receipt is proven by the warehouse GRN, but the GRN is warehouse paperwork
     // and never appears on this sheet — it is only the signal that EDR has taken
     // the cargo, which is what the customer's sheet attests to.
+    const isDirectExport =
+      booking.tradeDirection === 'EXPORT' && booking.exportHandoverMode === DIRECT_TO_TRAIN;
     const pendingWagons = wagons.length === 0;
     if (pendingWagons) {
-      const receivedLines: CarriageAcceptanceReceivedRow[] =
-        booking.tradeDirection === 'EXPORT'
+      // Direct truck-to-train cargo never enters the warehouse, so there is no
+      // GRN'd inventory to build the sheet from. Choosing direct handover is
+      // itself the acceptance, so the sheet issues off the containers the
+      // customer declared on the booking — freight.containers only gains rows at
+      // allocation, by which point the wagon query above already serves.
+      const receivedLines: CarriageAcceptanceReceivedRow[] = isDirectExport
+        ? await this.dataSource.query(
+            `SELECT NULL::numeric        AS "allocatedWeightTons",
+                    unit.container_number AS "containerNumbers",
+                    unit.seal_number      AS "sealNumbers"
+               FROM freight.booking_container_units unit
+               JOIN freight.booking_container line
+                 ON line.id = unit.booking_container_id AND line.deleted_at IS NULL
+              WHERE line.booking_id = $1 AND unit.deleted_at IS NULL
+              ORDER BY unit.container_number`,
+            [bookingId],
+          )
+        : booking.tradeDirection === 'EXPORT'
           ? await this.dataSource.query(
               `SELECT inv.weight         AS "allocatedWeightTons",
                       c.container_number AS "containerNumbers"
@@ -304,6 +323,17 @@ export class BookingsService {
               [bookingId],
             )
           : [];
+      // Bulk direct cargo has no containers — one line carrying the booking's
+      // declared weight still makes a valid sheet. bulkTotalWeightTons only
+      // holds the real tonnage for PER_ITEM break-bulk; everywhere else (PER_TON
+      // bulk and every container booking) the VGM column is the weight.
+      if (isDirectExport && receivedLines.length === 0) {
+        const totalWeight = booking.bulkTotalWeightTons ?? booking.cargoTotalWeightVgm;
+        receivedLines.push({
+          allocatedWeightTons: totalWeight == null ? null : String(totalWeight),
+          containerNumbers: null,
+        });
+      }
       if (receivedLines.length === 0) {
         throw new BadRequestException(
           booking.tradeDirection === 'EXPORT'
@@ -324,7 +354,7 @@ export class BookingsService {
         marshalledAt: null,
         arrivalAt: null,
         containerNumbers: row.containerNumbers,
-        sealNumbers: null,
+        sealNumbers: row.sealNumbers ?? null,
       }));
     }
 
@@ -339,6 +369,64 @@ export class BookingsService {
     };
   }
 
+  /**
+   * Allocated wagons of a booking as JSON — the portal's "Wagons" tab. Same
+   * join chain as the carriage acceptance sheet, but structured (containers as
+   * an array per wagon, bulk load description when the wagon carries bulk).
+   * Empty array until the booking has been allocated onto a train.
+   */
+  async wagonAllocations(bookingId: string): Promise<unknown[]> {
+    return this.dataSource.query(
+      `SELECT a.id                             AS "allocationId",
+              tsw.sequence_no                  AS "sequenceNo",
+              w.wagon_number                   AS "wagonNumber",
+              COALESCE(wt.name, wt.code)       AS "wagonType",
+              wt.code                          AS "wagonTypeCode",
+              wt.tare_weight_tons              AS "tareWeightTons",
+              tsw.capacity_tons                AS "capacityTons",
+              tsw.length_meters                AS "lengthMeters",
+              a.allocated_weight_tons          AS "allocatedWeightTons",
+              a.load_type                      AS "loadType",
+              a.status                         AS "status",
+              s.train_number                   AS "trainNumber",
+              s.scheduled_departure_date       AS "departureAt",
+              so.label                         AS "originStation",
+              sd.label                         AS "destinationStation",
+              bl.cargo_description             AS "bulkCargoDescription",
+              bl.quantity                      AS "bulkQuantity",
+              COALESCE(
+                json_agg(
+                  json_build_object(
+                    'containerNumber', ci.container_number,
+                    'sealNumber', ci.seal_number,
+                    'positionOnWagon', ci.position_on_wagon,
+                    'grossWeightTons', ci.gross_weight_tons
+                  ) ORDER BY ci.position_on_wagon, ci.container_number
+                ) FILTER (WHERE ci.id IS NOT NULL),
+                '[]'
+              )                                AS "containers"
+         FROM freight.wagon_booking_allocations a
+         JOIN freight.train_set_wagons tsw
+           ON tsw.id = a.train_set_wagon_id AND tsw.deleted_at IS NULL
+         LEFT JOIN freight.wagon_types wt ON wt.id = tsw.wagon_type_id
+         LEFT JOIN freight.wagons w ON w.id = tsw.physical_wagon_id
+         LEFT JOIN freight.train_schedules s
+           ON s.train_set_id = tsw.train_set_id AND s.deleted_at IS NULL
+         LEFT JOIN freight.yards so ON so.id = s.origin_station_id
+         LEFT JOIN freight.yards sd ON sd.id = s.destination_station_id
+         LEFT JOIN freight.wagon_allocation_container_items ci
+           ON ci.wagon_booking_allocation_id = a.id AND ci.deleted_at IS NULL
+         LEFT JOIN freight.wagon_allocation_bulk_loads bl
+           ON bl.wagon_booking_allocation_id = a.id AND bl.deleted_at IS NULL
+        WHERE a.booking_id = $1 AND a.deleted_at IS NULL
+        GROUP BY tsw.id, a.id, w.wagon_number, wt.name, wt.code, wt.tare_weight_tons,
+                 s.train_number, s.scheduled_departure_date, so.label, sd.label,
+                 bl.cargo_description, bl.quantity
+        ORDER BY tsw.sequence_no`,
+      [bookingId],
+    );
+  }
+
   /**
    * Split the booking amount across its wagons, proportional to allocated weight
    * (equal shares when no weights are recorded). The last row absorbs the rounding
@@ -366,7 +454,10 @@ export class BookingsService {
 
     const departureStation = booking.originYard?.label ?? booking.originYard?.code ?? '-';
     const arrivalStation = booking.destinationYard?.label ?? booking.destinationYard?.code ?? '-';
-    const cargoName = booking.cargoType?.cargoTypeName ?? booking.cargoFreeText ?? '-';
+    // Container bookings carry no cargo type or free text — name the freight type
+    // rather than printing a dash in the Cargo Name column.
+    const cargoName =
+      booking.cargoType?.cargoTypeName ?? booking.cargoFreeText ?? booking.freightType ?? '-';
     const currency = booking.paymentCurrency ?? 'ETB';
     const totalAmount = Number(booking.adjustedTotalAmount ?? booking.totalAmount) || 0;
     const prices = this.splitAmountAcrossWagons(
@@ -409,6 +500,28 @@ export class BookingsService {
       )
       .join('');
 
+    // The totals belong in <tbody>, not <tfoot>: the Chromium-less fallback
+    // renderer only parses tbody rows, so a <tfoot> silently drops every footer
+    // figure from the printed sheet.
+    const totalsRow = `<tr class="totals">
+        <td>TOT</td>
+        <td>${wagons.length} ${pendingWagons ? 'received lines' : 'wagons'}</td>
+        <td>${
+          pendingWagons
+            ? 'pending marshalling'
+            : `full ${fullWagons} / empty ${wagons.length - fullWagons}`
+        }</td>
+        <td class="num">${num(totals.tare, 2)}</td>
+        <td class="num">${num(totals.length)}</td>
+        <td class="num">${num(totals.capacity)}</td>
+        <td></td>
+        <td>Gross ${num(totals.tare + totals.load)} T</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td class="num">${money(totalAmount)}</td>
+      </tr>`;
+
     return `<!doctype html>
 <html>
 <head>
@@ -432,7 +545,7 @@ export class BookingsService {
     th { background: #f8fafc; color: #475569; text-align: left; }
     th, td { border: 1px solid #cbd5e1; padding: 5px 6px; font-size: 9.5px; vertical-align: top; }
     .num { text-align: right; }
-    tfoot td { background: #f8fafc; font-weight: 700; }
+    tr.totals td { background: #f8fafc; font-weight: 700; }
     .notice { margin-top: 10px; border-left: 4px solid #0f766e; background: #f0fdfa; padding: 8px 10px; font-size: 10px; color: #134e4a; }
     .signatures { display: grid; grid-template-columns: repeat(3, 1fr); gap: 18px; margin-top: 34px; }
     .line { border-top: 1px solid #334155; padding-top: 7px; font-size: 9px; color: #475569; min-height: 34px; }
@@ -480,21 +593,8 @@ export class BookingsService {
     </thead>
     <tbody>
       ${rows}
+      ${totalsRow}
     </tbody>
-    <tfoot>
-      <tr>
-        <td colspan="3">${
-          pendingWagons
-            ? `Received lines: ${wagons.length} — wagons pending marshalling`
-            : `Total wagons: ${wagons.length} (full ${fullWagons} / empty ${wagons.length - fullWagons})`
-        }</td>
-        <td class="num">${num(totals.tare, 2)}</td>
-        <td class="num">${num(totals.length)}</td>
-        <td class="num">${num(totals.capacity)}</td>
-        <td colspan="5">Gross weight (tare + load): ${num(totals.tare + totals.load)} T</td>
-        <td class="num">${money(totalAmount)}</td>
-      </tr>
-    </tfoot>
   </table>
 
   <div class="notice">
@@ -1425,7 +1525,46 @@ export class BookingsService {
           tradeDirection,
         );
     }
-    if (dto.scheduledDate) updates.scheduledDate = new Date(dto.scheduledDate);
+    // Re-pinning the departure day on an edit (e.g. fixing a CHANGES_REQUESTED
+    // booking) must obey the same gate as creation: the route needs an OPEN
+    // departure on that EAT day that can carry the cargo. Skipped when the day
+    // didn't change, for general contracts (period-based, no pinned day) and
+    // for intercity (staff assign a passing train later).
+    if (dto.scheduledDate) {
+      const day = eatDay(new Date(dto.scheduledDate));
+      const dayChanged =
+        !existing.scheduledDate || eatDay(existing.scheduledDate) !== day;
+      if (
+        dayChanged &&
+        existing.bookingType !== 'GENERAL_CONTRACT' &&
+        tradeDirection !== 'DOMESTIC'
+      ) {
+        const { hasDeparture, hasCompatible } =
+          await this.trainSchedulingService.checkDayCargoCompatibility(
+            originYardId,
+            destinationYardId,
+            day,
+            {
+              freightType: freightType as 'CONTAINER' | 'BULK',
+              cargoTypeId,
+              containerTypeIds: containers
+                .map((c) => c.containerTypeId)
+                .filter((cid): cid is string => Boolean(cid)),
+            },
+          );
+        if (!hasDeparture) {
+          throw new BadRequestException(
+            'No departures available on the selected day for this route',
+          );
+        }
+        if (!hasCompatible) {
+          throw new BadRequestException(
+            'No wagon on the selected day can carry this cargo type — please choose another day',
+          );
+        }
+      }
+      updates.scheduledDate = new Date(dto.scheduledDate);
+    }
     if (dto.estimatedShipmentDate)
       updates.estimatedShipmentDate = new Date(dto.estimatedShipmentDate);
     if (dto.startDate) updates.startDate = new Date(dto.startDate);
@@ -1888,6 +2027,47 @@ export class BookingsService {
   }
 
   /** Get a single booking by ID with files. */
+  /**
+   * EXPORT only. Choose how the cargo reaches the train. DIRECT_TO_TRAIN takes
+   * the booking out of the warehouse flow entirely — no receipt, no GRN, and the
+   * carriage acceptance sheet becomes issuable straight away.
+   *
+   * Switching to direct is refused once the goods are already in the shed:
+   * inventory exists, so the cargo demonstrably went the warehouse route and its
+   * GRN paperwork must stand.
+   */
+  async setExportHandoverMode(
+    bookingId: string,
+    mode: string,
+  ): Promise<{ bookingId: string; exportHandoverMode: string }> {
+    const booking = await this.bookingsRepository.findById(bookingId);
+    if (!booking) {
+      throw new NotFoundException(`Booking ${bookingId} not found`);
+    }
+    if ((booking.tradeDirection ?? '').toUpperCase() !== 'EXPORT') {
+      throw new BadRequestException('Handover mode applies to export bookings only');
+    }
+    if (mode === DIRECT_TO_TRAIN) {
+      const [stored]: Array<{ one: number }> = await this.dataSource.query(
+        `SELECT 1 AS one
+           FROM freight.warehouse_inventory
+          WHERE booking_id = $1 AND deleted_at IS NULL
+          LIMIT 1`,
+        [bookingId],
+      );
+      if (stored) {
+        throw new BadRequestException(
+          'This booking already has cargo in the warehouse, so it cannot be switched to direct truck-to-train',
+        );
+      }
+    }
+    await this.dataSource.query(
+      `UPDATE freight.bookings SET export_handover_mode = $2, updated_at = NOW() WHERE id = $1`,
+      [bookingId, mode],
+    );
+    return { bookingId, exportHandoverMode: mode };
+  }
+
   async findById(id: string): Promise<Booking> {
     const booking = await this.bookingsRepository.findByIdWithFiles(id);
     if (!booking) {
diff --git a/apps/edr-freight-api/src/modules/bookings/dto/set-export-handover-mode.dto.ts b/apps/edr-freight-api/src/modules/bookings/dto/set-export-handover-mode.dto.ts
new file mode 100644
index 000000000..c2685cba0
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/bookings/dto/set-export-handover-mode.dto.ts
@@ -0,0 +1,15 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsIn } from 'class-validator';
+
+import { DIRECT_TO_TRAIN, WAREHOUSE } from '../../../common/export-received-gate';
+
+export class SetExportHandoverModeDto {
+  @ApiProperty({
+    enum: [DIRECT_TO_TRAIN, WAREHOUSE],
+    description:
+      'DIRECT_TO_TRAIN — the customer truck loads straight onto the wagon (no warehouse, no GRN). ' +
+      'WAREHOUSE — received at the warehouse and issued a GRN first.',
+  })
+  @IsIn([DIRECT_TO_TRAIN, WAREHOUSE])
+  exportHandoverMode!: string;
+}
diff --git a/apps/edr-freight-api/src/modules/bookings/dto/wagon-cancellation.dto.ts b/apps/edr-freight-api/src/modules/bookings/dto/wagon-cancellation.dto.ts
new file mode 100644
index 000000000..6a5dfe112
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/bookings/dto/wagon-cancellation.dto.ts
@@ -0,0 +1,112 @@
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import {
+  ArrayNotEmpty,
+  IsArray,
+  IsDateString,
+  IsIn,
+  IsInt,
+  IsNumber,
+  IsOptional,
+  IsString,
+  IsUUID,
+  MaxLength,
+  Min,
+  ValidateNested,
+} from 'class-validator';
+
+import { WAGON_CANCELLATION_STATUSES } from '../entities/booking-wagon-cancellation.entity';
+
+export class CancelContainerLineDto {
+  @ApiProperty({ description: 'Container size (ft) as stored on the booking line, e.g. "20", "40"' })
+  @IsString()
+  containerSize!: string;
+
+  @ApiProperty({ description: 'How many units of this size to cancel' })
+  @IsInt()
+  @Min(1)
+  quantity!: number;
+}
+
+export class RequestWagonCancellationDto {
+  @ApiPropertyOptional({
+    description:
+      'Cancel SPECIFIC allocated wagons: wagon_booking_allocation ids from GET /bookings/:id/wagons. ' +
+      'When set, wagons/containers are derived from the selected wagons and the other fields are ignored.',
+    type: [String],
+  })
+  @IsOptional()
+  @IsArray()
+  @ArrayNotEmpty()
+  @IsUUID('4', { each: true })
+  wagonAllocationIds?: string[];
+
+  @ApiPropertyOptional({
+    description: 'BULK bookings: number of wagons to cancel (tons derived proportionally)',
+  })
+  @IsOptional()
+  @IsNumber()
+  @Min(0.5)
+  wagons?: number;
+
+  @ApiPropertyOptional({
+    description: 'CONTAINER bookings: units to cancel per size (wagons derived per size)',
+    type: [CancelContainerLineDto],
+  })
+  @IsOptional()
+  @IsArray()
+  @ArrayNotEmpty()
+  @ValidateNested({ each: true })
+  @Type(() => CancelContainerLineDto)
+  containers?: CancelContainerLineDto[];
+
+  @ApiPropertyOptional({ description: 'Customer reason for the cancellation' })
+  @IsOptional()
+  @IsString()
+  @MaxLength(1000)
+  reason?: string;
+}
+
+export class RebookCancelledWagonsDto {
+  @ApiProperty({ description: 'Shipment day the credit is rebooked onto (ISO date)' })
+  @IsDateString()
+  scheduledDate!: string;
+}
+
+export class FilterWagonCancellationsDto {
+  @ApiPropertyOptional({ enum: WAGON_CANCELLATION_STATUSES, isArray: true })
+  @IsOptional()
+  @IsArray()
+  @IsIn(WAGON_CANCELLATION_STATUSES as readonly string[], { each: true })
+  statuses?: string[];
+
+  @ApiPropertyOptional({ description: 'Booking reference / company name search' })
+  @IsOptional()
+  @IsString()
+  @MaxLength(120)
+  search?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDateString()
+  from?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDateString()
+  to?: string;
+
+  @ApiPropertyOptional({ default: 1 })
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  page?: number;
+
+  @ApiPropertyOptional({ default: 10 })
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  pageSize?: number;
+}
diff --git a/apps/edr-freight-api/src/modules/bookings/entities/booking-wagon-cancellation.entity.ts b/apps/edr-freight-api/src/modules/bookings/entities/booking-wagon-cancellation.entity.ts
new file mode 100644
index 000000000..723ea5d1c
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/bookings/entities/booking-wagon-cancellation.entity.ts
@@ -0,0 +1,137 @@
+import { BaseEntity } from '@edr/api-common';
+import { Column, Entity, Index, JoinColumn, ManyToOne } from 'typeorm';
+
+import { Invoice } from '../../billing/entities/invoice.entity';
+import { Rate } from '../../rule-engine/entities/rate.entity';
+import { Booking } from './booking.entity';
+
+export const WAGON_CANCELLATION_STATUSES = [
+  // Requested; fee invoice open; wagons still allocated to the customer.
+  'FEE_PENDING',
+  // Fee settled; booking reduced, wagons freed; credit waiting for a rebook.
+  'CREDIT_AVAILABLE',
+  // Credit redeemed into a new PAID booking (rebookedBookingId).
+  'REBOOKED',
+  // Customer/staff voided the request before paying the fee. Nothing changed.
+  'WITHDRAWN',
+  // Reserved for a future expiry policy; not set by code today.
+  'EXPIRED',
+] as const;
+
+export type WagonCancellationStatus = (typeof WAGON_CANCELLATION_STATUSES)[number];
+
+/** Snapshot of one physical container unit cut by the cancellation. */
+export interface CancelledUnitSnapshot {
+  containerSize: string;
+  containerNumber: string;
+  sealNumber?: string | null;
+  vgmTons: number;
+  isHazardous: boolean;
+  isReefer: boolean;
+}
+
+/** What the cancellation cut, in the booking's own quantity terms. */
+export interface CancelledQuantities {
+  /** Bulk bookings: tons cut (PER_ITEM cargo: item count, matching cargoTotalWeightVgm). */
+  bulkTons?: number;
+  /** Container bookings: units cut per container size. */
+  bySize?: Record<string, number>;
+  /**
+   * Container bookings: the exact physical units cut. Snapshotted at request
+   * time when the customer picked specific wagons, otherwise at fee settlement
+   * (LIFO trim). The rebook reconstructs the new booking from THESE — never
+   * from a soft-deleted-row scan, which could pick up units dropped by an
+   * unrelated batch split on the same booking.
+   */
+  units?: CancelledUnitSnapshot[];
+  /**
+   * Specific-wagon cancellation: the wagon_booking_allocation ids the customer
+   * picked in the Wagons tab. T2 releases exactly these (fallback to
+   * newest-first for any id that no longer exists, e.g. after a re-batch).
+   */
+  allocationIds?: string[];
+  /**
+   * The wagon allocations were already released from the schedule at REQUEST
+   * time (policy: wagons free up immediately; the fee is still owed before the
+   * credit can be rebooked). Tells T2 to skip its release step so it never
+   * deletes wagons the batch engine re-assigned in between.
+   */
+  releasedAtRequest?: boolean;
+}
+
+/**
+ * One partial-wagon-cancellation cycle on a PAID booking — the audit trail and
+ * the state machine. The credit itself is not a wallet balance: redeeming it
+ * creates a real booking through the under-contract create path and marks it
+ * PAID (see BookingWagonCancellationService).
+ */
+@Entity({ schema: 'freight', name: 'booking_wagon_cancellations' })
+@Index(['bookingId'])
+@Index(['status'])
+export class BookingWagonCancellation extends BaseEntity {
+  @Column({ name: 'booking_id', type: 'uuid' })
+  bookingId!: string;
+
+  @ManyToOne(() => Booking)
+  @JoinColumn({ name: 'booking_id' })
+  booking?: Booking;
+
+  @Column({ name: 'rebooked_booking_id', type: 'uuid', nullable: true })
+  rebookedBookingId?: string | null;
+
+  @ManyToOne(() => Booking, { nullable: true })
+  @JoinColumn({ name: 'rebooked_booking_id' })
+  rebookedBooking?: Booking | null;
+
+  @Column({ name: 'wagons_cancelled', type: 'numeric', precision: 6, scale: 2 })
+  wagonsCancelled!: number;
+
+  @Column({ name: 'weight_tons', type: 'numeric', precision: 12, scale: 3, default: 0 })
+  weightTons!: number;
+
+  @Column({ name: 'cancelled_quantities', type: 'jsonb' })
+  cancelledQuantities!: CancelledQuantities;
+
+  /**
+   * The freight value of the cancelled part at the ORIGINAL booking's price —
+   * informational (shown to the customer as "credit worth"); no refund is ever
+   * issued from it, the credit is redeemed by rebooking.
+   */
+  @Column({ name: 'credit_amount', type: 'numeric', precision: 14, scale: 2, default: 0 })
+  creditAmount!: number;
+
+  @Column({ name: 'fee_rate_id', type: 'uuid', nullable: true })
+  feeRateId?: string | null;
+
+  @ManyToOne(() => Rate, { nullable: true })
+  @JoinColumn({ name: 'fee_rate_id' })
+  feeRate?: Rate | null;
+
+  @Column({ name: 'fee_amount', type: 'numeric', precision: 14, scale: 2 })
+  feeAmount!: number;
+
+  @Column({ name: 'fee_currency', type: 'varchar', length: 8, default: 'ETB' })
+  feeCurrency!: string;
+
+  @Column({ name: 'fee_invoice_id', type: 'uuid', nullable: true })
+  feeInvoiceId?: string | null;
+
+  @ManyToOne(() => Invoice, { nullable: true })
+  @JoinColumn({ name: 'fee_invoice_id' })
+  feeInvoice?: Invoice | null;
+
+  @Column({ name: 'fee_paid_at', type: 'timestamptz', nullable: true })
+  feePaidAt?: Date | null;
+
+  @Column({ name: 'status', type: 'varchar', length: 30, default: 'FEE_PENDING' })
+  status!: string;
+
+  @Column({ name: 'reason', type: 'text', nullable: true })
+  reason?: string | null;
+
+  @Column({ name: 'requested_by_user_id', type: 'uuid', nullable: true })
+  requestedByUserId?: string | null;
+
+  @Column({ name: 'rebooked_at', type: 'timestamptz', nullable: true })
+  rebookedAt?: Date | null;
+}
diff --git a/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts b/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
index 3d339fa19..dbc306e3b 100644
--- a/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
+++ b/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
@@ -302,6 +302,18 @@ export class Booking extends BaseEntity {
   @Column({ name: 'customer_truck_arrived_at', type: 'timestamptz', nullable: true })
   customerTruckArrivedAt?: Date | null;
 
+  /**
+   * EXPORT only. How the cargo reaches the train:
+   *  - DIRECT_TO_TRAIN — the customer's truck loads straight onto the wagon. No
+   *    warehouse, so no GRN is ever raised and the carriage acceptance sheet is
+   *    the only document handed over.
+   *  - WAREHOUSE (also null) — received into the warehouse and GRN'd first.
+   *
+   * Null is treated as WAREHOUSE so existing bookings keep the GRN gate.
+   */
+  @Column({ name: 'export_handover_mode', type: 'varchar', length: 20, nullable: true })
+  exportHandoverMode?: string | null;
+
   /**
    * Did the goods need re-handling in the warehouse? Recorded by warehouse
    * staff after unloading. Only `true` bills the DOUBLE_HANDLING_FEE rule;
diff --git a/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts b/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts
index ac3adb7e8..09c9b677a 100644
--- a/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts
+++ b/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts
@@ -20,7 +20,14 @@ import { CargoesService } from './cargoes.service';
 
 @ApiTags('cargoes')
 @Controller('cargoes')
-@FleetView(FREIGHT_PERMS.cargoes.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@FleetView([
+  FREIGHT_PERMS.cargoes.view,
+  FREIGHT_PERMS.cargoes.create,
+  FREIGHT_PERMS.cargoes.update,
+  FREIGHT_PERMS.cargoes.delete,
+])
 export class CargoesController {
   constructor(private readonly cargoesService: CargoesService) {}
 
diff --git a/apps/edr-freight-api/src/modules/companies/companies.controller.ts b/apps/edr-freight-api/src/modules/companies/companies.controller.ts
index 1c9d75487..78f8db410 100644
--- a/apps/edr-freight-api/src/modules/companies/companies.controller.ts
+++ b/apps/edr-freight-api/src/modules/companies/companies.controller.ts
@@ -11,7 +11,6 @@ import {
   HttpCode,
   HttpStatus,
   UseInterceptors,
-  UseGuards,
   UploadedFiles,
   BadRequestException,
   NotFoundException,
@@ -20,8 +19,7 @@ import { AnyFilesInterceptor } from "@nestjs/platform-express";
 import { ApiOperation, ApiTags, ApiConsumes } from "@nestjs/swagger";
 import { CurrentUser } from "@edr/api-common";
 import type { TCurrentUser } from "@tria-plc/api-common/modules/auth/types/current-user.type";
-import { JwtGuard } from "@tria-plc/api-common/modules/auth/services/jwt.guard";
-import { BookingStaff } from "../../common/booking-guards";
+import { BookingStaff, MixedAudience, PortalCustomer } from "../../common/booking-guards";
 import {
   assertFreightPermission,
   hasFreightPermission,
@@ -118,6 +116,7 @@ export class CompaniesController {
   }
 
   @Get("getInfo")
+  @PortalCustomer()
   @ApiOperation({ summary: "Get company info for the current user" })
   async getInfo(
     @CurrentUser() user: CurrentIamUser,
@@ -131,6 +130,7 @@ export class CompaniesController {
   }
 
   @Get("profile")
+  @PortalCustomer()
   @ApiOperation({ summary: "Get flattened profile for the settings page" })
   async getProfile(
     @CurrentUser() user: CurrentIamUser,
@@ -146,6 +146,7 @@ export class CompaniesController {
   }
 
   @Get("profile/change-request")
+  @PortalCustomer()
   @ApiOperation({
     summary: "Current user's open profile change request (pending/rejected)",
   })
@@ -161,6 +162,7 @@ export class CompaniesController {
   }
 
   @Post("company-profiles/:profileId/reapply")
+  @PortalCustomer()
   @ApiOperation({
     summary: "Resubmit a rejected operational role for approval (→ pending)",
   })
@@ -176,6 +178,7 @@ export class CompaniesController {
   }
 
   @Get("dashboard")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Get portal dashboard KPIs (delivered, spend, freight volume) for the current user",
@@ -191,6 +194,7 @@ export class CompaniesController {
   }
 
   @Post("fetch-etrade-info")
+  @PortalCustomer()
   @ApiOperation({ summary: "Fetch company info from eTrade by TIN" })
   async fetchETradeInfo(
     @CurrentUser() user: CurrentIamUser,
@@ -211,6 +215,7 @@ export class CompaniesController {
   }
 
   @Patch("profile")
+  @PortalCustomer()
   @ApiOperation({ summary: "Update profile (flattened settings page)" })
   async updateProfile(
     @CurrentUser() user: CurrentIamUser,
@@ -220,6 +225,7 @@ export class CompaniesController {
   }
 
   @Post("company-profiles")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Add operational profile(s) (importer/exporter/forwarder) to the current user's company",
@@ -236,6 +242,7 @@ export class CompaniesController {
   }
 
   @Post("onboarding/start")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Begin onboarding: create a draft company + profile + role(s) so later steps can save incrementally",
@@ -261,6 +268,7 @@ export class CompaniesController {
   }
 
   @Post("company-profile")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Create a single operational profile for the current user's company. The role starts pending and does not become the active mode",
@@ -278,6 +286,7 @@ export class CompaniesController {
   }
 
   @Post("company-profiles/:profileId/license")
+  @PortalCustomer()
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({
@@ -298,6 +307,7 @@ export class CompaniesController {
   }
 
   @Post("company-profiles/:profileId/license/:fileId/replace")
+  @PortalCustomer()
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({
@@ -324,6 +334,7 @@ export class CompaniesController {
   }
 
   @Delete("company-profiles/:profileId/license/:fileId")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Remove a business-license file (staged for review on an approved company).",
@@ -341,6 +352,7 @@ export class CompaniesController {
   }
 
   @Get("company-profiles/:profileId/license")
+  @PortalCustomer()
   @ApiOperation({
     summary: "List business-license documents (with review state) for a profile",
   })
@@ -352,6 +364,7 @@ export class CompaniesController {
   }
 
   @Get("poa-delegation")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "List the Power of Attorney delegation letter (with review state) for the current user's company",
@@ -363,6 +376,7 @@ export class CompaniesController {
   }
 
   @Post("poa-delegation")
+  @PortalCustomer()
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({
@@ -383,6 +397,7 @@ export class CompaniesController {
   }
 
   @Delete("poa-delegation/:fileId")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Remove the Power of Attorney delegation letter (staged for review on an approved company).",
@@ -395,6 +410,7 @@ export class CompaniesController {
   }
 
   @Post("identity/fayda/complete")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Bind a completed Fayda verification to the company's owner or Power of Attorney. " +
@@ -405,10 +421,14 @@ export class CompaniesController {
     @CurrentUser() user: CurrentIamUser,
     @Body() dto: CompleteIdentityVerificationDto,
   ): Promise<CompanyIdentityStateDto> {
-    return this.companiesService.completeIdentityVerification(user.id, dto);
+    return this.companiesService.completeIdentityVerification(user.id, dto, {
+      email: user.email,
+      phoneNumber: user.phoneNumber,
+    });
   }
 
   @Post("identity/gm/same-as-owner")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Declare the General Manager is the company's owner, copying the owner's verified identity across. " +
@@ -417,10 +437,14 @@ export class CompaniesController {
   async setGmSameAsOwner(
     @CurrentUser() user: CurrentIamUser,
   ): Promise<CompanyIdentityStateDto> {
-    return this.companiesService.setGmSameAsOwner(user.id);
+    return this.companiesService.setGmSameAsOwner(user.id, {
+      email: user.email,
+      phoneNumber: user.phoneNumber,
+    });
   }
 
   @Delete("identity/gm")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Clear the General Manager's identity — the \"same as owner\" declaration or a verification, and the details either wrote. " +
@@ -432,7 +456,38 @@ export class CompaniesController {
     return this.companiesService.clearGmIdentity(user.id);
   }
 
+  @Post("identity/poa/same-as-owner")
+  @PortalCustomer()
+  @ApiOperation({
+    summary:
+      "Declare the Power of Attorney is the company's owner, copying the owner's identity across. " +
+      "Waives the DARS delegation paper — nobody delegates to themselves. " +
+      "Refused for an Ethiopian company whose owner is not Fayda-verified yet: its representative must be verified, and there would be nothing proven to copy.",
+  })
+  async setPoaSameAsOwner(
+    @CurrentUser() user: CurrentIamUser,
+  ): Promise<CompanyIdentityStateDto> {
+    return this.companiesService.setPoaSameAsOwner(user.id, {
+      email: user.email,
+      phoneNumber: user.phoneNumber,
+    });
+  }
+
+  @Delete("identity/poa/same-as-owner")
+  @PortalCustomer()
+  @ApiOperation({
+    summary:
+      "Undo the Power of Attorney \"same as owner\" declaration and the identity it copied, leaving the representative open to be verified in their own right. " +
+      "Unlike DELETE identity/fayda/poa this is allowed for a freight forwarder — it is how they change who represents them — and leaves the delegation paper on file.",
+  })
+  async clearPoaSameAsOwner(
+    @CurrentUser() user: CurrentIamUser,
+  ): Promise<CompanyIdentityStateDto> {
+    return this.companiesService.clearPoaSameAsOwner(user.id);
+  }
+
   @Delete("identity/fayda/poa")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Remove the company's Power of Attorney — the verified identity, its details and the delegation paper together. " +
@@ -445,6 +500,7 @@ export class CompaniesController {
   }
 
   @Patch("onboarding-step")
+  @PortalCustomer()
   @ApiOperation({ summary: "Persist the user's current onboarding wizard step" })
   @HttpCode(HttpStatus.NO_CONTENT)
   async setOnboardingStep(
@@ -455,6 +511,7 @@ export class CompaniesController {
   }
 
   @Get("onboarding/requirements")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "What the current user's company still needs to finish onboarding (server-driven documents + outstanding items)",
@@ -466,6 +523,7 @@ export class CompaniesController {
   }
 
   @Post("onboarding/complete")
+  @PortalCustomer()
   @ApiOperation({ summary: "Mark the current user's onboarding as complete" })
   async completeOnboarding(
     @CurrentUser() user: CurrentIamUser,
@@ -477,6 +535,7 @@ export class CompaniesController {
 
   // Used by portal
   @Post("create")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Create a company with its associated external profile (onboarding)",
@@ -591,7 +650,11 @@ export class CompaniesController {
    * permission still needs the applicant's documents.
    */
   @Get(":companyId/documents")
-  @UseGuards(JwtGuard)
+  @MixedAudience([
+    FREIGHT_PERMS.customers.view,
+    FREIGHT_PERMS.contracts.view,
+    FREIGHT_PERMS.bookings.view,
+  ])
   @ApiOperation({ summary: "List documents uploaded for a company" })
   async listDocuments(
     @Param("companyId", ParseUUIDPipe) companyId: string,
@@ -661,6 +724,7 @@ export class CompaniesController {
   }
 
   @Post(":companyId/documents")
+  @MixedAudience(FREIGHT_PERMS.customers.update)
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes("multipart/form-data")
   @ApiOperation({ summary: "Upload documents for a company (onboarding)" })
diff --git a/apps/edr-freight-api/src/modules/companies/companies.fayda-identity.spec.ts b/apps/edr-freight-api/src/modules/companies/companies.fayda-identity.spec.ts
index 51dd1d61f..fe40cf08f 100644
--- a/apps/edr-freight-api/src/modules/companies/companies.fayda-identity.spec.ts
+++ b/apps/edr-freight-api/src/modules/companies/companies.fayda-identity.spec.ts
@@ -147,6 +147,10 @@ function makeService(overrides: Partial<Ctx> = {}) {
     verifayda: {
       completeVerification: jest.fn(async () => ctx.verification),
     },
+    // Onboarding requirements resolve the nationality's document set through
+    // this; no setting means no company documents, which keeps those cases
+    // focused on the identity/PoA half of the list.
+    fileUploadSettings: { getByCode: jest.fn(async () => null) },
   };
 
   const service = new CompaniesService(
@@ -157,7 +161,7 @@ function makeService(overrides: Partial<Ctx> = {}) {
     deps.profilesRepo as never,
     {} as never,
     deps.filesService as never,
-    {} as never,
+    deps.fileUploadSettings as never,
     {} as never,
     deps.companyNotifier as never,
     {} as never,
@@ -225,8 +229,10 @@ describe("Fayda identity verification binds a person to the company", () => {
     expect(state.owner.verified).toBe(true);
   });
 
-  it("refuses to make one identity both owner and PoA", async () => {
-    const { service } = makeService({
+  it("lets one identity be both owner and PoA", async () => {
+    // An owner who represents their own company is the ordinary small-business
+    // case, not a conflict — the same answer the GM has always been allowed.
+    const { service, ctx } = makeService({
       attributes: { ownerFaydaSub: "same-person" },
       verification: {
         purpose: "VERIFY",
@@ -236,13 +242,14 @@ describe("Fayda identity verification binds a person to the company", () => {
       },
     });
 
-    await expect(
-      service.completeIdentityVerification("user-1", {
-        subject: "poa",
-        code: "c",
-        state: "s",
-      }),
-    ).rejects.toBeInstanceOf(BadRequestException);
+    const state = await service.completeIdentityVerification("user-1", {
+      subject: "poa",
+      code: "c",
+      state: "s",
+    });
+
+    expect(state.poa.verified).toBe(true);
+    expect(ctx.attributes.poaFaydaSub).toBe("same-person");
   });
 
   it("stages an owner re-verification for review on an approved company", async () => {
@@ -322,41 +329,15 @@ describe("Fayda identity verification binds a person to the company", () => {
   // registered phone) with nothing at all. OWNER_VERIFIED is exactly that
   // shape: a sub, no contact details.
   it("keeps company contact details a Fayda verification never supplied", async () => {
-    const { service, deps } = makeService({
+    const { deps } = makeService({
       attributes: { ...OWNER_VERIFIED },
     });
 
-    await expect(
-      service.updateProfile("user-1", {
-        companyEmail: "account@example.com",
-        companyPhone: "+251911777777",
-      } as never),
-    ).resolves.toBeDefined();
     const [, patch] = deps.companiesRepo.update.mock.calls.at(-1)!;
     expect(patch.email).toBe("account@example.com");
     expect(patch.phone).toBe("+251911777777");
   });
 
-  it("overwrites company contact details the verification did supply", async () => {
-    const { service, deps } = makeService({
-      attributes: {
-        ...OWNER_VERIFIED,
-        ownerEmail: "abebe@example.com",
-        ownerPhone: "+251911000000",
-      },
-    });
-
-    await expect(
-      service.updateProfile("user-1", {
-        companyEmail: "someone-else@example.com",
-        companyPhone: "+251911999999",
-      } as never),
-    ).resolves.toBeDefined();
-    const [, patch] = deps.companiesRepo.update.mock.calls.at(-1)!;
-    expect(patch.email).toBe("abebe@example.com");
-    expect(patch.phone).toBe("+251911000000");
-  });
-
   // "Same as owner" copies `ownerEmail ?? null` onto the GM while setting
   // `gmFaydaSub`. Locking that null made generalManagerEmail required by
   // onboarding, hidden by the portal's link card and unwritable at once.
@@ -380,6 +361,93 @@ describe("Fayda identity verification binds a person to the company", () => {
     ).resolves.toBeDefined();
   });
 
+  // Fayda's email and phone claims are optional and routinely absent. The owner
+  // is who the company is reached through and the step renders no input for
+  // their contact details, so the onboarding account — already OTP-proven —
+  // stands in rather than leaving the company unreachable.
+  describe("account contact details stand in for absent Fayda claims", () => {
+    const noContactClaims = {
+      purpose: "VERIFY",
+      verified: true,
+      sub: "new-sub",
+      fullName: "Haile Gebrselassie",
+      address: "Addis Ababa",
+    };
+    const account = {
+      email: "account@example.com",
+      phoneNumber: "+251911777777",
+    };
+
+    it("falls back to the account for an owner Fayda gave no email or phone", async () => {
+      const { service, ctx } = makeService({ verification: noContactClaims });
+
+      await service.completeIdentityVerification(
+        "user-1",
+        { subject: "owner", code: "c", state: "s" },
+        account,
+      );
+
+      expect(ctx.attributes.ownerEmail).toBe("account@example.com");
+      expect(ctx.attributes.ownerPhone).toBe("+251911777777");
+    });
+
+    it("prefers the Fayda claim over the account when there is one", async () => {
+      const { service, ctx } = makeService();
+
+      await service.completeIdentityVerification(
+        "user-1",
+        { subject: "owner", code: "c", state: "s" },
+        account,
+      );
+
+      expect(ctx.attributes.ownerEmail).toBe("haile@example.com");
+      expect(ctx.attributes.ownerPhone).toBe("+251922000000");
+    });
+
+    it("leaves the PoA alone — the account is not that person", async () => {
+      const { service, ctx } = makeService({ verification: noContactClaims });
+
+      await service.completeIdentityVerification(
+        "user-1",
+        { subject: "poa", code: "c", state: "s" },
+        account,
+      );
+
+      expect(ctx.attributes.poaEmail).toBeUndefined();
+      expect(ctx.attributes.poaPhone).toBeUndefined();
+    });
+
+    // Owners verified before the fallback existed hold blank contacts. Copying
+    // those blanks onto the GM makes generalManagerEmail required by onboarding
+    // with no field anywhere to satisfy it.
+    it("fills the GM copy from the account when the stored owner has no contacts", async () => {
+      const { service, ctx } = makeService({
+        attributes: { ...OWNER_VERIFIED },
+      });
+
+      await service.setGmSameAsOwner("user-1", account);
+
+      expect(ctx.attributes.gmEmail).toBe("account@example.com");
+      expect(ctx.attributes.generalManagerEmail).toBe("account@example.com");
+      expect(ctx.attributes.generalManagerPhone).toBe("+251911777777");
+    });
+
+    it("keeps the stored owner contacts when the GM copy has them", async () => {
+      const { service, ctx } = makeService({
+        attributes: {
+          ...OWNER_VERIFIED,
+          ownerEmail: "abebe@example.com",
+          ownerPhone: "+251911000111",
+        },
+      });
+
+      await service.setGmSameAsOwner("user-1", account);
+
+      expect(ctx.attributes.generalManagerEmail).toBe("abebe@example.com");
+      expect(ctx.attributes.generalManagerPhone).toBe("+251911000111");
+    });
+  });
+
   it("never locks or gates the general manager — it is not the verified subject", async () => {
     // GM is a plain typed role; the portal offers a "same as owner" copy, but
     // the backend must not treat it as identity-owned or require it verified.
@@ -636,9 +704,8 @@ describe("Ethiopian companies verify with Fayda; foreign companies verify identi
   });
 
   it("lets the GM verify as the same human as the owner", async () => {
-    // The owner/PoA collision check exists because self-delegation is not
-    // delegation. It must not fire here: the GM being the owner is a supported
-    // answer, so verifying with the owner's own Fayda sub has to succeed.
+    // One human in every role is the ordinary small-business shape, so
+    // verifying with the owner's own Fayda sub has to succeed.
     const { service, ctx } = makeService({
       attributes: { ...OWNER_VERIFIED },
       verification: {
@@ -662,25 +729,42 @@ describe("Ethiopian companies verify with Fayda; foreign companies verify identi
     expect(ctx.attributes.generalManagerName).toBe("Abebe Bikila");
   });
 
-  it("still refuses a PoA who is the owner", async () => {
-    // The GM exemption above must not have widened into the PoA.
-    const { service } = makeService({
-      attributes: { ...OWNER_VERIFIED },
-      verification: {
-        purpose: "VERIFY",
-        verified: true,
-        sub: "owner-sub",
-        fullName: "Abebe Bikila",
-      },
+  it("declares the PoA is the owner, copying the verified identity across", async () => {
+    const { service, ctx } = makeService({ attributes: { ...OWNER_VERIFIED } });
+
+    const state = await service.setPoaSameAsOwner("user-1");
+
+    expect(state.poaSameAsOwner).toBe(true);
+    expect(state.poa.verified).toBe(true);
+    expect(ctx.attributes.poaFaydaSub).toBe(OWNER_VERIFIED.ownerFaydaSub);
+    expect(ctx.attributes.poaName).toBe(OWNER_VERIFIED.ownerName);
+  });
+
+  it("refuses to declare the PoA is the owner while an Ethiopian owner is unverified", async () => {
+    // Its representative must be Fayda-verified, so a declaration here would
+    // record one that could never satisfy the gate.
+    const { service } = makeService({ attributes: {} });
+
+    await expect(service.setPoaSameAsOwner("user-1")).rejects.toBeInstanceOf(
+      BadRequestException,
+    );
+  });
+
+  it("undoes the PoA \"same as owner\" declaration without touching a real verification", async () => {
+    const { service, ctx } = makeService({
+      attributes: { ...OWNER_VERIFIED, ...POA_VERIFIED },
     });
 
-    await expect(
-      service.completeIdentityVerification("user-1", {
-        subject: "poa",
-        code: "c",
-        state: "s",
-      }),
-    ).rejects.toBeInstanceOf(BadRequestException);
+    // No declaration in place: the verified representative must survive.
+    await service.clearPoaSameAsOwner("user-1");
+    expect(ctx.attributes.poaFaydaSub).toBe(POA_VERIFIED.poaFaydaSub);
+
+    await service.setPoaSameAsOwner("user-1");
+    const state = await service.clearPoaSameAsOwner("user-1");
+
+    expect(state.poaSameAsOwner).toBe(false);
+    expect(state.poa.verified).toBe(false);
+    expect(ctx.attributes.poaFaydaSub).toBeNull();
   });
 
   it("reports a pre-existing typed GM as unverified rather than blank", async () => {
@@ -702,6 +786,73 @@ describe("Ethiopian companies verify with Fayda; foreign companies verify identi
     expect(state.gm.email).toBe("legacy@example.com");
   });
 
+  // The mirror image, and the reason the fallback above is gated on the GM
+  // being unverified: a manager Fayda proved but supplied no email for types
+  // one instead, and the portal decides whether to render that input by asking
+  // whether the identity holds one. Reading the typed column back as part of
+  // the verified identity would answer "yes" the moment it was saved — the
+  // input would vanish and a typo could never be corrected.
+  it("keeps a verified GM's typed email out of the verified identity", async () => {
+    const { service, company } = makeService({
+      attributes: {
+        ...OWNER_VERIFIED,
+        gmFaydaSub: "gm-sub",
+        gmFaydaVerifiedAt: "2026-07-03T00:00:00.000Z",
+        gmName: "Derartu Tulu",
+        generalManagerName: "Derartu Tulu",
+        generalManagerEmail: "typed@example.com",
+      },
+    });
+
+    const state = service.getCompanyIdentityState(company() as never);
+
+    expect(state.gm.verified).toBe(true);
+    expect(state.gm.name).toBe("Derartu Tulu");
+    expect(state.gm.email).toBeNull();
+  });
+
+  it("never stands the account in for a GM Fayda gave no email", async () => {
+    // Deliberate: the account is the person onboarding, not necessarily the
+    // manager. The portal asks for the email instead.
+    const { service, ctx } = makeService({
+      attributes: { ...OWNER_VERIFIED },
+      verification: {
+        purpose: "VERIFY",
+        verified: true,
+        sub: "gm-sub",
+        fullName: "Derartu Tulu",
+        phoneNumber: "+251911222333",
+      },
+    });
+
+    const state = await service.completeIdentityVerification(
+      "user-1",
+      { subject: "gm", code: "c", state: "s" },
+      { email: "account@example.com", phoneNumber: "+251911777777" },
+    );
+
+    expect(ctx.attributes.gmEmail).toBeUndefined();
+    expect(state.gm.verified).toBe(true);
+    expect(state.gm.email).toBeNull();
+  });
+
+  it("accepts the email typed for a GM whose verification carried none", async () => {
+    const { service, ctx } = makeService({
+      attributes: {
+        ...OWNER_VERIFIED,
+        gmFaydaSub: "gm-sub",
+        gmName: "Derartu Tulu",
+        generalManagerName: "Derartu Tulu",
+      },
+    });
+
+    await service.updateProfile("user-1", {
+      generalManagerEmail: "gm@example.com",
+    } as never);
+
+    expect(ctx.attributes.generalManagerEmail).toBe("gm@example.com");
+  });
+
   it("does not let an unproven GM block the company from trading", async () => {
     // The GM names who to talk to, not what the company may do. Capturing it
     // through Fayda changed how it is collected, not whether it gates.
@@ -714,3 +865,94 @@ describe("Ethiopian companies verify with Fayda; foreign companies verify identi
     ).resolves.toBeDefined();
   });
 });
+
+/**
+ * Fayda's email and phone claims are optional, so a *verified* representative
+ * can still be missing the details `REQUIRED_POA_FIELDS` demands. The PoA step
+ * renders an input for whatever the verification did not supply — so onboarding
+ * has to report them outstanding, rather than letting a freight forwarder
+ * submit an incomplete representative and be refused its next PoA edit for it.
+ */
+describe("onboarding requirements name the PoA details Fayda did not supply", () => {
+  const POA_VERIFIED_NO_CONTACTS = {
+    poaFaydaSub: "poa-sub",
+    poaFaydaVerifiedAt: "2026-07-02T00:00:00.000Z",
+    poaName: "Tirunesh Dibaba",
+  };
+
+  it("reports the missing email and phone for a freight forwarder", async () => {
+    const { service } = makeService({
+      attributes: { ...OWNER_VERIFIED, ...POA_VERIFIED_NO_CONTACTS },
+      profileTypes: [ProfileType.freightForwarder],
+      files: [paper()],
+    });
+
+    const req = await service.getOnboardingRequirements("user-1");
+
+    expect(req.poa.missingFields.map((f) => f.key)).toEqual([
+      "poaEmail",
+      "poaPhone",
+    ]);
+    expect(req.poa.complete).toBe(false);
+    expect(req.outstanding).toEqual(
+      expect.arrayContaining(["Add your poa email", "Add your poa phone"]),
+    );
+  });
+
+  it("clears once they are typed", async () => {
+    const { service } = makeService({
+      attributes: { ...OWNER_VERIFIED, ...POA_VERIFIED },
+      profileTypes: [ProfileType.freightForwarder],
+      files: [paper()],
+    });
+
+    const req = await service.getOnboardingRequirements("user-1");
+
+    expect(req.poa.missingFields).toEqual([]);
+    expect(req.poa.complete).toBe(true);
+    expect(req.outstanding).not.toContain("Add your poa email");
+  });
+
+  // Fayda's email claim is optional and the GM's verification has no account to
+  // fall back on, so demanding one blocked a manager the government had already
+  // proved. `companyNotifyEmailExpr` resolves the address from the contact
+  // person or the registering account instead, so nothing needs this filled.
+  it("does not hold a company back for a general manager with no email", async () => {
+    const { service } = makeService({
+      attributes: {
+        ...OWNER_VERIFIED,
+        gmFaydaSub: "gm-sub",
+        generalManagerName: "Derartu Tulu",
+        generalManagerPhone: "+251911222333",
+      },
+    });
+
+    const req = await service.getOnboardingRequirements("user-1");
+
+    expect(req.companyInfo.missingFields.map((f) => f.key)).not.toContain(
+      "generalManagerEmail",
+    );
+    expect(req.outstanding).not.toContain("Add your general manager email");
+  });
+
+  it("still holds it back for the manager's name and phone", async () => {
+    const { service } = makeService({ attributes: { ...OWNER_VERIFIED } });
+
+    const req = await service.getOnboardingRequirements("user-1");
+
+    expect(req.companyInfo.missingFields.map((f) => f.key)).toEqual(
+      expect.arrayContaining(["generalManagerName", "generalManagerPhone"]),
+    );
+  });
+
+  // An importer that never named a representative owes nothing here — the step
+  // is one it may walk straight past.
+  it("asks nothing of a company with no PoA at all", async () => {
+    const { service } = makeService({ attributes: { ...OWNER_VERIFIED } });
+
+    const req = await service.getOnboardingRequirements("user-1");
+
+    expect(req.poa.missingFields).toEqual([]);
+    expect(req.poa.complete).toBe(true);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/companies/companies.poa-delegation.spec.ts b/apps/edr-freight-api/src/modules/companies/companies.poa-delegation.spec.ts
index 365bd4639..b85344e8e 100644
--- a/apps/edr-freight-api/src/modules/companies/companies.poa-delegation.spec.ts
+++ b/apps/edr-freight-api/src/modules/companies/companies.poa-delegation.spec.ts
@@ -174,6 +174,31 @@ describe("PoA delegation paper is enforced wherever PoA state changes", () => {
     ).resolves.toBeDefined();
   });
 
+  it("waives the paper when the owner represents the company themselves", async () => {
+    // Nobody delegates to themselves, so a self-declared PoA owes no DARS
+    // paper — the representative's own details are still required.
+    const { service } = makeService({
+      attributes: { ...VERIFIED_IDENTITIES, poaSameAsOwner: true },
+    });
+
+    await expect(
+      service.updateProfile("user-1", POA as never),
+    ).resolves.toBeDefined();
+  });
+
+  it("grants the forwarder role to a self-represented company with no paper", async () => {
+    const { service } = makeService({
+      attributes: { ...VERIFIED_IDENTITIES, ...POA, poaSameAsOwner: true },
+    });
+
+    await expect(
+      service.createCompanyProfileForUser(
+        "user-1",
+        ProfileType.freightForwarder,
+      ),
+    ).resolves.toBeDefined();
+  });
+
   it("rejects a paper the reviewer sent back for correction", async () => {
     const { service } = makeService({ files: [paper("change_requested")] });
 
diff --git a/apps/edr-freight-api/src/modules/companies/companies.service.ts b/apps/edr-freight-api/src/modules/companies/companies.service.ts
index b5c953cac..0ed91c9e3 100644
--- a/apps/edr-freight-api/src/modules/companies/companies.service.ts
+++ b/apps/edr-freight-api/src/modules/companies/companies.service.ts
@@ -133,12 +133,6 @@ const IDENTITY_PREFIX: Record<IdentitySubject, string> = {
   gm: "gm",
 };
 
-const IDENTITY_LABEL: Record<IdentitySubject, string> = {
-  owner: "owner",
-  poa: "Power of Attorney",
-  gm: "General Manager",
-};
-
 /**
  * Typed GM columns a GM verification also writes. Three notifier services mail
  * `company.generalManagerEmail` directly, so leaving these behind would mean a
@@ -231,41 +225,42 @@ export class CompaniesService {
     label: string;
     get: (company: Company) => unknown;
   }[] = [
-    {
-      key: "tinNumber",
-      label: "Company TIN",
-      get: (c) => (c.tin && !c.tin.startsWith("D") ? c.tin : null),
-    },
-    { key: "companyEmail", label: "Company email", get: (c) => c.email },
-    { key: "companyPhone", label: "Company phone", get: (c) => c.phone },
-    { key: "companyAddress", label: "Company address", get: (c) => c.address },
-    { key: "fanNumber", label: "FAN number", get: (c) => c.fanNumber },
-    {
-      key: "contactPersonName",
-      label: "Contact person name",
-      get: (c) => c.attributes?.contactPersonName,
-    },
-    {
-      key: "contactPersonPhone",
-      label: "Contact person phone",
-      get: (c) => c.attributes?.contactPersonPhone,
-    },
-    {
-      key: "generalManagerName",
-      label: "General manager name",
-      get: (c) => c.attributes?.generalManagerName,
-    },
-    {
-      key: "generalManagerEmail",
-      label: "General manager email",
-      get: (c) => c.attributes?.generalManagerEmail,
-    },
-    {
-      key: "generalManagerPhone",
-      label: "General manager phone",
-      get: (c) => c.attributes?.generalManagerPhone,
-    },
-  ];
+      {
+        key: "tinNumber",
+        label: "Company TIN",
+        get: (c) => (c.tin && !c.tin.startsWith("D") ? c.tin : null),
+      },
+      { key: "companyAddress", label: "Company address", get: (c) => c.address },
+      { key: "fanNumber", label: "FAN number", get: (c) => c.fanNumber },
+      {
+        key: "contactPersonName",
+        label: "Contact person name",
+        get: (c) => c.attributes?.contactPersonName,
+      },
+      {
+        key: "contactPersonPhone",
+        label: "Contact person phone",
+        get: (c) => c.attributes?.contactPersonPhone,
+      },
+      {
+        key: "generalManagerName",
+        label: "General manager name",
+        get: (c) => c.attributes?.generalManagerName,
+      },
+      // The manager's EMAIL is deliberately absent. It was demanded because the
+      // notifiers were believed to mail it, and Fayda's email claim is optional
+      // — so a manager the government proved without one blocked the whole
+      // submission over an address nothing could produce. `companyNotifyEmailExpr`
+      // now resolves the address itself and falls through to the contact
+      // person's, then to the registering account's (which signup guarantees),
+      // so nothing depends on this being filled. It is still collected and still
+      // preferred when present; it just no longer holds the company hostage.
+      {
+        key: "generalManagerPhone",
+        label: "General manager phone",
+        get: (c) => c.attributes?.generalManagerPhone,
+      },
+    ];
 
   /** The nationality-based document setting code for a company. */
   private documentSettingCodeFor(
@@ -314,8 +309,6 @@ export class CompaniesService {
       fanNumber: dto.fanNumber ?? null,
       country: dto.companyLocation ?? "Ethiopia",
       address: dto.companyAddress ?? null,
-      phone: normalizeE164(dto.companyPhone) ?? null,
-      email: dto.companyEmail ?? null,
       attributes: dto.attributes ?? null,
     });
 
@@ -492,7 +485,8 @@ export class CompaniesService {
   async findCompanyById(id: string): Promise<Company> {
     const company = await this.companiesRepo.findById(id);
     if (!company) throw new NotFoundException(`Company ${id} not found`);
-    company.companyProfiles = await this.companyProfilesRepo.findByCompanyId(id);
+    company.companyProfiles =
+      await this.companyProfilesRepo.findByCompanyId(id);
     // External profiles carry the onboarding flag the backoffice gates
     // approval decisions on (see ResponseCompanyDto.onboardingCompleted).
     company.profiles = await this.profilesRepo.findByCompanyId(id);
@@ -515,9 +509,7 @@ export class CompaniesService {
       );
     }
     if (profile.status !== ProfileStatus.Active) {
-      throw new BadRequestException(
-        "Selected company profile is not active",
-      );
+      throw new BadRequestException("Selected company profile is not active");
     }
     return profile;
   }
@@ -760,11 +752,6 @@ export class CompaniesService {
     };
 
     const keys: string[] = [];
-    if (attrs.ownerFaydaSub) {
-      // The Company-column mirrors of the owner's verified contact details.
-      if (held("ownerEmail")) keys.push("companyEmail");
-      if (held("ownerPhone")) keys.push("companyPhone");
-    }
     for (const subject of IDENTITY_SUBJECTS) {
       if (!attrs[`${IDENTITY_PREFIX[subject]}FaydaSub`]) continue;
       keys.push(...IDENTITY_OWNED_FIELDS[subject].filter(held));
@@ -789,9 +776,6 @@ export class CompaniesService {
     if (dto.nationality !== undefined)
       companyUpdates.nationality = dto.nationality;
     if (dto.companyName !== undefined) companyUpdates.name = dto.companyName;
-    if (dto.companyEmail !== undefined) companyUpdates.email = dto.companyEmail;
-    if (dto.companyPhone !== undefined)
-      companyUpdates.phone = normalizeE164(dto.companyPhone);
     if (dto.companyLocation !== undefined)
       companyUpdates.country = dto.companyLocation;
     if (dto.companyAddress !== undefined)
@@ -809,7 +793,9 @@ export class CompaniesService {
     if (dto.contactPersonPhone !== undefined)
       attrUpdates.contactPersonPhone = normalizeE164(dto.contactPersonPhone);
     if (dto.contactVerifiedPhone !== undefined)
-      attrUpdates.contactVerifiedPhone = normalizeE164(dto.contactVerifiedPhone);
+      attrUpdates.contactVerifiedPhone = normalizeE164(
+        dto.contactVerifiedPhone,
+      );
     if (dto.generalManagerName !== undefined)
       attrUpdates.generalManagerName = dto.generalManagerName;
     if (dto.generalManagerEmail !== undefined)
@@ -820,7 +806,8 @@ export class CompaniesService {
     if (dto.poaPhone !== undefined)
       attrUpdates.poaPhone = normalizeE164(dto.poaPhone);
     if (dto.poaEmail !== undefined) attrUpdates.poaEmail = dto.poaEmail;
-    if (dto.poaLocation !== undefined) attrUpdates.poaLocation = dto.poaLocation;
+    if (dto.poaLocation !== undefined)
+      attrUpdates.poaLocation = dto.poaLocation;
     if (dto.poaAddress !== undefined) attrUpdates.poaAddress = dto.poaAddress;
 
     if (dto.licenceNumber !== undefined)
@@ -857,12 +844,6 @@ export class CompaniesService {
       Object.assign(attrUpdates, dto.faydaIdentity);
     }
 
-    // companyEmail/companyPhone are the Company-column mirrors of the owner's
-    // verified contact details (the portal derives and submits them, it never
-    // lets the customer type them once verified) — lock them the same way
-    // ownerEmail/ownerPhone themselves are locked below, once there is a
-    // verified owner to lock them to.
-    //
     // Keyed on the verified VALUE, not on `ownerFaydaSub`: Fayda's email and
     // phone claims are optional, so a verification can prove the person while
     // supplying neither (see completeIdentityVerification's conditional
@@ -872,9 +853,8 @@ export class CompaniesService {
     // forever, and re-verifying could never clear it because Fayda still has
     // nothing to return.
     if (attrUpdates.ownerFaydaSub) {
-      if (attrUpdates.ownerEmail && dto.companyEmail !== undefined)
-        companyUpdates.email = attrUpdates.ownerEmail;
-      if (attrUpdates.ownerPhone && dto.companyPhone !== undefined)
+      if (attrUpdates.ownerEmail) companyUpdates.email = attrUpdates.ownerEmail;
+      if (attrUpdates.ownerPhone)
         companyUpdates.phone = normalizeE164(String(attrUpdates.ownerPhone));
     }
 
@@ -1086,9 +1066,7 @@ export class CompaniesService {
   }
 
   /** List a company's change requests, newest first (backoffice review). */
-  async listChangeRequests(
-    companyId: string,
-  ): Promise<CompanyChangeRequest[]> {
+  async listChangeRequests(companyId: string): Promise<CompanyChangeRequest[]> {
     await this.findCompanyById(companyId);
     return this.changeRequestRepo.findByCompanyId(companyId);
   }
@@ -1150,8 +1128,7 @@ export class CompaniesService {
     reviewerId?: string,
   ): Promise<CompanyChangeRequest> {
     const request = await this.changeRequestRepo.findById(id);
-    if (!request)
-      throw new NotFoundException(`Change request ${id} not found`);
+    if (!request) throw new NotFoundException(`Change request ${id} not found`);
     if (request.status !== ChangeRequestStatus.Pending) {
       throw new BadRequestException(
         `Change request ${id} is already ${request.status}`,
@@ -1164,7 +1141,10 @@ export class CompaniesService {
 
     const snapshot = (request.snapshot ?? {}) as Partial<UpdateProfileDto>;
     await this.assertTinAvailable(company, snapshot.tin);
-    const companyUpdates = this.mapProfileDtoToCompanyUpdates(company, snapshot);
+    const companyUpdates = this.mapProfileDtoToCompanyUpdates(
+      company,
+      snapshot,
+    );
     await this.companiesRepo.update(company.id, companyUpdates);
     await this.applyLicenseChanges(request);
     await this.applyDocumentChanges(request);
@@ -1294,7 +1274,12 @@ export class CompaniesService {
       );
     }
     if (documentChanges.length > 0) {
-      await this.recordCompanyRevision(company, {}, submittedBy, documentChanges);
+      await this.recordCompanyRevision(
+        company,
+        {},
+        submittedBy,
+        documentChanges,
+      );
     }
     return uploaded;
   }
@@ -1414,7 +1399,11 @@ export class CompaniesService {
         status: ChangeRequestStatus.Pending,
       });
       if (company) {
-        this.companyNotifier.changeRequestSubmitted(company, existing.id, false);
+        this.companyNotifier.changeRequestSubmitted(
+          company,
+          existing.id,
+          false,
+        );
       }
     } else {
       const history = await this.changeRequestRepo.findByCompanyId(companyId);
@@ -1446,8 +1435,7 @@ export class CompaniesService {
     reviewerId?: string,
   ): Promise<CompanyChangeRequest> {
     const request = await this.changeRequestRepo.findById(id);
-    if (!request)
-      throw new NotFoundException(`Change request ${id} not found`);
+    if (!request) throw new NotFoundException(`Change request ${id} not found`);
     if (request.status !== ChangeRequestStatus.Pending) {
       throw new BadRequestException(
         `Change request ${id} is already ${request.status}`,
@@ -1486,8 +1474,7 @@ export class CompaniesService {
     reviewerId?: string,
   ): Promise<CompanyChangeRequest> {
     const request = await this.changeRequestRepo.findById(id);
-    if (!request)
-      throw new NotFoundException(`Change request ${id} not found`);
+    if (!request) throw new NotFoundException(`Change request ${id} not found`);
     if (request.status !== ChangeRequestStatus.Pending) {
       throw new BadRequestException(
         `Change request ${id} is already ${request.status}`,
@@ -1569,10 +1556,7 @@ export class CompaniesService {
     const reactivating =
       status === ProfileStatus.Active &&
       existing.status === ProfileStatus.Suspended;
-    if (
-      (status === ProfileStatus.Suspended || reactivating) &&
-      !note?.trim()
-    ) {
+    if ((status === ProfileStatus.Suspended || reactivating) && !note?.trim()) {
       throw new BadRequestException(
         status === ProfileStatus.Suspended
           ? "A message explaining the suspension is required — the customer will see it."
@@ -1594,7 +1578,9 @@ export class CompaniesService {
       existing.status === ProfileStatus.Pending ||
       existing.status === ProfileStatus.Rejected;
     if (awaitingReview) {
-      const owners = await this.profilesRepo.findByCompanyId(existing.companyId);
+      const owners = await this.profilesRepo.findByCompanyId(
+        existing.companyId,
+      );
       if (owners.length > 0 && !owners.some((o) => o.onboardingCompleted)) {
         throw new BadRequestException(
           "This customer hasn't finished onboarding yet. Their roles can be reviewed once they submit their application.",
@@ -1652,11 +1638,17 @@ export class CompaniesService {
         const names = pending.map((f) => f.name).join(", ");
         throw new BadRequestException(
           `This role has ${pending.length} document(s) awaiting customer correction (${names}). ` +
-            `Approve it once the customer has re-uploaded them, or withdraw the change request first.`,
+          `Approve it once the customer has re-uploaded them, or withdraw the change request first.`,
         );
       }
 
-      return this.applyProfileStatus(manager, existing, status, note, reviewerId);
+      return this.applyProfileStatus(
+        manager,
+        existing,
+        status,
+        note,
+        reviewerId,
+      );
     });
   }
 
@@ -1992,7 +1984,9 @@ export class CompaniesService {
       .map((f) => ({ key: f.key, label: f.label }));
 
     // 2. Nationality-based company documents + which are already uploaded.
-    const documentSettingCode = this.documentSettingCodeFor(company.nationality);
+    const documentSettingCode = this.documentSettingCodeFor(
+      company.nationality,
+    );
     const [setting, uploadedFiles] = await Promise.all([
       this.fileUploadSettingsService
         .getByCode(documentSettingCode)
@@ -2045,18 +2039,37 @@ export class CompaniesService {
     const poaProvided = POA_ATTRIBUTES.some((k) =>
       (company.attributes?.[k] as string | undefined)?.trim(),
     );
-    // No company types its PoA details — they arrive from the Fayda
-    // verification whatever the nationality — so reporting them as missing
-    // fields would ask for something no form offers. The identity block below
-    // reports "verify your PoA" instead.
-    const missingPoaFields: typeof REQUIRED_POA_FIELDS = [];
     const delegation = await this.getPoaDelegationState(company.id);
-    const delegationDue = poaRequired || poaProvided;
+    // "There is a representative" and "a paper is owed for them" used to be the
+    // same condition. They part company once the owner represents the company
+    // themselves: the representative's details are still required, but nobody
+    // delegates to themselves, so no DARS paper is due (`assertPoaDelegationSatisfied`
+    // returns on the same flag — the two must agree).
+    const poaDue = poaRequired || poaProvided;
+    const delegationDue = poaDue && !identity.poaSameAsOwner;
+    // The representative's details normally arrive from their Fayda
+    // verification — but Fayda's email and phone claims are optional and
+    // routinely come back empty, and the PoA step renders an input for whatever
+    // the verification did not supply. So these are askable after all, and are
+    // reported outstanding once a PoA is required or provided; reporting
+    // nothing here let a freight forwarder finish onboarding with a
+    // representative the API's own `REQUIRED_POA_FIELDS` calls incomplete, then
+    // 400'd their next PoA edit for it.
+    const missingPoaFields = poaDue
+      ? REQUIRED_POA_FIELDS.filter(
+        (f) => !(company.attributes?.[f.key] as string | undefined)?.trim(),
+      )
+      : [];
     const missingDelegation = delegationDue && !delegation.onFile;
     // A paper the reviewer sent back is not evidence — the customer has to
     // replace it before the application counts as complete.
     const flaggedDelegation = delegationDue && delegation.flagged;
 
+    // Mirrors `poaProven` in buildCompanyIdentityState — see the note there.
+    const poaProven = identity.faydaRequired
+      ? identity.poa.verified
+      : identity.poa.verified || Boolean(identity.poa.name?.trim());
+
     const outstanding = [
       ...missingInfo.map((f) => `Add your ${f.label.toLowerCase()}`),
       ...missingDocs.map((d) => `Upload your ${d.fileLabel}`),
@@ -2069,13 +2082,26 @@ export class CompaniesService {
         ? [`Upload the ${POA_DELEGATION_LABEL} for your Power of Attorney`]
         : []),
       ...(flaggedDelegation
-        ? [`Re-upload your ${POA_DELEGATION_LABEL} — EDR asked for a correction`]
+        ? [
+          `Re-upload your ${POA_DELEGATION_LABEL} — EDR asked for a correction`,
+        ]
         : []),
       ...(identity.faydaRequired && !identity.owner.verified
         ? ["Verify the company owner's identity with Fayda"]
         : []),
-      ...((poaRequired || poaProvided) && !identity.poa.verified
-        ? ["Verify your Power of Attorney's identity with Fayda"]
+      // Nationality-aware, exactly like `poaProven` in
+      // buildCompanyIdentityState and the check in `assertIdentityVerified`:
+      // Fayda is an Ethiopian national ID, so a foreign company's typed
+      // representative has to count. Demanding a verification here regardless
+      // made this list disagree with the rule actually enforced, and left a
+      // foreign freight forwarder unable to submit — asked for a Fayda
+      // verification its representative may have no way to obtain.
+      ...((poaRequired || poaProvided) && !poaProven
+        ? [
+          identity.faydaRequired
+            ? "Verify your Power of Attorney's identity with Fayda"
+            : "Name your Power of Attorney, or verify them with Fayda",
+        ]
         : []),
       ...(identity.passportRequired && !identity.owner.passportNumber
         ? ["Add the company owner's passport number"]
@@ -2086,20 +2112,26 @@ export class CompaniesService {
     // fields, required documents, one license per operational profile, and the
     // PoA details/paper whenever those are mandatory.
     const requiredDocCount = documents.filter((d) => d.isRequired).length;
-    const poaItemCount = delegationDue ? 1 : 0;
+    // The delegation paper plus the representative's own required details —
+    // `completed` below subtracts every one of those it is still missing, so
+    // leaving them out of the total would make the bar understate progress.
+    const poaItemCount =
+      (poaDue ? REQUIRED_POA_FIELDS.length : 0) + (delegationDue ? 1 : 0);
     // One item per identity credential the company has to prove: the owner
     // always (Fayda for Ethiopian, passport for foreign), plus the PoA once
-    // there is one — that one is Fayda whatever the nationality.
+    // there is one — Fayda for an Ethiopian company, a named representative
+    // for a foreign one, same rule as `poaProven` above. Counting a foreign
+    // company's typed PoA as unproven here left the progress bar permanently
+    // short of 100% on an item it had already satisfied.
     const ownerCredentialDue =
       identity.faydaRequired || identity.passportRequired;
     const ownerCredentialProven = identity.faydaRequired
       ? identity.owner.verified
       : Boolean(identity.owner.passportNumber);
-    const identityItemCount =
-      (ownerCredentialDue ? 1 : 0) + (delegationDue ? 1 : 0);
+    const identityItemCount = (ownerCredentialDue ? 1 : 0) + (poaDue ? 1 : 0);
     const missingIdentityCount =
       (ownerCredentialDue && !ownerCredentialProven ? 1 : 0) +
-      (delegationDue && !identity.poa.verified ? 1 : 0);
+      (poaDue && !poaProven ? 1 : 0);
     const total =
       requiredInfo.length +
       requiredDocCount +
@@ -2118,12 +2150,16 @@ export class CompaniesService {
     return new OnboardingRequirementsResponseDto({
       documentSettingCode,
       nationality: company.nationality ?? CompanyNationality.Ethiopian,
-      companyInfo: { complete: missingInfo.length === 0, missingFields: missingInfo },
+      companyInfo: {
+        complete: missingInfo.length === 0,
+        missingFields: missingInfo,
+      },
       documents,
       licenseProfiles,
       poa: {
         required: poaRequired,
         provided: poaProvided,
+        delegationLetterRequired: delegationDue,
         delegationLetterUploaded: delegation.onFile,
         delegationLetterFlagged: delegation.flagged,
         missingFields: missingPoaFields,
@@ -2160,7 +2196,7 @@ export class CompaniesService {
     if (!requirements.isComplete) {
       throw new BadRequestException(
         requirements.outstanding[0] ??
-          "Your onboarding is incomplete. Please complete all required steps before submitting.",
+        "Your onboarding is incomplete. Please complete all required steps before submitting.",
       );
     }
 
@@ -2169,7 +2205,10 @@ export class CompaniesService {
     const profiles = await this.companyProfilesRepo.findByCompanyId(companyId);
     for (const cp of profiles) {
       if (cp.status !== ProfileStatus.Pending) {
-        await this.companyProfilesRepo.updateStatus(cp.id, ProfileStatus.Pending);
+        await this.companyProfilesRepo.updateStatus(
+          cp.id,
+          ProfileStatus.Pending,
+        );
       }
     }
 
@@ -2195,12 +2234,12 @@ export class CompaniesService {
       case CompanyStatus.Suspended:
         throw new ForbiddenException(
           `Your company account is suspended — you can't create ${action} right now. ` +
-            `Please contact EDR support for details.`,
+          `Please contact EDR support for details.`,
         );
       case CompanyStatus.Blacklisted:
         throw new ForbiddenException(
           `Your company account is blacklisted — you can't create ${action}. ` +
-            `Please contact EDR support.`,
+          `Please contact EDR support.`,
         );
       default:
         throw new ForbiddenException(
@@ -2229,8 +2268,7 @@ export class CompaniesService {
     switch (profile.status) {
       case ProfileStatus.Suspended:
         throw new ForbiddenException(
-          `Your ${role} role is suspended${
-            profile.reviewNote ? ` — ${profile.reviewNote}` : ""
+          `Your ${role} role is suspended${profile.reviewNote ? ` — ${profile.reviewNote}` : ""
           }. Your other roles are unaffected. Please contact EDR support to resolve this.`,
         );
       case ProfileStatus.Blacklisted:
@@ -2239,8 +2277,7 @@ export class CompaniesService {
         );
       case ProfileStatus.Rejected:
         throw new ForbiddenException(
-          `Your ${role} role was rejected${
-            profile.reviewNote ? ` — ${profile.reviewNote}` : ""
+          `Your ${role} role was rejected${profile.reviewNote ? ` — ${profile.reviewNote}` : ""
           }. Amend and resubmit it from your settings page.`,
         );
       default:
@@ -2499,9 +2536,7 @@ export class CompaniesService {
       LICENSE_RESOURCE,
     );
     return records
-      .filter(
-        (r) => r.code === LICENSE_CODE || r.code === LICENSE_PENDING_CODE,
-      )
+      .filter((r) => r.code === LICENSE_CODE || r.code === LICENSE_PENDING_CODE)
       .map((r) => ({
         id: r.id,
         name: r.name,
@@ -2668,11 +2703,17 @@ export class CompaniesService {
       if (missing.length > 0) {
         throw new BadRequestException(
           `A freight forwarder acts on other companies' behalf, so a Power of Attorney is required. ` +
-            `Add the ${missing.map((f) => f.label.toLowerCase()).join(", ")} first.`,
+          `Add the ${missing.map((f) => f.label.toLowerCase()).join(", ")} first.`,
         );
       }
     }
 
+    // Nobody delegates to themselves: an owner representing their own company
+    // has no delegation to evidence, so the DARS paper is not owed. The
+    // representative's own details are still required above — a forwarder's
+    // counterparties need someone to contact either way.
+    if (attributes?.poaSameAsOwner) return;
+
     const { onFile, flagged } = await this.getPoaDelegationState(
       companyId,
       opts.ignoreFileIds,
@@ -2680,13 +2721,13 @@ export class CompaniesService {
     if (!onFile) {
       throw new BadRequestException(
         `Upload the ${POA_DELEGATION_LABEL} for the Power of Attorney` +
-          (opts.requirePoa ? " — it is required for freight forwarders." : "."),
+        (opts.requirePoa ? " — it is required for freight forwarders." : "."),
       );
     }
     if (flagged) {
       throw new BadRequestException(
         `The ${POA_DELEGATION_LABEL} on file needs to be corrected. ` +
-          `Re-upload it before continuing.`,
+        `Re-upload it before continuing.`,
       );
     }
   }
@@ -2729,6 +2770,12 @@ export class CompaniesService {
   async completeIdentityVerification(
     userId: string,
     dto: CompleteIdentityVerificationDto,
+    /**
+     * The signed-in account, used as the owner's fallback contact details.
+     * Optional so the callers that only have a user id keep compiling — they
+     * simply get no fallback.
+     */
+    account?: { email?: string; phoneNumber?: string },
   ): Promise<CompanyIdentityStateDto> {
     const { company } = await this.getCompanyInfoByUserId(userId);
     const prefix = IDENTITY_PREFIX[dto.subject];
@@ -2743,22 +2790,29 @@ export class CompaniesService {
       );
     }
 
-    // The owner delegating power of attorney to themselves is not a
-    // delegation — it would let one identity satisfy both halves of the check.
-    // Only owner/PoA collide this way: the GM is very often the owner, and
-    // saying so is a supported answer rather than a conflict, so it is left out
-    // of this check entirely.
-    if (dto.subject === "owner" || dto.subject === "poa") {
-      const other: IdentitySubject = dto.subject === "poa" ? "owner" : "poa";
-      const otherSub = company.attributes?.[`${IDENTITY_PREFIX[other]}FaydaSub`];
-      if (otherSub && otherSub === result.sub) {
-        throw new BadRequestException(
-          `This identity is already registered as the company's ${IDENTITY_LABEL[other]}. The Power of Attorney must be a different person from the owner.`,
-        );
-      }
-    }
+    // An owner who is also the company's representative is a supported answer,
+    // not a conflict — the same way the GM is very often the owner. Small
+    // companies routinely have one human in all three roles, and the portal's
+    // "same as owner" cards exist precisely so they can say so. No identity
+    // here is refused for colliding with another.
 
     const now = new Date().toISOString();
+
+    // Fayda's email and phone claims are optional and routinely come back empty.
+    // For the owner that leaves the company with no contact details at all: the
+    // step renders no input for them (they are the verification's output), and
+    // "same as owner" then copies those blanks onto `generalManagerEmail` /
+    // `generalManagerPhone`, which `REQUIRED_COMPANY_INFO` demands at submit —
+    // an unfixable dead end. The account doing the onboarding is the one contact
+    // we always have, and it is already OTP-proven, so it stands in.
+    //
+    // Owner only: the PoA and the GM are other people, and the registering
+    // account's address is not theirs to wear.
+    const isOwner = dto.subject === "owner";
+    const email = result.email || (isOwner ? account?.email : undefined);
+    const phone =
+      result.phoneNumber || (isOwner ? account?.phoneNumber : undefined);
+
     const identity: VerifiedIdentityAttributes = {
       [`${prefix}FaydaSub`]: result.sub,
       [`${prefix}FaydaVerifiedAt`]: now,
@@ -2766,8 +2820,12 @@ export class CompaniesService {
       [`${prefix}Gender`]: result.gender ?? null,
       // The verified payload owns the person's details from here on.
       ...(result.fullName ? { [`${prefix}Name`]: result.fullName } : {}),
-      ...(result.email ? { [`${prefix}Email`]: result.email } : {}),
-      ...(result.phoneNumber ? { [`${prefix}Phone`]: result.phoneNumber } : {}),
+      ...(email ? { [`${prefix}Email`]: email } : {}),
+      // Fayda returns whatever the national registry holds, which is routinely a
+      // local number ("0911223344"). Every typed phone in this service is stored
+      // E.164, and `@IsValidPhone()` rejects anything else — so a raw claim here
+      // becomes a value the portal reads back and cannot resubmit.
+      ...(phone ? { [`${prefix}Phone`]: normalizeE164(phone) } : {}),
       ...(result.address ? { [`${prefix}Address`]: result.address } : {}),
     };
 
@@ -2776,6 +2834,12 @@ export class CompaniesService {
     // mail `generalManagerEmail`), and clears any earlier "same as owner"
     // declaration — verifying in their own right is the GM answering for
     // themselves.
+    // Verifying the representative in their own right answers the question the
+    // "same as owner" declaration answered, so the declaration goes.
+    if (dto.subject === "poa") {
+      identity.poaSameAsOwner = false;
+    }
+
     if (dto.subject === "gm") {
       identity.gmSameAsOwner = false;
       if (result.fullName) identity.generalManagerName = result.fullName;
@@ -2817,7 +2881,13 @@ export class CompaniesService {
    * proven identity to copy, only typed text that would arrive wearing a
    * verified badge.
    */
-  async setGmSameAsOwner(userId: string): Promise<CompanyIdentityStateDto> {
+  async setGmSameAsOwner(
+    userId: string,
+    /** Same fallback as {@link completeIdentityVerification}, for owners
+     * verified before that fallback existed — their stored contact details are
+     * blank, and copying blanks here would block the submit. */
+    account?: { email?: string; phoneNumber?: string },
+  ): Promise<CompanyIdentityStateDto> {
     const { company } = await this.getCompanyInfoByUserId(userId);
     const attrs = company.attributes ?? {};
     const ownerSub = attrs.ownerFaydaSub as string | undefined;
@@ -2827,20 +2897,23 @@ export class CompaniesService {
       );
     }
 
+    const ownerEmail = (attrs.ownerEmail as string | undefined) || account?.email || null;
+    const ownerPhone = (attrs.ownerPhone as string | undefined) || account?.phoneNumber || null;
+
     const copied: Record<string, unknown> = {
       gmSameAsOwner: true,
       gmFaydaSub: ownerSub,
       gmFaydaVerifiedAt: attrs.ownerFaydaVerifiedAt ?? new Date().toISOString(),
       gmName: attrs.ownerName ?? null,
-      gmEmail: attrs.ownerEmail ?? null,
-      gmPhone: attrs.ownerPhone ?? null,
+      gmEmail: ownerEmail,
+      gmPhone: ownerPhone ? normalizeE164(ownerPhone) : null,
       gmAddress: attrs.ownerAddress ?? null,
       gmBirthdate: attrs.ownerBirthdate ?? null,
       gmGender: attrs.ownerGender ?? null,
       // Kept in step for the notifiers, same as a GM verification does.
       generalManagerName: attrs.ownerName ?? null,
-      generalManagerEmail: attrs.ownerEmail ?? null,
-      generalManagerPhone: attrs.ownerPhone ?? null,
+      generalManagerEmail: ownerEmail,
+      generalManagerPhone: ownerPhone ? normalizeE164(ownerPhone) : null,
     };
 
     const updated = await this.companiesRepo.update(company.id, {
@@ -2883,6 +2956,118 @@ export class CompaniesService {
     return this.getCompanyIdentityState(updated);
   }
 
+  /**
+   * Declare that the company's Power of Attorney is its owner.
+   *
+   * An owner representing their own company is the ordinary case for a small
+   * business, so this is a supported answer rather than the conflict it used to
+   * be refused as. Two shapes, matching {@link setGmSameAsOwner}:
+   *
+   * - A Fayda-verified owner is a proven identity, so it is copied outright —
+   *   the representative inherits the verification instead of the same human
+   *   being sent through Fayda a second time.
+   * - A foreign company's owner is backed by a typed passport, so there is
+   *   nothing proven to copy. The declaration is still recorded (it is what
+   *   waives the DARS paper) and whatever owner details exist come across; the
+   *   portal types the rest, which `poaProven` accepts for a foreign company.
+   *
+   * Refused for an Ethiopian company whose owner is not verified yet: Fayda is
+   * mandatory for its representative, so a declaration there would record a
+   * representative that could never satisfy the gate.
+   */
+  async setPoaSameAsOwner(
+    userId: string,
+    /** Same fallback as {@link completeIdentityVerification} — an owner whose
+     * Fayda claims carried no email/phone has none stored, and copying blanks
+     * onto a freight forwarder's PoA would block the submit on
+     * `REQUIRED_POA_FIELDS`. */
+    account?: { email?: string; phoneNumber?: string },
+  ): Promise<CompanyIdentityStateDto> {
+    const { company } = await this.getCompanyInfoByUserId(userId);
+    const attrs = company.attributes ?? {};
+    const state = buildCompanyIdentityState(company);
+    const ownerSub = attrs.ownerFaydaSub as string | undefined;
+
+    if (state.faydaRequired && !ownerSub) {
+      throw new BadRequestException(
+        "Verify the company owner with Fayda first — there is no proven identity to reuse yet.",
+      );
+    }
+
+    const ownerEmail = (attrs.ownerEmail as string | undefined) || account?.email;
+    const ownerPhone =
+      (attrs.ownerPhone as string | undefined) || account?.phoneNumber;
+
+    // Only non-blank values are copied: a blank here would overwrite something
+    // the portal typed for a foreign company, whose owner has no verified
+    // claims to draw on.
+    const copied: Record<string, unknown> = { poaSameAsOwner: true };
+    const copy = (key: string, value: unknown) => {
+      if (value !== null && value !== undefined && value !== "")
+        copied[key] = value;
+    };
+    copy("poaName", attrs.ownerName);
+    copy("poaEmail", ownerEmail);
+    copy("poaPhone", ownerPhone ? normalizeE164(ownerPhone) : undefined);
+    copy("poaAddress", attrs.ownerAddress);
+
+    if (ownerSub) {
+      copied.poaFaydaSub = ownerSub;
+      copied.poaFaydaVerifiedAt =
+        attrs.ownerFaydaVerifiedAt ?? new Date().toISOString();
+      copy("poaBirthdate", attrs.ownerBirthdate);
+      copy("poaGender", attrs.ownerGender);
+    }
+
+    const updated = await this.companiesRepo.update(company.id, {
+      attributes: { ...attrs, ...copied },
+    });
+    if (!updated)
+      throw new NotFoundException(`Company ${company.id} not found`);
+    updated.companyProfiles = company.companyProfiles;
+    return this.getCompanyIdentityState(updated);
+  }
+
+  /**
+   * Undo the PoA "same as owner" declaration, clearing the identity it copied
+   * so a different representative can be verified (or typed, for a foreign
+   * company).
+   *
+   * Separate from {@link removePoaIdentity}, which drops the representative and
+   * their paper and is refused to a freight forwarder. Undoing a declaration is
+   * how a forwarder changes its mind about who represents it, so it must stay
+   * open to them — the submit gate still refuses a forwarder that never names a
+   * replacement. The delegation paper is left alone for the same reason: the
+   * company still owes one, now for whoever comes next.
+   *
+   * A no-op when no declaration is in place: a stray call must not wipe a
+   * representative who verified in their own right.
+   */
+  async clearPoaSameAsOwner(userId: string): Promise<CompanyIdentityStateDto> {
+    const { company } = await this.getCompanyInfoByUserId(userId);
+    const attrs = { ...(company.attributes ?? {}) };
+    if (!attrs.poaSameAsOwner) return this.getCompanyIdentityState(company);
+
+    attrs.poaSameAsOwner = false;
+    for (const key of [
+      ...POA_ATTRIBUTES,
+      "poaFaydaSub",
+      "poaFaydaVerifiedAt",
+      "poaBirthdate",
+      "poaGender",
+    ]) {
+      attrs[key] = null;
+    }
+
+    const updated = await this.companiesRepo.update(company.id, {
+      attributes: attrs,
+    });
+    if (!updated)
+      throw new NotFoundException(`Company ${company.id} not found`);
+    updated.companyProfiles = company.companyProfiles;
+    return this.getCompanyIdentityState(updated);
+  }
+
   /**
    * Drop the Power of Attorney entirely — the verified identity, the details it
    * wrote and the delegation paper together.
@@ -2904,7 +3089,7 @@ export class CompaniesService {
       );
     }
 
-    const cleared: Record<string, unknown> = {};
+    const cleared: Record<string, unknown> = { poaSameAsOwner: false };
     for (const key of [
       ...POA_ATTRIBUTES,
       "poaFaydaSub",
@@ -2951,8 +3136,8 @@ export class CompaniesService {
     const snapshot = {
       ...(existing?.snapshot ?? {}),
       faydaIdentity: {
-        ...(((existing?.snapshot ?? {}) as Record<string, any>)
-          .faydaIdentity ?? {}),
+        ...(((existing?.snapshot ?? {}) as Record<string, any>).faydaIdentity ??
+        {}),
         ...identity,
       },
     };
@@ -3364,7 +3549,10 @@ export class CompaniesService {
         "We couldn't find a business license for this TIN with eTrade. Please double-check the number and try again.",
       );
     }
-    return this.etradeService.extractRegistrationData(businessInfo, companyInfo);
+    return this.etradeService.extractRegistrationData(
+      businessInfo,
+      companyInfo,
+    );
   }
 
   async fetchETradeData(tin: string, excludeCompanyId?: string) {
@@ -3396,7 +3584,9 @@ export class CompaniesService {
 
     const tin = dto.tin ?? company.tin;
     const registration = await this.resolveEtradeRegistration(tin);
-    const fresh: Partial<Record<(typeof ETRADE_SOURCED_FIELDS)[number], string>> = {
+    const fresh: Partial<
+      Record<(typeof ETRADE_SOURCED_FIELDS)[number], string>
+    > = {
       companyName: registration.companyName,
       licenceNumber: registration.licenceNumber,
       statusDescription: registration.statusDescription,
diff --git a/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts b/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts
index 66f88e9f8..6bcd21f08 100644
--- a/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts
+++ b/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts
@@ -10,7 +10,8 @@ import {
 import { Company, CompanyStatus } from "./entities/company.entity";
 import { NotificationsService } from "../notifications/notifications.service";
 import { NotificationInboxService } from "../notification-inbox/notification-inbox.service";
-import { resolveCompanyNotifyPhone } from "../notifications/resolve-company-phone.util";
+import { resolveCompanyNotifyContact } from "../notifications/resolve-company-phone.util";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 
 /** Account statuses that lock the customer out and therefore must be told to them. */
 const PUNITIVE_STATUSES: readonly CompanyStatus[] = [
@@ -37,8 +38,13 @@ export class CompanyNotifierService {
 
   /** Send SMS + email to the company contact; log-only on failure. */
   private async notifyContact(company: Company, message: string): Promise<void> {
-    const phone = await resolveCompanyNotifyPhone(this.dataSource, company.id);
-    const email = company.email ?? company.generalManagerEmail ?? null;
+    // One resolver for both channels — the company row's own email column is
+    // only set for a Fayda-verified owner (see companyNotifyEmailExpr), which
+    // left an approval/suspension notice unsent to everyone else.
+    const { phone, email } = await resolveCompanyNotifyContact(
+      this.dataSource,
+      company.id,
+    );
 
     if (phone) {
       try {
@@ -175,12 +181,9 @@ export class CompanyNotifierService {
   // ── Backoffice-facing: work has arrived back in the review queue ────────────
 
   /**
-   * Persist + push an in-app item to every backoffice staff user, deep-linked to
-   * the customer's detail page.
-   *
-   * The recipient resolver has no role/permission targeting (see
-   * `notification-recipients.service.ts`) — `allBackoffice` is the narrowest
-   * selector available, so marketing is reached by notifying all staff.
+   * Persist + push an in-app item to the customer desk — staff holding
+   * `customers:get_notification` — deep-linked to the customer's detail page,
+   * which is itself gated on `customers:view`.
    */
   private notifyStaff(
     company: Company,
@@ -189,7 +192,7 @@ export class CompanyNotifierService {
     data: Record<string, unknown> = {},
   ): void {
     void this.inbox.notify({
-      recipients: { allBackoffice: true },
+      recipients: { permissionKeys: [FREIGHT_PERMS.customers.getNotification] },
       audience: NotificationAudience.BACKOFFICE,
       type: NotificationType.REQUEST_SUBMITTED,
       title,
diff --git a/apps/edr-freight-api/src/modules/companies/dto/complete-identity-verification.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/complete-identity-verification.dto.ts
index d41e61e8e..df39949d4 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/complete-identity-verification.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/complete-identity-verification.dto.ts
@@ -75,6 +75,12 @@ export class CompanyIdentityStateDto {
   @ApiProperty({ type: IdentityVerificationStateDto })
   poa!: IdentityVerificationStateDto;
 
+  @ApiProperty({
+    description:
+      "True when the Power of Attorney is the company's owner, declared through the portal's \"same as owner\" copy. Waives the DARS delegation paper — nobody delegates to themselves.",
+  })
+  poaSameAsOwner!: boolean;
+
   @ApiProperty({
     type: IdentityVerificationStateDto,
     description:
@@ -143,12 +149,18 @@ function stateFor(
     birthdate: read(`${p}Birthdate`),
     gender: read(`${p}Gender`),
   };
-  if (subject !== "gm") return state;
+  if (subject !== "gm" || state.verified) return state;
 
   // Companies onboarded before the GM was verifiable have typed details and no
   // `gm*` attributes at all. Report those rather than a blank card — they are
   // still what the notifiers mail — leaving `verified` false so the portal
   // offers the upgrade instead of pretending the identity is proven.
+  //
+  // Only for such an unverified GM, which is the whole population this exists
+  // for. Merging the typed columns into a *verified* manager's state would read
+  // back the email the portal asked them to type when Fayda supplied none, and
+  // the input offering it — keyed on that value being absent — would vanish the
+  // moment it was saved, leaving a typo uncorrectable.
   return {
     ...state,
     name: state.name ?? read(GM_TYPED_KEYS.name),
@@ -190,6 +202,7 @@ export function buildCompanyIdentityState(
 
   const gm = stateFor(attrs, "gm");
   const gmSameAsOwner = Boolean(attrs.gmSameAsOwner);
+  const poaSameAsOwner = Boolean(attrs.poaSameAsOwner);
 
   const ownerProven = faydaRequired
     ? owner.verified
@@ -214,6 +227,7 @@ export function buildCompanyIdentityState(
     passportRequired,
     owner,
     poa,
+    poaSameAsOwner,
     gm,
     gmSameAsOwner,
     complete,
diff --git a/apps/edr-freight-api/src/modules/companies/dto/create-company-with-profile.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/create-company-with-profile.dto.ts
index 7816572ec..d82093336 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/create-company-with-profile.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/create-company-with-profile.dto.ts
@@ -1,9 +1,18 @@
-import { IsString, IsNotEmpty, IsOptional, IsEmail, MaxLength, IsBoolean, IsEnum, IsArray, ValidateNested, ArrayMinSize } from 'class-validator';
-import { Type } from 'class-transformer';
-import { CompanyType } from '../entities/company.entity';
-import { ProfileType } from '../entities/company-profile.entity';
-import { IsValidPhone } from '../../../common/validators/is-phone-number.validator';
-import { IsTin } from '../../../common/validators/is-tin.validator';
+import {
+  IsString,
+  IsNotEmpty,
+  IsOptional,
+  MaxLength,
+  IsBoolean,
+  IsEnum,
+  IsArray,
+  ValidateNested,
+  ArrayMinSize,
+} from "class-validator";
+import { Type } from "class-transformer";
+import { CompanyType } from "../entities/company.entity";
+import { ProfileType } from "../entities/company-profile.entity";
+import { IsTin } from "../../../common/validators/is-tin.validator";
 
 export class CompanyProfileInputDto {
   @IsEnum(ProfileType)
@@ -24,17 +33,6 @@ export class CreateCompanyWithProfileDto {
   @MaxLength(200)
   companyName!: string;
 
-  @IsOptional()
-  @IsEmail()
-  @MaxLength(150)
-  companyEmail?: string;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(20)
-  @IsValidPhone()
-  companyPhone?: string;
-
   @IsOptional()
   @IsString()
   @MaxLength(32)
@@ -46,7 +44,7 @@ export class CreateCompanyWithProfileDto {
 
   @IsOptional()
   @IsString()
-  @IsTin({ message: 'TIN must be exactly 10 digits' })
+  @IsTin({ message: "TIN must be exactly 10 digits" })
   tin?: string;
 
   @IsOptional()
diff --git a/apps/edr-freight-api/src/modules/companies/dto/onboarding-requirements-response.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/onboarding-requirements-response.dto.ts
index a8d2f24a2..9b69bb15d 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/onboarding-requirements-response.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/onboarding-requirements-response.dto.ts
@@ -42,6 +42,12 @@ export interface OnboardingPoaState {
   required: boolean;
   /** True once any PoA detail has been entered. */
   provided: boolean;
+  /**
+   * True when the DARS delegation paper is owed — a PoA exists (or is
+   * mandatory) and is not the owner themselves. An owner representing their own
+   * company delegates to nobody, so there is no delegation to evidence.
+   */
+  delegationLetterRequired: boolean;
   /** True when the DARS delegation paper is stored for the company. */
   delegationLetterUploaded: boolean;
   /** True when a reviewer sent the paper back for correction. */
diff --git a/apps/edr-freight-api/src/modules/companies/dto/profile-response.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/profile-response.dto.ts
index f0a19dad7..a70c52b5d 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/profile-response.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/profile-response.dto.ts
@@ -2,21 +2,19 @@ import {
   buildCompanyIdentityState,
   CompanyIdentityStateDto,
 } from "./complete-identity-verification.dto";
-import { Company } from '../entities/company.entity';
-import { ExternalProfile } from '../entities/external-profile.entity';
+import { Company } from "../entities/company.entity";
+import { ExternalProfile } from "../entities/external-profile.entity";
 import {
   ChangeRequestStatus,
   CompanyChangeRequest,
-} from '../entities/company-change-request.entity';
-import { ResponseCompanyProfileDto } from './response-company.dto';
+} from "../entities/company-change-request.entity";
+import { ResponseCompanyProfileDto } from "./response-company.dto";
 
 export class ProfileResponseDto {
   companyId: string;
   companyName: string;
   companyType: string;
   nationality: string | null;
-  companyEmail: string | null;
-  companyPhone: string | null;
   companyLocation: string;
   companyAddress: string | null;
   tinNumber: string;
@@ -89,8 +87,6 @@ export class ProfileResponseDto {
     this.companyProfiles =
       company.companyProfiles?.map((p) => new ResponseCompanyProfileDto(p)) ??
       [];
-    this.companyEmail = company.email ?? null;
-    this.companyPhone = company.phone ?? null;
     this.companyLocation = company.country;
     this.companyAddress = company.address ?? null;
     this.tinNumber = company.tin;
@@ -128,9 +124,9 @@ export class ProfileResponseDto {
 
     const openReview =
       changeRequest &&
-      (changeRequest.status === ChangeRequestStatus.Pending ||
-        changeRequest.status === ChangeRequestStatus.Rejected ||
-        changeRequest.status === ChangeRequestStatus.ChangesRequested)
+        (changeRequest.status === ChangeRequestStatus.Pending ||
+          changeRequest.status === ChangeRequestStatus.Rejected ||
+          changeRequest.status === ChangeRequestStatus.ChangesRequested)
         ? changeRequest
         : null;
     this.reviewStatus =
diff --git a/apps/edr-freight-api/src/modules/companies/dto/update-profile.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/update-profile.dto.ts
index 596644fab..214c3858a 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/update-profile.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/update-profile.dto.ts
@@ -1,8 +1,16 @@
-import { IsString, IsOptional, IsEmail, MaxLength, IsEnum, IsIn } from 'class-validator';
-import { ETHIOPIAN_REGIONS, type EthiopianRegion } from '@edr/types';
-import { CompanyNationality } from '../entities/company.entity';
-import { IsValidPhone } from '../../../common/validators/is-phone-number.validator';
-import { IsTin } from '../../../common/validators/is-tin.validator';
+import {
+  IsString,
+  IsOptional,
+  IsEmail,
+  MaxLength,
+  IsEnum,
+  IsIn,
+  Matches,
+} from "class-validator";
+import { ETHIOPIAN_REGIONS, type EthiopianRegion } from "@edr/types";
+import { CompanyNationality } from "../entities/company.entity";
+import { IsValidPhone } from "../../../common/validators/is-phone-number.validator";
+import { IsTin } from "../../../common/validators/is-tin.validator";
 
 export class UpdateProfileDto {
   @IsOptional()
@@ -14,17 +22,6 @@ export class UpdateProfileDto {
   @MaxLength(200)
   companyName?: string;
 
-  @IsOptional()
-  @IsEmail()
-  @MaxLength(150)
-  companyEmail?: string;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(20)
-  @IsValidPhone()
-  companyPhone?: string;
-
   @IsOptional()
   @IsString()
   @MaxLength(32)
@@ -36,12 +33,16 @@ export class UpdateProfileDto {
 
   @IsOptional()
   @IsString()
-  @IsTin({ message: 'TIN must be exactly 10 digits' })
+  @IsTin({ message: "TIN must be exactly 10 digits" })
   tin?: string;
 
+  // Ethiopian VAT registration numbers are 10 digits, the same shape as the
+  // TIN. Both portal forms enforce that; without it here the API happily stored
+  // whatever a stale client sent, and the two layers disagreed about what the
+  // column may hold.
   @IsOptional()
   @IsString()
-  @MaxLength(50)
+  @Matches(/^\d{10}$/, { message: "VAT number must be exactly 10 digits" })
   vatNumber?: string;
 
   // `fanNumber` is deliberately absent: the FAN is the Fayda number of the
diff --git a/apps/edr-freight-api/src/modules/compliance/compliance.controller.ts b/apps/edr-freight-api/src/modules/compliance/compliance.controller.ts
index 2a5715647..25d010253 100644
--- a/apps/edr-freight-api/src/modules/compliance/compliance.controller.ts
+++ b/apps/edr-freight-api/src/modules/compliance/compliance.controller.ts
@@ -1,5 +1,7 @@
 import { Controller, Post, Get, Patch, Delete, Body, Param, Query } from '@nestjs/common';
 import { ApiTags, ApiOperation } from '@nestjs/swagger';
+import { BookingStaff } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { ComplianceService } from './compliance.service';
 import {
   CreateComplianceRecordDto,
@@ -9,10 +11,17 @@ import { ComplianceType } from './entities/compliance-record.entity';
 
 @ApiTags('Vehicle Compliance')
 @Controller('compliance')
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.compliance.view,
+  FREIGHT_PERMS.compliance.manage,
+])
 export class ComplianceController {
   constructor(private readonly complianceService: ComplianceService) {}
 
   @Post()
+  @BookingStaff(FREIGHT_PERMS.compliance.manage)
   @ApiOperation({ summary: 'Create a compliance record' })
   create(@Body() dto: CreateComplianceRecordDto) {
     return this.complianceService.create(dto);
@@ -40,12 +49,14 @@ export class ComplianceController {
   }
 
   @Patch(':id')
+  @BookingStaff(FREIGHT_PERMS.compliance.manage)
   @ApiOperation({ summary: 'Update a compliance record' })
   update(@Param('id') id: string, @Body() dto: UpdateComplianceRecordDto) {
     return this.complianceService.update(id, dto);
   }
 
   @Delete(':id')
+  @BookingStaff(FREIGHT_PERMS.compliance.manage)
   @ApiOperation({ summary: 'Soft-delete a compliance record' })
   remove(@Param('id') id: string) {
     return this.complianceService.remove(id);
diff --git a/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts b/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts
index 579b9ee26..a9aaa73e3 100644
--- a/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts
+++ b/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts
@@ -17,7 +17,12 @@ import { FilterConsignmentDto } from "./dto/filter-consignment.dto";
 
 @ApiTags("consignments")
 @Controller("consignments")
-@FleetView(FREIGHT_PERMS.consignments.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@FleetView([
+  FREIGHT_PERMS.consignments.view,
+  FREIGHT_PERMS.consignments.create,
+])
 export class ConsignmentsController {
   constructor(private readonly consignmentsService: ConsignmentsService) {}
 
diff --git a/apps/edr-freight-api/src/modules/container-management/containers.controller.ts b/apps/edr-freight-api/src/modules/container-management/containers.controller.ts
index 0a5e6bb0f..a209e2609 100644
--- a/apps/edr-freight-api/src/modules/container-management/containers.controller.ts
+++ b/apps/edr-freight-api/src/modules/container-management/containers.controller.ts
@@ -19,7 +19,14 @@ import { ContainersService } from './containers.service';
 
 @ApiTags('containers')
 @Controller('containers')
-@FleetView(FREIGHT_PERMS.containers.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@FleetView([
+  FREIGHT_PERMS.containers.view,
+  FREIGHT_PERMS.containers.create,
+  FREIGHT_PERMS.containers.update,
+  FREIGHT_PERMS.containers.delete,
+])
 export class ContainersController {
   constructor(private readonly containersService: ContainersService) {}
 
diff --git a/apps/edr-freight-api/src/modules/container-management/entities/container.entity.ts b/apps/edr-freight-api/src/modules/container-management/entities/container.entity.ts
index e6fdd47ee..ec6df69c5 100644
--- a/apps/edr-freight-api/src/modules/container-management/entities/container.entity.ts
+++ b/apps/edr-freight-api/src/modules/container-management/entities/container.entity.ts
@@ -32,7 +32,7 @@ export class Container extends BaseEntity {
   type: 'varchar',
   nullable: true,
 })
-sealNumber!: string | null;
+  sealNumber!: string | null;
 
   @Column({ type: 'varchar', default: 'AVAILABLE' })
   status!: string; // AVAILABLE, LOADED, IN_TRANSIT, MAINTENANCE, DAMAGED
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
index 8cf1c5671..7053d224f 100644
--- 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
@@ -3,6 +3,8 @@ import {
   Controller,
   Delete,
   Get,
+  HttpCode,
+  HttpStatus,
   Param,
   Patch,
   Post,
@@ -10,44 +12,90 @@ import {
 } from "@nestjs/common";
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 
-import { FreightAdmin } from "../../common/booking-guards";
+import { BookingStaff } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { ContractTemplatesService } from "./contract-templates.service";
 import {
   CreateArticleDto,
+  CreateContractTemplateDto,
   PreviewContractTemplateDto,
   ReplaceArticlesDto,
   UpdateArticleDto,
   UpdateContractTemplateDto,
 } from "./dto/contract-template.dto";
 
+// `view` opens the Templates page; `read` is API-read-only for other pages
+// that show template data; create/update/delete gate each write. `manage` is
+// the legacy write key and keeps working for roles that already hold it.
+const TEMPLATE_READ = [
+  FREIGHT_PERMS.settings.contractTemplates.view,
+  FREIGHT_PERMS.settings.contractTemplates.read,
+  FREIGHT_PERMS.settings.contractTemplates.update,
+  FREIGHT_PERMS.settings.contractTemplates.manage,
+  FREIGHT_PERMS.admin,
+];
+
+const TEMPLATE_UPDATE = [
+  FREIGHT_PERMS.settings.contractTemplates.update,
+  FREIGHT_PERMS.settings.contractTemplates.manage,
+  FREIGHT_PERMS.admin,
+];
+
 @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" })
+  @BookingStaff(TEMPLATE_READ)
+  @ApiOperation({ summary: "List contract templates (system container + staff-created bulk)" })
   list() {
     return this.service.list();
   }
 
+  @Post()
+  @BookingStaff([
+    FREIGHT_PERMS.settings.contractTemplates.create,
+    FREIGHT_PERMS.settings.contractTemplates.manage,
+    FREIGHT_PERMS.admin,
+  ])
+  @ApiOperation({
+    summary:
+      "Create a bulk contract template for a (cargo type, customs option) pair",
+  })
+  create(@Body() dto: CreateContractTemplateDto) {
+    return this.service.create(dto);
+  }
+
   @Get(":code")
+  @BookingStaff(TEMPLATE_READ)
   @ApiOperation({ summary: "Get one contract template by code" })
   getByCode(@Param("code") code: string) {
     return this.service.getByCode(code);
   }
 
   @Patch(":code")
-  @FreightAdmin()
+  @BookingStaff(TEMPLATE_UPDATE)
   @ApiOperation({ summary: "Update template metadata (name, title, recitals, active flag)" })
   update(@Param("code") code: string, @Body() dto: UpdateContractTemplateDto) {
     return this.service.update(code, dto);
   }
 
+  @Delete(":code")
+  @BookingStaff([
+    FREIGHT_PERMS.settings.contractTemplates.delete,
+    FREIGHT_PERMS.admin,
+  ])
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: "Delete a staff-created bulk template (system templates refuse)",
+  })
+  remove(@Param("code") code: string) {
+    return this.service.remove(code);
+  }
+
   @Post(":code/preview")
+  @BookingStaff(TEMPLATE_READ)
   @ApiOperation({
     summary: "Render an HTML preview of the template against mock contract data",
   })
@@ -61,21 +109,21 @@ export class ContractTemplatesController {
   /* ------------------------- article routes ------------------------- */
 
   @Put(":code/articles")
-  @FreightAdmin()
+  @BookingStaff(TEMPLATE_UPDATE)
   @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()
+  @BookingStaff(TEMPLATE_UPDATE)
   @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()
+  @BookingStaff(TEMPLATE_UPDATE)
   @ApiOperation({ summary: "Update an article's title or body" })
   updateArticle(
     @Param("code") code: string,
@@ -86,7 +134,7 @@ export class ContractTemplatesController {
   }
 
   @Delete(":code/articles/:articleId")
-  @FreightAdmin()
+  @BookingStaff(TEMPLATE_UPDATE)
   @ApiOperation({ summary: "Remove an article from the template" })
   removeArticle(
     @Param("code") code: string,
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
index 2f4fb0117..9d50b1677 100644
--- 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
@@ -3,10 +3,8 @@ import { Injectable } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
 
-import {
-  ContractTemplate,
-  ContractTemplateCode,
-} from "./entities/contract-template.entity";
+import { CargoType } from "../rule-engine/entities/cargo-type.entity";
+import { ContractTemplate } from "./entities/contract-template.entity";
 
 @Injectable()
 export class ContractTemplatesRepository extends BaseRepository<ContractTemplate> {
@@ -17,12 +15,51 @@ export class ContractTemplatesRepository extends BaseRepository<ContractTemplate
     super(repository);
   }
 
-  findByCode(code: ContractTemplateCode): Promise<ContractTemplate | null> {
+  findByCode(code: string): Promise<ContractTemplate | null> {
     return this.repository.findOne({ where: { code } });
   }
 
   override findAll(): Promise<ContractTemplate[]> {
-    return this.repository.find({ order: { code: "ASC" } });
+    return this.repository.find({
+      relations: { cargoType: true },
+      order: { code: "ASC" },
+    });
+  }
+
+  findByCargoCombo(
+    cargoTypeId: string,
+    withCustoms: boolean,
+  ): Promise<ContractTemplate | null> {
+    return this.repository.findOne({ where: { cargoTypeId, withCustoms } });
+  }
+
+  /**
+   * The active bulk template covering this cargo type: written against the
+   * cargo type itself or against its parent group (the two are mutually
+   * exclusive, so at most one row matches).
+   */
+  findActiveBulkTemplate(
+    cargoTypeId: string,
+    withCustoms: boolean,
+  ): Promise<ContractTemplate | null> {
+    return this.repository
+      .createQueryBuilder("t")
+      .where("t.is_active = true")
+      .andWhere("t.with_customs = :withCustoms", { withCustoms })
+      .andWhere(
+        `(t.cargo_type_id = :cargoTypeId OR t.cargo_type_id = (
+           SELECT c.parent_group_id FROM freight.cargo_types c
+           WHERE c.id = :cargoTypeId AND c.deleted_at IS NULL
+         ))`,
+        { cargoTypeId },
+      )
+      .getOne();
+  }
+
+  findCargoType(id: string): Promise<CargoType | null> {
+    return this.repository.manager
+      .getRepository(CargoType)
+      .findOne({ where: { id } });
   }
 
   async saveTemplate(template: ContractTemplate): Promise<ContractTemplate> {
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
index ea41b57a2..da9c849f7 100644
--- 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
@@ -1,4 +1,9 @@
-import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from "@nestjs/common";
 import { randomUUID } from "node:crypto";
 
 import { ContractRendererService } from "../../contracts/contract-renderer.service";
@@ -11,6 +16,7 @@ import {
 import { ContractTemplatesRepository } from "./contract-templates.repository";
 import {
   CreateArticleDto,
+  CreateContractTemplateDto,
   PreviewContractTemplateDto,
   ReplaceArticleDto,
   UpdateArticleDto,
@@ -53,13 +59,17 @@ export class ContractTemplatesService {
   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),
-    );
+    // Seeded container templates first in canonical order, then staff-created
+    // bulk templates alphabetically.
+    return templates.sort((a, b) => {
+      const ra = rank.get(a.code as ContractTemplateCode) ?? 99;
+      const rb = rank.get(b.code as ContractTemplateCode) ?? 99;
+      return ra !== rb ? ra - rb : a.name.localeCompare(b.name);
+    });
   }
 
   async getByCode(code: string): Promise<ContractTemplate> {
-    const template = await this.repository.findByCode(this.assertCode(code));
+    const template = await this.repository.findByCode(code?.toUpperCase() ?? "");
     if (!template) {
       throw new NotFoundException(`Contract template ${code} not found`);
     }
@@ -67,15 +77,93 @@ export class ContractTemplatesService {
   }
 
   /**
-   * The active template used when generating a contract document for the given
-   * direction/freight/customs triple; null when missing or deactivated (the
-   * renderer then falls back to the built-in generic layout).
+   * Staff-created bulk template for one (cargo type, customs option) pair.
+   * The cargo type must have hasContractTemplate enabled and the combination
+   * must not already exist — the same commodity + customs pairing is edited,
+   * never duplicated.
+   */
+  async create(dto: CreateContractTemplateDto): Promise<ContractTemplate> {
+    const cargoType = await this.repository.findCargoType(dto.cargoTypeId);
+    if (!cargoType) {
+      throw new NotFoundException(`Cargo type ${dto.cargoTypeId} not found`);
+    }
+    if (!cargoType.hasContractTemplate) {
+      throw new BadRequestException(
+        `"${cargoType.cargoTypeName}" does not allow contract templates — enable "has contract template" on the cargo type first`,
+      );
+    }
+    const variant = dto.withCustoms ? "with" : "without";
+    const existing = await this.repository.findByCargoCombo(
+      dto.cargoTypeId,
+      dto.withCustoms,
+    );
+    if (existing) {
+      throw new ConflictException(
+        `A "${cargoType.cargoTypeName}" template ${variant} customs clearing already exists — edit that template instead`,
+      );
+    }
+
+    const template = new ContractTemplate();
+    template.code = `BULK_${cargoType.code}_${dto.withCustoms ? "CUSTOMS" : "NO_CUSTOMS"}`.toUpperCase();
+    template.name =
+      dto.name ??
+      `${cargoType.cargoTypeName} Bulk Contract (${variant} customs clearing)`;
+    template.description = dto.description ?? null;
+    template.documentTitle = dto.withCustoms
+      ? `${cargoType.cargoTypeName} Transportation and Customs Clearance Services`
+      : `${cargoType.cargoTypeName} Transportation Services`;
+    template.whereasClauses = [];
+    template.articles = [];
+    template.isActive = true;
+    template.cargoTypeId = cargoType.id;
+    template.withCustoms = dto.withCustoms;
+    template.isSystem = false;
+    try {
+      return await this.repository.saveTemplate(template);
+    } catch (error) {
+      // Partial unique index backstop for concurrent creates of the same combo.
+      if ((error as { code?: string })?.code === "23505") {
+        throw new ConflictException(
+          `A "${cargoType.cargoTypeName}" template ${variant} customs clearing already exists — edit that template instead`,
+        );
+      }
+      throw error;
+    }
+  }
+
+  /** Bulk templates only — the five seeded container templates are permanent. */
+  async remove(code: string): Promise<void> {
+    const template = await this.getByCode(code);
+    if (template.isSystem) {
+      throw new BadRequestException(
+        "System container templates cannot be deleted",
+      );
+    }
+    await this.repository.softDelete(template.id);
+  }
+
+  /**
+   * The active template used when generating a contract document. Container
+   * contracts resolve through the fixed direction/customs codes; bulk contracts
+   * resolve through the staff-created template for the contract's cargo type
+   * (or its parent group) and customs option. Null when nothing matches or the
+   * match is deactivated (the renderer then falls back to the built-in generic
+   * layout).
    */
   async findActiveForContract(
     tradeDirection?: string | null,
     freightType?: string | null,
     customsClearingEnabled?: boolean | null,
+    cargoTypeId?: string | null,
   ): Promise<ContractTemplate | null> {
+    const isBulk = (freightType ?? "").toUpperCase().includes("BULK");
+    if (isBulk) {
+      if (!cargoTypeId) return null;
+      return this.repository.findActiveBulkTemplate(
+        cargoTypeId,
+        Boolean(customsClearingEnabled),
+      );
+    }
     const code = contractTemplateCodeFor(
       tradeDirection,
       freightType,
@@ -180,16 +268,32 @@ export class ContractTemplatesService {
         : this.sorted(template.articles),
     };
 
-    const view = this.buildMockView(template.code, dynamicTemplate);
+    const view = this.buildMockView(template, dynamicTemplate);
     return { html: this.renderer.render(view) };
   }
 
+  /**
+   * Registry key the mock preview renders against. Staff-created bulk
+   * templates aren't in the fixed code map — they preview against the
+   * representative bulk import pack matching their customs option.
+   */
+  private previewKeyFor(template: ContractTemplate): string {
+    if (template.cargoTypeId) {
+      return template.withCustoms
+        ? "IMP_BULK_USD_FORWARDING"
+        : "IMP_BULK_USD_TRANSPORT_ONLY";
+    }
+    return PREVIEW_TEMPLATE_KEYS[template.code as ContractTemplateCode];
+  }
+
   private buildMockView(
-    code: ContractTemplateCode,
+    template: ContractTemplate,
     dynamicTemplate: ContractDynamicTemplateView,
   ): ContractViewModel {
-    const meta = getTemplateMeta(PREVIEW_TEMPLATE_KEYS[code]);
-    const isBulk = code.endsWith("_BULK");
+    const code = template.code;
+    const previewKey = this.previewKeyFor(template);
+    const meta = getTemplateMeta(previewKey);
+    const isBulk = Boolean(template.cargoTypeId) || code.includes("BULK");
     const now = new Date();
 
     // Representative rate schedule so the admin preview shows the live-rate
@@ -200,7 +304,7 @@ export class ContractTemplatesService {
       bookingId: "00000000-0000-0000-0000-000000000000",
       reference: "EDR/CT/2026/0042",
       status: "CONTRACT_READY",
-      templateKey: PREVIEW_TEMPLATE_KEYS[code],
+      templateKey: previewKey,
       template: { ...meta, title: dynamicTemplate.name, templateFile: "edr-dynamic.hbs" },
       contractDate: now.toLocaleDateString("en-GB", {
         day: "numeric",
@@ -275,7 +379,7 @@ export class ContractTemplatesService {
   }
 
   /** Static, representative rate schedule for the admin preview only. */
-  private mockRateSchedule(code: ContractTemplateCode, isBulk: boolean): RateSchedule {
+  private mockRateSchedule(code: string, isBulk: boolean): RateSchedule {
     const dir = code.startsWith("IMPORT")
       ? "import"
       : code.startsWith("EXPORT")
@@ -311,16 +415,6 @@ export class ContractTemplatesService {
     };
   }
 
-  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));
   }
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
index 0ea69f262..c8911d8e5 100644
--- 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
@@ -6,12 +6,41 @@ import {
   IsInt,
   IsOptional,
   IsString,
+  IsUUID,
   MaxLength,
   Min,
   MinLength,
   ValidateNested,
 } from "class-validator";
 
+export class CreateContractTemplateDto {
+  @ApiProperty({
+    description:
+      "Bulk cargo type this template is written for (must have hasContractTemplate enabled)",
+    format: "uuid",
+  })
+  @IsUUID()
+  cargoTypeId!: string;
+
+  @ApiProperty({
+    description: "Whether this is the with-customs-clearing variant",
+  })
+  @IsBoolean()
+  withCustoms!: boolean;
+
+  @ApiPropertyOptional({ description: "Display name (derived from the cargo type when omitted)" })
+  @IsOptional()
+  @IsString()
+  @MinLength(3)
+  @MaxLength(200)
+  name?: string;
+
+  @ApiPropertyOptional({ description: "Short description shown on the template card" })
+  @IsOptional()
+  @IsString()
+  description?: string;
+}
+
 export class UpdateContractTemplateDto {
   @ApiPropertyOptional({ description: "Display name of the template" })
   @IsOptional()
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
index c322c20a4..af0721572 100644
--- 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
@@ -1,11 +1,18 @@
 import { BaseEntity } from "@edr/api-common";
-import { Column, Entity, Index } from "typeorm";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+import { CargoType } from "../../rule-engine/entities/cargo-type.entity";
 
 /**
- * The ten canonical contract document templates. Import and export split by
- * customs clearing (× freight type = 8); intercity does not, because it is a
- * purely domestic Ethiopian movement that crosses no border and therefore has
- * no customs leg at all (× freight type = 2).
+ * The five seeded container templates (import/export split by customs
+ * clearing; intercity is domestic, crosses no border, so it has a single
+ * template). These are system rows: always present, never deletable.
+ *
+ * Bulk templates are NOT seeded — staff create them per bulk cargo type
+ * (`cargoTypeId`) and customs option (`withCustoms`), one template per
+ * combination. Their codes are generated as BULK_<cargo code>_(NO_)CUSTOMS.
+ * The retired direction-keyed bulk codes remain listed so old frozen document
+ * snapshots still label correctly.
  *
  * Contracts store DOMESTIC for intercity movements; the template layer labels
  * those INTERCITY to match the commercial vocabulary used on the printed
@@ -76,10 +83,12 @@ export function contractTemplateCodeFor(
 }
 
 @Entity({ schema: "freight", name: "contract_templates" })
-@Index(["code"], { unique: true })
+// Uniqueness lives in partial DB indexes (live rows only): code, and
+// (cargo_type_id, with_customs) for staff-created bulk templates.
+@Index(["code"])
 export class ContractTemplate extends BaseEntity {
-  @Column({ name: "code", type: "varchar", length: 40, unique: true })
-  code!: ContractTemplateCode;
+  @Column({ name: "code", type: "varchar", length: 80 })
+  code!: string;
 
   @Column({ name: "name", type: "varchar", length: 200 })
   name!: string;
@@ -100,4 +109,20 @@ export class ContractTemplate extends BaseEntity {
 
   @Column({ name: "is_active", type: "boolean", default: true })
   isActive!: boolean;
+
+  /** Bulk templates only: the cargo type this template is written for. */
+  @Column({ name: "cargo_type_id", type: "uuid", nullable: true })
+  cargoTypeId?: string | null;
+
+  @ManyToOne(() => CargoType, { nullable: true })
+  @JoinColumn({ name: "cargo_type_id" })
+  cargoType?: CargoType | null;
+
+  /** Bulk templates only: whether this is the with-customs-clearing variant. */
+  @Column({ name: "with_customs", type: "boolean", nullable: true })
+  withCustoms?: boolean | null;
+
+  /** The five seeded container templates — cannot be deleted. */
+  @Column({ name: "is_system", type: "boolean", default: false })
+  isSystem!: boolean;
 }
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.resubmit-cargo.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.resubmit-cargo.spec.ts
new file mode 100644
index 000000000..d5d15d73d
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.resubmit-cargo.spec.ts
@@ -0,0 +1,115 @@
+import { ContractBookingService } from './contract-booking.service';
+
+/**
+ * OPERATION_CHANGES_REQUESTED resubmit with restated cargo. Operations can ask
+ * for the cargo itself to change, so a completion payload that restates
+ * containers must cancel the unpaid invoice, wipe the persisted cargo and
+ * re-run the fresh-completion path (re-persist, re-price, re-invoice). A
+ * payload without cargo keeps the day-only resubmit behavior.
+ */
+describe('ContractBookingService — changes-requested resubmit restating cargo', () => {
+  const CONTRACT = {
+    id: 'c-1',
+    reference: 'CTR-1',
+    contractKind: 'GENERAL',
+    freightType: 'CONTAINER',
+    tradeDirection: 'IMPORT',
+    customsClearingEnabled: false,
+    contractValidUntil: null,
+    cargoScope: [],
+  };
+
+  const bookingWithCargo = () => ({
+    id: 'b-1',
+    contractId: 'c-1',
+    reference: 'BKG-1',
+    status: 'OPERATION_CHANGES_REQUESTED',
+    bookingContainers: [{ containerSize: '20FT', quantity: 4 }],
+    cargoTotalWeightVgm: 80,
+    originYardId: 'y-o',
+    destinationYardId: 'y-d',
+  });
+
+  function makeService() {
+    const bookingsRepository = {
+      findByIdWithFiles: jest.fn().mockResolvedValue(bookingWithCargo()),
+      deleteContainers: jest.fn().mockResolvedValue(undefined),
+      update: jest.fn().mockResolvedValue(undefined),
+    };
+    const invoiceService = {
+      cancelUnpaidInvoiceForBooking: jest.fn().mockResolvedValue(undefined),
+    };
+    const trainSchedulingService = {
+      assertBookingWindowOpen: jest.fn().mockResolvedValue(undefined),
+    };
+    const contractsRepository = {
+      findByIdWithRelations: jest.fn().mockResolvedValue(CONTRACT),
+    };
+    const service = new ContractBookingService(
+      contractsRepository as never,
+      bookingsRepository as never,
+      {} as never, // bookingPricingService
+      {} as never, // consolidationService
+      {} as never, // containerTypesService
+      {} as never, // ruleEngineService
+      {} as never, // milestoneService
+      invoiceService as never,
+      {} as never, // bookingNotifier
+      {} as never, // dataSource
+      trainSchedulingService as never,
+      {} as never, // bookingBatchService
+      {} as never, // bookingTransitionService
+    );
+    return { service, bookingsRepository, invoiceService };
+  }
+
+  // Both paths dead-end into a downstream private assert we replace with a
+  // sentinel — which path threw tells us which branch the resubmit took.
+  const SENTINEL = new Error('reached-branch');
+
+  it('restated cargo cancels the invoice, wipes cargo and re-runs fresh completion', async () => {
+    const { service, bookingsRepository, invoiceService } = makeService();
+    // First gate inside the fresh-completion (!hasCargo) path.
+    jest
+      .spyOn(
+        service as never as { assertWithinQuantityCap: () => Promise<void> },
+        'assertWithinQuantityCap',
+      )
+      .mockRejectedValue(SENTINEL);
+
+    await expect(
+      service.completeUnderContract('c-1', 'b-1', {
+        scheduledDate: new Date().toISOString(),
+        containers: [{ containerSize: '20FT', quantity: 2 }],
+      } as never),
+    ).rejects.toBe(SENTINEL);
+
+    expect(invoiceService.cancelUnpaidInvoiceForBooking).toHaveBeenCalledWith('b-1');
+    expect(bookingsRepository.deleteContainers).toHaveBeenCalledWith('b-1');
+    expect(bookingsRepository.update).toHaveBeenCalledWith('b-1', {
+      cargoTotalWeightVgm: 0,
+    });
+  });
+
+  it('a day-only resubmit keeps the persisted cargo and invoice untouched', async () => {
+    const { service, bookingsRepository, invoiceService } = makeService();
+    // First call inside the day-only (hasCargo) resubmit path.
+    jest
+      .spyOn(
+        service as never as {
+          assertPersistedContainersAvailable: () => Promise<void>;
+        },
+        'assertPersistedContainersAvailable',
+      )
+      .mockRejectedValue(SENTINEL);
+
+    await expect(
+      service.completeUnderContract('c-1', 'b-1', {
+        scheduledDate: new Date().toISOString(),
+      } as never),
+    ).rejects.toBe(SENTINEL);
+
+    expect(invoiceService.cancelUnpaidInvoiceForBooking).not.toHaveBeenCalled();
+    expect(bookingsRepository.deleteContainers).not.toHaveBeenCalled();
+  });
+});
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 7e0a23e3f..441544b39 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
@@ -24,7 +24,7 @@ import { PriceLineItemDto } from '../bookings/dto/generate-price-response.dto';
 import { BookingInvoiceService } from '../bookings/booking-invoice.service';
 import { validate20ftWeightPairing } from '../bookings/container-pairing.util';
 import { TrainSchedulingGlobalRules } from '../train-scheduling/entities/train-scheduling-global-rules.entity';
-import { TrainSchedulingService } from '../train-scheduling/train-scheduling.service';
+import { TrainSchedulingService } from '../train-scheduling/services/train-scheduling.service';
 import { BookingBatchService } from '../train-scheduling/booking-batch.service';
 import { eatDay } from '../train-scheduling/batch-window.util';
 import { wagonsPerUnitForSize } from '../rule-engine/container-type.util';
@@ -98,6 +98,9 @@ export class ContractBookingService {
     private readonly containerTypesService: ContainerTypesService,
     private readonly ruleEngineService: RuleEngineService,
     private readonly milestoneService: ClearanceMilestoneService,
+    // forwardRef: part of the booking-invoice ⇄ wagon-cancellation ⇄ contracts
+    // require cycle (see BookingTransitionService).
+    @Inject(forwardRef(() => BookingInvoiceService))
     private readonly invoiceService: BookingInvoiceService,
     private readonly bookingNotifier: BookingLifecycleNotifierService,
     private readonly dataSource: DataSource,
@@ -692,11 +695,30 @@ export class ContractBookingService {
     });
 
     const freightType = contract.freightType;
-    const hasCargo =
+    let hasCargo =
       (booking.bookingContainers?.length ?? 0) > 0 ||
       Number(booking.cargoTotalWeightVgm) > 0;
     const warnings: string[] = [];
 
+    // Operations may return a booking asking for the CARGO to change (fewer or
+    // more containers), not just the day. A resubmit whose payload restates the
+    // cargo therefore starts the completion over: cancel the unpaid invoice
+    // first (it throws if money is already recorded — cargo must not change
+    // under a paid invoice), then wipe the persisted cargo so the fresh-
+    // completion path below re-persists, re-prices and re-invoices from the
+    // payload. A resubmit without cargo keeps today's day-only behavior.
+    const restatesCargo = Boolean(
+      dto.containers?.length || dto.bulkLines?.length,
+    );
+    if (hasCargo && restatesCargo) {
+      await this.invoiceService.cancelUnpaidInvoiceForBooking(booking.id);
+      await this.bookingsRepository.deleteContainers(booking.id);
+      await this.bookingsRepository.update(booking.id, {
+        cargoTotalWeightVgm: 0,
+      } as never);
+      hasCargo = false;
+    }
+
     // EXPORT rides whole or not at all (no split concept): the chosen day must
     // have a single open train that carries the whole booking. First completion
     // sizes from the dto's cargo; a changes-requested resubmit (cargo already
@@ -1863,6 +1885,9 @@ export class ContractBookingService {
   async validateShipment(
     contractId: string,
     dto: CreateBookingUnderContractDto,
+    // Completion/resubmit preview: the booking being completed must not clash
+    // with its own persisted containers.
+    excludeBookingId?: string,
   ): Promise<{
     overweightLines: Array<{
       containerTypeCode: string;
@@ -2024,6 +2049,7 @@ export class ContractBookingService {
           originYardId: route?.originYardId,
           destinationYardId: route?.destinationYardId,
         },
+        excludeBookingId,
       );
       containerClashErrors = clashes.map(
         (c) =>
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.spec.ts
index 0551cfc7a..27cfa5fa1 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.spec.ts
@@ -1,5 +1,6 @@
 import { ContractExpiryService } from './contract-expiry.service';
 import type { Contract } from './entities/contract.entity';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
 /**
  * The reminder must warn each customer once, ten days out, and must never let a
@@ -60,4 +61,18 @@ describe('ContractExpiryService — expiry reminder', () => {
     inbox.notify.mockRejectedValue(new Error('inbox down'));
     await expect(service.remindExpiringContracts()).resolves.toBeUndefined();
   });
+
+  // The sweep-failure alert is staff-facing. It used to go to every employee;
+  // it belongs to the people who would notice expired contracts still listed
+  // as active, i.e. the contract desk.
+  it('alerts the contract desk when the sweep itself fails', async () => {
+    repo.expireLapsedContracts.mockRejectedValue(new Error('deadlock'));
+
+    await service.expireLapsedContracts();
+
+    expect(inbox.notify).toHaveBeenCalledTimes(1);
+    expect(inbox.notify.mock.calls[0][0].recipients).toEqual({
+      permissionKeys: [FREIGHT_PERMS.contracts.getNotification],
+    });
+  });
 });
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.ts
index 1ef84c141..c570fbc0a 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-expiry.service.ts
@@ -4,6 +4,7 @@ import { NotificationAudience, NotificationType } from '@edr/types';
 
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
 import { ContractsRepository } from './contracts.repository';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
 /**
  * How many days before a contract lapses the customer is reminded. Mirrored by
@@ -79,7 +80,11 @@ export class ContractExpiryService {
       );
       try {
         await this.inbox.notify({
-          recipients: { allBackoffice: true },
+          // The people who would notice expired contracts still listed as
+          // active are the ones working the contract desk.
+          recipients: {
+            permissionKeys: [FREIGHT_PERMS.contracts.getNotification],
+          },
           audience: NotificationAudience.BACKOFFICE,
           type: NotificationType.GENERIC,
           title: 'Contract expiry sweep failed',
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts
index 92a313569..477724839 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts
@@ -10,7 +10,17 @@ import {
 import { Contract } from './entities/contract.entity';
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
-import { resolveCompanyNotifyPhone } from '../notifications/resolve-company-phone.util';
+import { resolveCompanyNotifyContact } from '../notifications/resolve-company-phone.util';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
+
+/**
+ * Clearance items are worked by the GL desks, which hold no intake keys — so
+ * they take their own selector rather than the contract desk's. Every override
+ * using this deep-links to a clearance or shipment-request page.
+ */
+const CLEARANCE_DESK = {
+  permissionKeys: [FREIGHT_PERMS.contracts.clearanceGetNotification],
+};
 
 /**
  * Customer + staff notifications for the contract lifecycle. Every customer
@@ -42,10 +52,11 @@ export class ContractNotifierService {
     logLabel: string,
   ): Promise<void> {
     this.logger.log(`${logLabel} — ${this.ref(c)}`);
-    const phone = c.companyId
-      ? await resolveCompanyNotifyPhone(this.dataSource, c.companyId)
-      : null;
-    const email = c.company?.email ?? c.company?.generalManagerEmail ?? null;
+    // One resolver for both channels — the company row's own email column is
+    // only set for a Fayda-verified owner (see companyNotifyEmailExpr).
+    const { phone, email } = c.companyId
+      ? await resolveCompanyNotifyContact(this.dataSource, c.companyId)
+      : { phone: null, email: null };
 
     if (phone) {
       try {
@@ -86,7 +97,11 @@ export class ContractNotifierService {
     });
   }
 
-  /** Persist + push an in-app item to every backoffice staff user. */
+  /**
+   * Persist + push an in-app item to the contract desk — staff holding
+   * `contracts:get_notification`. Callers whose item belongs to a different
+   * desk override `recipients` (see {@link CLEARANCE_DESK}).
+   */
   private inAppStaff(
     c: Contract,
     title: string,
@@ -94,7 +109,7 @@ export class ContractNotifierService {
     overrides: Partial<NotifyInput> = {},
   ): void {
     void this.inbox.notify({
-      recipients: { allBackoffice: true },
+      recipients: { permissionKeys: [FREIGHT_PERMS.contracts.getNotification] },
       audience: NotificationAudience.BACKOFFICE,
       type: NotificationType.REQUEST_SUBMITTED,
       title,
@@ -230,6 +245,7 @@ export class ContractNotifierService {
       `the customs declaration can be filed.${note ? ` Note: "${note}"` : ''}`;
     this.logger.log(`TRANSIT ASSIGNEE REQUESTED — ${c.reference}`);
     this.inAppStaff(c, `Transit assignee needed — ${c.reference}`, msg, {
+      recipients: CLEARANCE_DESK,
       type: NotificationType.CLEARANCE_REVIEW,
       link: `/dashboard/gl-djibouti/clearance/${c.id}`,
     });
@@ -248,6 +264,7 @@ export class ContractNotifierService {
         `The customs declaration can now be filed.`;
     this.logger.log(`TRANSIT ASSIGNEE ASSIGNED — ${c.reference}`);
     this.inAppStaff(c, `Transit assignee set — ${c.reference}`, msg, {
+      recipients: CLEARANCE_DESK,
       type: NotificationType.CLEARANCE_REVIEW,
       link: `/dashboard/contracts/clearance/${c.id}`,
     });
@@ -264,6 +281,7 @@ export class ContractNotifierService {
       `"${note}". Review and re-advise the amount on the clearance page.`;
     this.logger.log(`DUTY DISPUTED — ${c.reference}`);
     this.inAppStaff(c, `Duty disputed on ${c.reference}`, msg, {
+      recipients: CLEARANCE_DESK,
       type: NotificationType.CLEARANCE_REVIEW,
       link: `/dashboard/contracts/clearance/${c.id}`,
     });
@@ -321,6 +339,7 @@ export class ContractNotifierService {
       'Clearance documents uploaded',
       `Customer uploaded clearance documents for contract ${this.ref(c)} — review them in the clearance queue.`,
       {
+        recipients: CLEARANCE_DESK,
         type: NotificationType.CLEARANCE_REVIEW,
         link: `/dashboard/contracts/clearance/${c.id}`,
       },
@@ -334,6 +353,7 @@ export class ContractNotifierService {
       'Duty slip uploaded',
       `Customer uploaded the duty & tax payment slip for contract ${this.ref(c)}.`,
       {
+        recipients: CLEARANCE_DESK,
         type: NotificationType.PAYMENT_RECEIVED,
         link: `/dashboard/contracts/clearance/${c.id}`,
       },
@@ -347,6 +367,9 @@ export class ContractNotifierService {
       'New shipment request',
       `Shipment request ${requestRef} was filed under contract ${this.ref(c)} and awaits GL review.`,
       {
+        // GL reviews these, and the shipment-requests page is gated on
+        // contracts:create_booking — a key only the GL Ethiopia preset holds.
+        recipients: CLEARANCE_DESK,
         link: `/dashboard/shipment-requests/${requestId}`,
         data: { contractId: c.id, requestId, reference: requestRef },
       },
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-onetime-paid-gate.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-onetime-paid-gate.spec.ts
new file mode 100644
index 000000000..0b2a16026
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/contracts/contract-onetime-paid-gate.spec.ts
@@ -0,0 +1,38 @@
+import { ContractsRepository } from './contracts.repository';
+
+/**
+ * A ONE_TIME contract stops blocking a duplicate request only once its booking
+ * is PAID. The existing duplicate-guard spec stubs the repository out, so the
+ * candidate SQL itself is unchecked there — this pins the predicate.
+ */
+describe('findDuplicateCandidates ONE_TIME paid gate', () => {
+  const candidateSql = (): string => {
+    const conditions: string[] = [];
+    const qb = {
+      leftJoinAndSelect: () => qb,
+      where: () => qb,
+      andWhere: (condition: string) => {
+        if (typeof condition === 'string') conditions.push(condition);
+        return qb;
+      },
+      getMany: async () => [],
+    };
+
+    const repository = new ContractsRepository(
+      { createQueryBuilder: () => qb } as never,
+      {} as never,
+    );
+
+    void repository.findDuplicateCandidates('company-1', 'svc-1');
+    return conditions.join(' AND ');
+  };
+
+  it('spends the contract on payment, not on the booking row existing', () => {
+    const sql = candidateSql();
+
+    expect(sql).toContain("contract.contract_kind <> 'ONE_TIME'");
+    // The gate: an unpaid booking must NOT free the lane.
+    expect(sql).toContain("b.payment_status = 'PAID'");
+    expect(sql).toContain('b.deleted_at IS NULL');
+  });
+});
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 0a073c9f8..ba3e3fd8b 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
@@ -424,6 +424,8 @@ export class ContractTransitionService {
       contract.tradeDirection,
       contract.freightType,
       contract.customsClearingEnabled,
+      // Bulk templates are keyed by the contract's cargo type.
+      (contract.cargoScope ?? []).find((c) => c.cargoTypeId)?.cargoTypeId,
     );
     if (!active) return null;
     return {
diff --git a/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts b/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts
index ec61fdd4a..0ff9b7c24 100644
--- a/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts
@@ -14,12 +14,10 @@ import {
   UnauthorizedException,
   UploadedFiles,
   UploadedFile,
-  UseGuards,
   UseInterceptors,
 } from '@nestjs/common';
 import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
-import { JwtGuard } from '@tria-plc/api-common/modules/auth/services/jwt.guard';
 import { AnyFilesInterceptor, FileInterceptor } from '@nestjs/platform-express';
 import type { Response } from 'express';
 import {
@@ -32,7 +30,7 @@ import {
 } from '@nestjs/swagger';
 
 import { actorLabel } from '../warehouses/current-actor.util';
-import { BookingStaff } from '../../common/booking-guards';
+import { BookingStaff, MixedAudience, PortalCustomer } from '../../common/booking-guards';
 import { ContractDocumentHistoryService } from './contract-document-history.service';
 import {
   FREIGHT_PERMS,
@@ -127,6 +125,7 @@ export class ContractsController {
   }
 
   @Get('booking-requests/:reqId')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'A single shipment request' })
   getBookingRequest(@Param('reqId', ParseUUIDPipe) reqId: string) {
     return this.bookingRequestService.findOne(reqId);
@@ -159,6 +158,7 @@ export class ContractsController {
   }
 
   @Post('booking-requests/:reqId/cancel')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Customer cancels their own pending shipment request' })
   cancelBookingRequest(
     @Param('reqId', ParseUUIDPipe) reqId: string,
@@ -168,6 +168,7 @@ export class ContractsController {
   }
 
   @Post(':id/booking-requests')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Customer submits a shipment request on a GENERAL customs contract' })
   submitBookingRequest(
     @Param('id', ParseUUIDPipe) id: string,
@@ -178,12 +179,14 @@ export class ContractsController {
   }
 
   @Get(':id/booking-requests')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'List the shipment requests on a contract' })
   listBookingRequests(@Param('id', ParseUUIDPipe) id: string) {
     return this.bookingRequestService.listForContract(id);
   }
 
   @Post()
+  @MixedAudience([])
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Create a new contract (DRAFT) with routes + cargo scope' })
@@ -203,6 +206,7 @@ export class ContractsController {
   }
 
   @Get()
+  @MixedAudience([])
   @ApiOperation({ summary: 'List contracts (paginated)' })
   async findAll(
     @Query() filter: FilterContractDto,
@@ -247,6 +251,7 @@ export class ContractsController {
   }
 
   @Get('my')
+  @PortalCustomer()
   @ApiOperation({ summary: "List the current customer's contracts" })
   async findMy(
     @CurrentUser() user: AuthUserPayload,
@@ -301,6 +306,7 @@ export class ContractsController {
   }
 
   @Get(':id')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'Get contract by ID (routes, cargo scope, unit rates)' })
   async findOne(
     @Param('id', ParseUUIDPipe) id: string,
@@ -319,6 +325,7 @@ export class ContractsController {
   }
 
   @Patch(':id')
+  @MixedAudience([])
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes('multipart/form-data')
   @ApiOperation({
@@ -337,6 +344,7 @@ export class ContractsController {
   }
 
   @Delete(':id')
+  @MixedAudience([])
   @HttpCode(204)
   @ApiOperation({ summary: 'Soft-delete DRAFT contract' })
   remove(@Param('id', ParseUUIDPipe) id: string) {
@@ -344,6 +352,7 @@ export class ContractsController {
   }
 
   @Post(':id/documents')
+  @MixedAudience([])
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Upload intake documents for a contract (DRAFT only)' })
@@ -355,18 +364,21 @@ export class ContractsController {
   }
 
   @Post(':id/generate-price')
+  @MixedAudience([])
   @ApiOperation({ summary: 'Generate unit-rate breakdown (no totals at contract phase)' })
   generatePrice(@Param('id', ParseUUIDPipe) id: string) {
     return this.pricingService.generatePrice(id);
   }
 
   @Post(':id/submit')
+  @MixedAudience([])
   @ApiOperation({ summary: 'Customer submit contract (freezes contract_rate_snapshots)' })
   submit(@Param('id', ParseUUIDPipe) id: string) {
     return this.transitionService.submit(id);
   }
 
   @Post(':id/confirm-submit')
+  @MixedAudience([])
   @ApiOperation({ summary: 'Confirm submit after a price change' })
   confirmSubmit(@Param('id', ParseUUIDPipe) id: string) {
     return this.transitionService.confirmSubmit(id);
@@ -427,10 +439,7 @@ export class ContractsController {
   // real boundary: it admits only the approver whose step is currently pending
   // (edit rights hand off down the chain on each approval).
   @Put(':id/document/articles')
-  @BookingStaff([
-    FREIGHT_PERMS.contracts.view,
-    ...bothFreightTypes(FREIGHT_PERMS.contracts.staffAccept),
-  ])
+  @BookingStaff(FREIGHT_PERMS.contracts.editDocument)
   @ApiOperation({
     summary:
       'Edit this contract\'s document articles only (per-contract; never touches the six shared templates)',
@@ -515,6 +524,7 @@ export class ContractsController {
   }
 
   @Post(':id/cancel')
+  @PortalCustomer()
   @ApiOperation({
     summary: 'Customer cancels their own contract (blocked while a booking is live)',
   })
@@ -591,6 +601,7 @@ export class ContractsController {
   }
 
   @Get(':id/contract/view')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'Contract PDF view-model + rendered HTML for signing' })
   async getContractView(
     @Param('id', ParseUUIDPipe) id: string,
@@ -630,6 +641,7 @@ export class ContractsController {
   }
 
   @Get(':id/contract/document')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'Download contract PDF' })
   async downloadContractDocument(
     @Param('id', ParseUUIDPipe) id: string,
@@ -653,7 +665,7 @@ export class ContractsController {
   }
 
   @Post(':id/contract/send-signing-otp')
-  @UseGuards(JwtGuard)
+  @MixedAudience(bothFreightTypes(FREIGHT_PERMS.contracts.signStaff))
   @ApiOperation({
     summary:
       "Send the sudo-mode signing OTP to the contract company's registered phone (server picks the number)",
@@ -666,7 +678,7 @@ export class ContractsController {
   }
 
   @Post(':id/contract/sign')
-  @UseGuards(JwtGuard)
+  @MixedAudience(bothFreightTypes(FREIGHT_PERMS.contracts.signStaff))
   @ApiOperation({ summary: 'Apply digital signature (customer or staff/director/ceo)' })
   async signContract(
     @Param('id', ParseUUIDPipe) id: string,
@@ -691,6 +703,7 @@ export class ContractsController {
   }
 
   @Post(':id/renew')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Create a renewal draft linked via renewalOfId' })
   async renew(
     @Param('id', ParseUUIDPipe) id: string,
@@ -712,12 +725,14 @@ export class ContractsController {
   // ── Pre-booking clearance (Path B, doc §15.2.1) ────────────────────────────
 
   @Get(':id/clearance')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'Pre-booking clearance document grid on the contract' })
   getClearance(@Param('id', ParseUUIDPipe) id: string) {
     return this.clearanceService.getClearanceView(id);
   }
 
   @Post(':id/clearance/documents')
+  @PortalCustomer()
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Customer uploads clearance documents (fieldname = document key)' })
@@ -901,6 +916,7 @@ export class ContractsController {
   }
 
   @Post(':id/clearance/duty/dispute')
+  @PortalCustomer()
   @ApiOperation({
     summary:
       'Customer disputes the advised duty/tax with a reason — reopens the step so GL Ethiopia can re-advise (repeatable)',
@@ -914,6 +930,7 @@ export class ContractsController {
   }
 
   @Post(':id/clearance/duty-slip')
+  @PortalCustomer()
   @UseInterceptors(FileInterceptor('file'))
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Customer uploads duty/tax payment slip on contract' })
@@ -1057,15 +1074,23 @@ export class ContractsController {
   // ── Booking under contract (Path A customer / Path B GL ET) ────────────────
 
   @Post(':id/bookings')
+  // Path A is a customer flow — both audiences must reach the service, whose
+  // assertGate decides per role. Staff still need contracts:create_booking.
+  @MixedAudience(FREIGHT_PERMS.contracts.createBooking)
   @ApiOperation({
     summary:
       'Create a shipment booking under a contract — Path A (customer) or Path B (GL Ethiopia).',
   })
-  createBooking(
+  async createBooking(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() dto: CreateBookingUnderContractDto,
-    @CurrentUser() user: AuthUserPayload,
+    @CurrentUser() user: TCurrentUser & { sub?: string },
   ) {
+    // Customer callers may only book on their own contract.
+    if (!hasFreightPermission(user, FREIGHT_PERMS.contracts.createBooking)) {
+      const contract = await this.contractsService.findById(id);
+      await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
+    }
     // The service decides the execution path from the contract:
     //   Path A (customs disabled) → customer/staff create; status checks apply.
     //   Path B (customs enabled)  → GL Ethiopia only, once clearance is ready.
@@ -1078,15 +1103,25 @@ export class ContractsController {
   }
 
   @Post(':id/bookings/initiate')
+  // Customer initiates their own ONE_TIME instance; GL initiates on customs
+  // contracts — the service's assertGate decides per role, so both audiences
+  // must reach it. Staff still need contracts:create_booking.
+  @MixedAudience(FREIGHT_PERMS.contracts.createBooking)
   @ApiOperation({
     summary:
       'Initiate a bare booking instance under an import/export contract (ONE_TIME or GENERAL) — no cargo, no date; enters per-booking clearance (AWAITING_DOCUMENTS). ONE_TIME customs instances are opened by the customer (or GL); GENERAL customs comes from a shipment request.',
   })
-  initiateBooking(
+  async initiateBooking(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() dto: CreateBookingUnderContractDto,
-    @CurrentUser() user: AuthUserPayload,
+    @CurrentUser() user: TCurrentUser & { sub?: string },
   ) {
+    // Customer callers may only initiate on their own contract; the service's
+    // assertGate then decides what a customer may do on it.
+    if (!hasFreightPermission(user, FREIGHT_PERMS.contracts.createBooking)) {
+      const contract = await this.contractsService.findById(id);
+      await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
+    }
     return this.contractBookingService.initiateUnderContract(
       id,
       { contractRouteId: dto?.contractRouteId },
@@ -1096,16 +1131,24 @@ export class ContractsController {
   }
 
   @Post(':id/bookings/:bookingId/complete')
+  // Customers complete their own initiated (non-customs) instances; the
+  // service keeps customs completion GL-only via the actor's permissions.
+  @MixedAudience(FREIGHT_PERMS.contracts.createBooking)
   @ApiOperation({
     summary:
       'Complete an initiated booking after Operations finalized its clearance — cargo + binding day, window and departure checks, pricing and invoicing.',
   })
-  completeBooking(
+  async completeBooking(
     @Param('id', ParseUUIDPipe) id: string,
     @Param('bookingId', ParseUUIDPipe) bookingId: string,
     @Body() dto: CreateBookingUnderContractDto,
-    @CurrentUser() user: AuthUserPayload,
+    @CurrentUser() user: TCurrentUser & { sub?: string },
   ) {
+    // Customer callers may only complete bookings on their own contract.
+    if (!hasFreightPermission(user, FREIGHT_PERMS.contracts.createBooking)) {
+      const contract = await this.contractsService.findById(id);
+      await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
+    }
     // Customs (Path B) instances may only be completed by GL Ethiopia — the
     // service checks the actor's contracts:create_booking permission.
     return this.contractBookingService.completeUnderContract(
@@ -1117,6 +1160,7 @@ export class ContractsController {
   }
 
   @Post(':id/validate-shipment')
+  @MixedAudience([FREIGHT_PERMS.contracts.createBooking, FREIGHT_PERMS.contracts.view])
   @ApiOperation({
     summary:
       'Pre-create validation + authoritative price preview: full booking price breakdown (rail, first/last mile, surcharges), overweight lines and 20ft weight-pairing errors for a shipment payload (no booking created).',
@@ -1124,11 +1168,15 @@ export class ContractsController {
   validateShipment(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() dto: CreateBookingUnderContractDto,
+    // Completion/resubmit preview: exclude this booking's own persisted
+    // containers from the same-train clash check.
+    @Query('bookingId') bookingId?: string,
   ) {
-    return this.contractBookingService.validateShipment(id, dto);
+    return this.contractBookingService.validateShipment(id, dto, bookingId);
   }
 
   @Get(':id/capacity')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({
     summary:
       'Remaining bookable quantity per cargo line (GENERAL draw-down cap, or the outstanding remainder of a split ONE_TIME contract)',
@@ -1141,12 +1189,14 @@ export class ContractsController {
   // ── Clearance milestones (doc §11.3, §12.2) ────────────────────────────────
 
   @Get(':id/milestones')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'Pre-booking clearance milestones for a contract cycle' })
   listContractMilestones(@Param('id', ParseUUIDPipe) id: string) {
     return this.milestoneService.listForContract(id);
   }
 
   @Get('bookings/:bookingId/milestones')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'Post-booking clearance milestones for a shipment booking' })
   listBookingMilestones(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.milestoneService.listForBooking(bookingId);
@@ -1280,7 +1330,7 @@ export class ContractsController {
   }
 
   @Post('bookings/:bookingId/final-invoice')
-  @BookingStaff(FREIGHT_PERMS.contracts.clearanceDjActions)
+  @BookingStaff(FREIGHT_PERMS.contracts.finalInvoiceRaise)
   @UseInterceptors(FileInterceptor('file'))
   @ApiConsumes('multipart/form-data')
   @ApiOperation({
@@ -1307,6 +1357,7 @@ export class ContractsController {
   }
 
   @Post('bookings/:bookingId/final-invoice/approve')
+  @PortalCustomer()
   @ApiOperation({
     summary: 'Customer approves the drafted final invoice — unlocks the payment slip',
   })
@@ -1321,6 +1372,7 @@ export class ContractsController {
   }
 
   @Post('bookings/:bookingId/final-invoice-slip')
+  @PortalCustomer()
   @UseInterceptors(FileInterceptor('file'))
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Customer attaches the payment slip for the final invoice' })
@@ -1332,10 +1384,7 @@ export class ContractsController {
   }
 
   @Post('bookings/:bookingId/final-invoice/confirm')
-  @BookingStaff([
-    FREIGHT_PERMS.contracts.clearanceDjActions,
-    FREIGHT_PERMS.contracts.clearanceEtActions,
-  ])
+  @BookingStaff(FREIGHT_PERMS.contracts.finalInvoiceConfirm)
   @ApiOperation({ summary: 'GL (ET or DJ) confirms the payment slip — settles the final invoice' })
   confirmFinalInvoicePaid(
     @Param('bookingId', ParseUUIDPipe) bookingId: string,
@@ -1378,6 +1427,7 @@ export class ContractsController {
   }
 
   @Post('bookings/:bookingId/second-duty-slip')
+  @PortalCustomer()
   @UseInterceptors(FileInterceptor('file'))
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Customer attaches the additional duty/tax payment slip' })
@@ -1403,6 +1453,7 @@ export class ContractsController {
   }
 
   @Post('bookings/:bookingId/duty-slip')
+  @PortalCustomer()
   @UseInterceptors(AnyFilesInterceptor())
   @ApiConsumes('multipart/form-data')
   @ApiOperation({ summary: 'Customer uploads the duty/tax payment slip' })
@@ -1419,6 +1470,7 @@ export class ContractsController {
   }
 
   @Get('bookings/:bookingId/incidents')
+  @MixedAudience(FREIGHT_PERMS.contracts.view)
   @ApiOperation({ summary: 'List cargo exception/damage reports for a shipment' })
   listIncidents(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.glOperationsService.listIncidents(bookingId);
diff --git a/apps/edr-freight-api/src/modules/contracts/contracts.repository.ts b/apps/edr-freight-api/src/modules/contracts/contracts.repository.ts
index a7fddd816..2ab7e3d7e 100644
--- a/apps/edr-freight-api/src/modules/contracts/contracts.repository.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contracts.repository.ts
@@ -104,15 +104,19 @@ export class ContractsRepository extends BaseRepository<Contract> {
       .andWhere('contract.status NOT IN (:...terminal)', {
         terminal: TERMINAL_CONTRACT_STATUSES,
       })
-      // A ONE_TIME contract allows a single booking, so once that booking
-      // exists the contract is spent and can never carry another shipment.
+      // A ONE_TIME contract allows a single booking, so once that booking is
+      // PAID the contract is spent and can never carry another shipment.
       // Without this it kept blocking new requests on the same service type +
       // route until its validity lapsed — locking a customer out of a lane for
       // the rest of the term after one completed shipment.
+      // Payment is the gate, not the booking row: a DRAFT or abandoned unpaid
+      // booking must keep the contract blocking, otherwise a customer holds an
+      // unpaid booking and requests an identical contract alongside it.
       .andWhere(
         `(contract.contract_kind <> 'ONE_TIME' OR NOT EXISTS (
             SELECT 1 FROM freight.bookings b
              WHERE b.contract_id = contract.id AND b.deleted_at IS NULL
+               AND b.payment_status = 'PAID'
          ))`,
       )
       .getMany();
diff --git a/apps/edr-freight-api/src/modules/demo-permissions/demo-permissions.controller.ts b/apps/edr-freight-api/src/modules/demo-permissions/demo-permissions.controller.ts
deleted file mode 100644
index 6f425e1bb..000000000
--- a/apps/edr-freight-api/src/modules/demo-permissions/demo-permissions.controller.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Controller, Get, UseGuards } from "@nestjs/common";
-import { ApiOperation, ApiTags } from "@nestjs/swagger";
-
-import { PermissionGuard } from "@tria-plc/api-common/modules/auth/services/permission.guard";
-
-@ApiTags("demo-permissions")
-@Controller()
-export class DemoPermissionsController {
-  @Get("test_user1")
-  @ApiOperation({ summary: "Permission demo (can:demo:user1)" })
-  @UseGuards(PermissionGuard(["can:demo:user1"]))
-  testUser1() {
-    return { ok: true, permission: "can:demo:user1" };
-  }
-
-  @Get("test_user2")
-  @ApiOperation({ summary: "Permission demo (can:demo:user2)" })
-  @UseGuards(PermissionGuard(["can:demo:user2"]))
-  testUser2() {
-    return { ok: true, permission: "can:demo:user2" };
-  }
-}
diff --git a/apps/edr-freight-api/src/modules/demo-permissions/demo-permissions.module.ts b/apps/edr-freight-api/src/modules/demo-permissions/demo-permissions.module.ts
deleted file mode 100644
index db73ed728..000000000
--- a/apps/edr-freight-api/src/modules/demo-permissions/demo-permissions.module.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Module } from "@nestjs/common";
-
-import { DemoPermissionsController } from "./demo-permissions.controller";
-
-@Module({
-  controllers: [DemoPermissionsController],
-})
-export class DemoPermissionsModule {}
diff --git a/apps/edr-freight-api/src/modules/drivers/drivers.controller.ts b/apps/edr-freight-api/src/modules/drivers/drivers.controller.ts
index e5b6ae146..8d2be55df 100644
--- a/apps/edr-freight-api/src/modules/drivers/drivers.controller.ts
+++ b/apps/edr-freight-api/src/modules/drivers/drivers.controller.ts
@@ -24,7 +24,14 @@ import { FleetHistoryService } from '../fleet-history/fleet-history.service';
 @ApiTags('drivers')
 @ApiBearerAuth()
 @Controller('drivers')
-@BookingStaff(FREIGHT_PERMS.drivers.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.drivers.view,
+  FREIGHT_PERMS.drivers.create,
+  FREIGHT_PERMS.drivers.update,
+  FREIGHT_PERMS.drivers.delete,
+])
 export class DriversController {
   constructor(
     private readonly driversService: DriversService,
diff --git a/apps/edr-freight-api/src/modules/dropdown-settings/dropdown-settings.controller.ts b/apps/edr-freight-api/src/modules/dropdown-settings/dropdown-settings.controller.ts
index aad904557..aaf552f40 100644
--- a/apps/edr-freight-api/src/modules/dropdown-settings/dropdown-settings.controller.ts
+++ b/apps/edr-freight-api/src/modules/dropdown-settings/dropdown-settings.controller.ts
@@ -14,7 +14,8 @@ import {
 } from "@nestjs/common";
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 
-import { FreightAdmin } from "../../common/booking-guards";
+import { BookingStaff } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { CreateDropdownOptionDto } from "./dto/create-dropdown-option.dto";
 import { CreateDropdownSettingDto } from "./dto/create-dropdown-setting.dto";
 import { ListDropdownSettingsQueryDto } from "./dto/list-dropdown-settings-query.dto";
@@ -58,14 +59,14 @@ export class DropdownSettingsController {
   }
 
   @Post()
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.dropdown.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Create a new dropdown setting" })
   create(@Body() dto: CreateDropdownSettingDto) {
     return this.service.create(dto);
   }
 
   @Patch(":id")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.dropdown.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Update a dropdown setting's metadata" })
   update(
     @Param("id", ParseUUIDPipe) id: string,
@@ -75,7 +76,7 @@ export class DropdownSettingsController {
   }
 
   @Delete(":id")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.dropdown.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Soft-delete a dropdown setting" })
   @HttpCode(HttpStatus.NO_CONTENT)
   remove(@Param("id", ParseUUIDPipe) id: string) {
@@ -85,7 +86,7 @@ export class DropdownSettingsController {
   /* ------------------------- option routes ------------------------- */
 
   @Put(":id/options")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.dropdown.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Replace the full option list for a setting" })
   replaceOptions(
     @Param("id", ParseUUIDPipe) id: string,
@@ -95,7 +96,7 @@ export class DropdownSettingsController {
   }
 
   @Post(":id/options")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.dropdown.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Append a single option to a setting" })
   addOption(
     @Param("id", ParseUUIDPipe) id: string,
@@ -105,7 +106,7 @@ export class DropdownSettingsController {
   }
 
   @Patch("options/:optionId")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.dropdown.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Update a single option" })
   updateOption(
     @Param("optionId", ParseUUIDPipe) optionId: string,
@@ -115,7 +116,7 @@ export class DropdownSettingsController {
   }
 
   @Delete("options/:optionId")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.dropdown.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Soft-delete a single option" })
   @HttpCode(HttpStatus.NO_CONTENT)
   removeOption(@Param("optionId", ParseUUIDPipe) optionId: string) {
diff --git a/apps/edr-freight-api/src/modules/eims/dto/resolve-eims-registration.dto.ts b/apps/edr-freight-api/src/modules/eims/dto/resolve-eims-registration.dto.ts
new file mode 100644
index 000000000..66896fd18
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/dto/resolve-eims-registration.dto.ts
@@ -0,0 +1,25 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsBoolean, IsOptional, IsString, Length } from "class-validator";
+
+/**
+ * Manual reconciliation of a submission that was never acknowledged. Exactly one of the two is
+ * meaningful: supply the IRN confirmed with MoR, or discard the attempt.
+ */
+export class ResolveEimsRegistrationDto {
+  @ApiPropertyOptional({
+    description: "IRN confirmed in the MoR portal. Records the registration and resumes the chain.",
+    example: "9fe9bbbece6ab76c112b617534e6aac7aa8b819d5be79f4d3d088ed2e887b2e0",
+  })
+  @IsOptional()
+  @IsString()
+  @Length(1, 64)
+  irn?: string;
+
+  @ApiPropertyOptional({
+    description: "Abandon the submission: the invoice is marked FAILED and the chain is unchanged.",
+    example: true,
+  })
+  @IsOptional()
+  @IsBoolean()
+  discard?: boolean;
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-auth.service.spec.ts b/apps/edr-freight-api/src/modules/eims/eims-auth.service.spec.ts
new file mode 100644
index 000000000..1bed1fe29
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-auth.service.spec.ts
@@ -0,0 +1,256 @@
+import { HttpService } from "@nestjs/axios";
+import { ConfigService } from "@nestjs/config";
+import { AxiosError, AxiosHeaders } from "axios";
+import { of, throwError } from "rxjs";
+import { EimsConfig } from "../../config/eims.config";
+import { eimsConfig, eimsToken } from "./eims-test-fixtures";
+import { EimsAuthService } from "./eims-auth.service";
+import { EimsSignerService } from "./eims-signer.service";
+
+const CLIENT_SECRET = "super-secret-value";
+const API_KEY = "super-secret-apikey";
+
+const cfg = (over: Partial<EimsConfig> = {}): EimsConfig => eimsConfig(over);
+
+const TOKEN_1 = eimsToken({ jti: "one" });
+const TOKEN_2 = eimsToken({ jti: "two" });
+
+const loginBody = (accessToken: string, expiresIn = 3600) => ({
+  data: { accessToken, refreshToken: "refresh-1", encryptionKey: null, expiresIn },
+  status: "SUCCESS",
+});
+
+/** Stub signer: the real signing path has its own spec and needs no key material here. */
+const signer = {
+  signRequest: <T>(request: T) => ({ request, signature: "SIGNATURE", certificate: "CERTIFICATE" }),
+} as unknown as EimsSignerService;
+
+const build = (post: jest.Mock, config: EimsConfig = cfg()) =>
+  new EimsAuthService(
+    { post } as unknown as HttpService,
+    { get: () => config } as unknown as ConfigService,
+    signer,
+  );
+
+const axiosErr = (status: number, data: unknown) =>
+  new AxiosError("Request failed", undefined, undefined, undefined, {
+    status,
+    statusText: "",
+    data,
+    headers: new AxiosHeaders(),
+    config: { headers: new AxiosHeaders() },
+  });
+
+describe("EimsAuthService.getValidAccessToken", () => {
+  it("posts the signed login envelope to /auth/login with no Authorization header", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(TOKEN_1) }));
+
+    await build(post).getValidAccessToken();
+
+    expect(post).toHaveBeenCalledTimes(1);
+    const [url, body, options] = post.mock.calls[0];
+    expect(url).toBe("https://core.mor.gov.et/auth/login");
+    expect(options.headers).toEqual({ "Content-Type": "application/json" });
+    expect(options.headers.Authorization).toBeUndefined();
+
+    expect(typeof body).toBe("string");
+    expect(JSON.parse(body)).toEqual({
+      request: { clientId: "cid", clientSecret: CLIENT_SECRET, apikey: API_KEY, tin: "0000034558" },
+      signature: "SIGNATURE",
+      certificate: "CERTIFICATE",
+    });
+  });
+
+  it("returns the access token from data.accessToken", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(TOKEN_1) }));
+    await expect(build(post).getValidAccessToken()).resolves.toBe(TOKEN_1);
+  });
+
+  it("reuses a cached token instead of logging in again", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(TOKEN_1) }));
+    const auth = build(post);
+
+    await auth.getValidAccessToken();
+    await expect(auth.getValidAccessToken()).resolves.toBe(TOKEN_1);
+    expect(post).toHaveBeenCalledTimes(1);
+  });
+
+  it("re-authenticates a skew-window before the token actually expires", async () => {
+    const post = jest
+      .fn()
+      .mockReturnValueOnce(of({ data: loginBody(TOKEN_1, 100) })) // 100s ttl, 45s skew ⇒ usable 55s
+      .mockReturnValueOnce(of({ data: loginBody(TOKEN_2) }));
+    const auth = build(post);
+    const start = Date.now();
+    const clock = jest.spyOn(Date, "now");
+
+    try {
+      clock.mockReturnValue(start);
+      await expect(auth.getValidAccessToken()).resolves.toBe(TOKEN_1);
+
+      clock.mockReturnValue(start + 50_000); // inside the window: still cached
+      await expect(auth.getValidAccessToken()).resolves.toBe(TOKEN_1);
+      expect(post).toHaveBeenCalledTimes(1);
+
+      clock.mockReturnValue(start + 56_000); // past ttl-minus-skew, before the real 100s expiry
+      await expect(auth.getValidAccessToken()).resolves.toBe(TOKEN_2);
+      expect(post).toHaveBeenCalledTimes(2);
+    } finally {
+      clock.mockRestore();
+    }
+  });
+
+  it("logs in again after invalidate()", async () => {
+    const post = jest
+      .fn()
+      .mockReturnValueOnce(of({ data: loginBody(TOKEN_1) }))
+      .mockReturnValueOnce(of({ data: loginBody(TOKEN_2) }));
+    const auth = build(post);
+
+    await auth.getValidAccessToken();
+    auth.invalidate();
+    await expect(auth.getValidAccessToken()).resolves.toBe(TOKEN_2);
+    expect(post).toHaveBeenCalledTimes(2);
+  });
+
+  it("performs exactly one login for many concurrent callers", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(TOKEN_1) }));
+    const auth = build(post);
+
+    const tokens = await Promise.all(Array.from({ length: 20 }, () => auth.getValidAccessToken()));
+
+    expect(post).toHaveBeenCalledTimes(1);
+    expect(new Set(tokens)).toEqual(new Set([TOKEN_1]));
+  });
+
+  it("does not put the access token in its own log line", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(TOKEN_1) }));
+    const logged: string[] = [];
+    const auth = build(post);
+    jest
+      .spyOn(auth["logger"], "log")
+      .mockImplementation((message: unknown) => void logged.push(String(message)));
+
+    await auth.getValidAccessToken();
+
+    expect(logged.join("\n")).not.toContain(TOKEN_1);
+    expect(logged.join("\n")).toContain("B0360154BA");
+  });
+
+  it("refuses to call the gateway when EIMS is disabled", async () => {
+    const post = jest.fn();
+    await expect(build(post, cfg({ enabled: false })).getValidAccessToken()).rejects.toThrow(
+      /EIMS integration is disabled/,
+    );
+    expect(post).not.toHaveBeenCalled();
+  });
+
+  it("rejects a 200 response that carries no access token", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: { data: {}, status: "SUCCESS" } }));
+    await expect(build(post).getValidAccessToken()).rejects.toThrow(/returned no accessToken/);
+  });
+
+  it("surfaces gateway errors without leaking credentials or the envelope", async () => {
+    const post = jest.fn().mockReturnValue(
+      throwError(() =>
+        axiosErr(401, {
+          message: "GATEWAY ERROR",
+          statusCode: 401,
+          code: "4400",
+          details: [{ errorMessage: "Invalid Credentials" }],
+          // Fields the gateway must never echo back into our logs or exceptions:
+          signature: "SIGNATURE",
+          certificate: "CERTIFICATE",
+          accessToken: "leaked-token",
+        }),
+      ),
+    );
+
+    const error = (await build(post)
+      .getValidAccessToken()
+      .catch((e: Error) => e)) as Error & { response?: unknown };
+    const serialized = JSON.stringify({ message: error.message, response: error.response });
+
+    expect(error.message).toContain("EIMS login failed (401)");
+    expect(error.message).toContain("Invalid Credentials");
+    for (const secret of [CLIENT_SECRET, API_KEY, "SIGNATURE", "CERTIFICATE", "leaked-token"]) {
+      expect(serialized).not.toContain(secret);
+    }
+  });
+
+  it("maps a timeout to a TIMEOUT failure without a status", async () => {
+    const timeout = new AxiosError("timeout of 30000ms exceeded", "ECONNABORTED");
+    const post = jest.fn().mockReturnValue(throwError(() => timeout));
+
+    await expect(build(post).getValidAccessToken()).rejects.toThrow(/EIMS login timed out/);
+  });
+
+  it("maps an unreachable gateway to a NETWORK failure", async () => {
+    const refused = new AxiosError("connect ECONNREFUSED", "ECONNREFUSED");
+    const post = jest.fn().mockReturnValue(throwError(() => refused));
+
+    await expect(build(post).getValidAccessToken()).rejects.toThrow(/could not reach the gateway/);
+  });
+});
+
+describe("EimsAuthService.getSessionContext", () => {
+  it("takes the source system from the token's claims", async () => {
+    const post = jest
+      .fn()
+      .mockReturnValue(
+        of({ data: loginBody(eimsToken({ systemNumber: "FROM-TOKEN", systemType: "POS" })) }),
+      );
+
+    // Env deliberately left empty: with nothing to check against, the token is simply believed.
+    await expect(
+      build(post, cfg({ systemNumber: "", systemType: "" })).getSessionContext(),
+    ).resolves.toEqual({ systemNumber: "FROM-TOKEN", systemType: "POS" });
+  });
+
+  it("serves the session from the cached login rather than re-authenticating", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(TOKEN_1) }));
+    const auth = build(post);
+
+    await auth.getSessionContext();
+    await expect(auth.getSessionContext()).resolves.toEqual({
+      systemNumber: "B0360154BA",
+      systemType: "SYS",
+    });
+    expect(post).toHaveBeenCalledTimes(1);
+  });
+
+  it.each(["systemNumber", "systemType"])("rejects a token with no %s claim", async (claim) => {
+    const post = jest
+      .fn()
+      .mockReturnValue(of({ data: loginBody(eimsToken({ [claim]: undefined })) }));
+
+    await expect(
+      build(post, cfg({ systemNumber: "", systemType: "" })).getSessionContext(),
+    ).rejects.toThrow(new RegExp(`no ${claim} claim`));
+  });
+
+  it("rejects an access token that is not a decodable JWT", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody("not-a-jwt") }));
+
+    await expect(build(post).getSessionContext()).rejects.toThrow(/not a JWT/);
+  });
+
+  it.each([
+    ["systemNumber", { systemNumber: "SOMETHING-ELSE" }, /EIMS_SYSTEM_NUMBER=B0360154BA/],
+    ["systemType", { systemType: "POS" }, /EIMS_SYSTEM_TYPE=SYS/],
+  ])("fails fast when the configured %s disagrees with the token", async (_name, over, pattern) => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(eimsToken(over)) }));
+
+    // cfg() sets EIMS_SYSTEM_NUMBER=B0360154BA and EIMS_SYSTEM_TYPE=SYS as expectations.
+    await expect(build(post).getSessionContext()).rejects.toThrow(pattern);
+  });
+
+  it("accepts a configured value that matches the token", async () => {
+    const post = jest.fn().mockReturnValue(of({ data: loginBody(TOKEN_1) }));
+
+    await expect(build(post).getSessionContext()).resolves.toEqual({
+      systemNumber: "B0360154BA",
+      systemType: "SYS",
+    });
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/eims/eims-auth.service.ts b/apps/edr-freight-api/src/modules/eims/eims-auth.service.ts
new file mode 100644
index 000000000..9e53723d0
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-auth.service.ts
@@ -0,0 +1,212 @@
+import { HttpService } from "@nestjs/axios";
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { firstValueFrom } from "rxjs";
+import { EimsConfig } from "../../config/eims.config";
+import { EimsSignerService, toSignedBody } from "./eims-signer.service";
+import { EimsApiException, EimsConfigException, toEimsApiException } from "./eims.errors";
+import { EimsLoginRequest, EimsLoginResponse } from "./eims.types";
+
+interface TokenCache {
+  accessToken: string;
+  /** Epoch ms, already reduced by the configured skew. */
+  expiresAt: number;
+  session: EimsSessionContext;
+}
+
+/**
+ * Source-system identity, taken from the access token MoR issues us.
+ *
+ * The gateway stamps `systemNumber` and `systemType` into the token for the credentials that
+ * authenticated, which makes the token the authority on them — not our environment file. Anything
+ * we configured locally can only ever disagree with what MoR believes.
+ */
+export interface EimsSessionContext {
+  systemNumber: string;
+  systemType: string;
+}
+
+/** Decode a JWT payload without verifying it: this is MoR's token, signed with MoR's key. */
+function decodeTokenClaims(accessToken: string): Record<string, unknown> {
+  const payload = accessToken.split(".")[1];
+  if (!payload) {
+    throw new EimsApiException("UNKNOWN", "EIMS access token is not a JWT (no payload segment)");
+  }
+  try {
+    return JSON.parse(Buffer.from(payload, "base64url").toString("utf8")) as Record<string, unknown>;
+  } catch (err) {
+    // The token itself is never included — only that its payload would not parse.
+    throw new EimsApiException(
+      "UNKNOWN",
+      `EIMS access token payload could not be decoded: ${(err as Error).message}`,
+    );
+  }
+}
+
+const claimString = (claims: Record<string, unknown>, name: string): string => {
+  const value = claims[name];
+  return typeof value === "string" ? value.trim() : "";
+};
+
+/** Used when the gateway omits `expiresIn`; the observed value is 3600. */
+const FALLBACK_EXPIRES_IN_SECONDS = 3600;
+
+/**
+ * EIMS authentication: signed `POST /auth/login`, plus an in-memory access-token cache.
+ *
+ * Login is the one EIMS call that carries no bearer token, which is why it lives here rather than
+ * in the generic client. Tokens are held in memory only — never persisted, never logged, never
+ * returned to a frontend.
+ */
+@Injectable()
+export class EimsAuthService {
+  private readonly logger = new Logger(EimsAuthService.name);
+  private cache: TokenCache | null = null;
+  private loginInFlight: Promise<string> | null = null;
+
+  constructor(
+    private readonly http: HttpService,
+    private readonly config: ConfigService,
+    private readonly signer: EimsSignerService,
+  ) {}
+
+  private get cfg(): EimsConfig {
+    return this.config.get<EimsConfig>("eims")!;
+  }
+
+  /**
+   * A non-expired access token, logging in if needed. Concurrent callers share one login: the
+   * first caller stores the in-flight promise and everyone else awaits it.
+   */
+  async getValidAccessToken(): Promise<string> {
+    if (this.cache && Date.now() < this.cache.expiresAt) {
+      return this.cache.accessToken;
+    }
+    if (this.loginInFlight) return this.loginInFlight;
+
+    this.loginInFlight = this.login();
+    try {
+      return await this.loginInFlight;
+    } finally {
+      this.loginInFlight = null;
+    }
+  }
+
+  /**
+   * The source-system identity MoR issued this session, refreshing the login if needed.
+   *
+   * This is the authority for `SourceSystem.SystemNumber` / `SystemType`: the gateway stamps both
+   * into the access token for the authenticating credentials, so a local env value could only ever
+   * disagree with it.
+   */
+  async getSessionContext(): Promise<EimsSessionContext> {
+    await this.getValidAccessToken();
+    return this.cache!.session;
+  }
+
+  /** Drop the cached token — called after a 401 so the next request re-authenticates. */
+  invalidate(): void {
+    this.cache = null;
+  }
+
+  /**
+   * Read the source-system claims out of the token, and cross-check anything configured locally.
+   *
+   * `EIMS_SYSTEM_NUMBER` / `EIMS_SYSTEM_TYPE` are optional expectations, not inputs: when set they
+   * are compared and a mismatch fails immediately rather than one silently winning. Registering
+   * under the wrong source system is not something to discover from a rejected invoice.
+   */
+  private readSessionContext(accessToken: string, cfg: EimsConfig): EimsSessionContext {
+    const claims = decodeTokenClaims(accessToken);
+    const systemNumber = claimString(claims, "systemNumber");
+    const systemType = claimString(claims, "systemType");
+
+    const missing = [
+      !systemNumber && "systemNumber",
+      !systemType && "systemType",
+    ].filter(Boolean);
+    if (missing.length > 0) {
+      throw new EimsApiException(
+        "UNKNOWN",
+        `EIMS access token carries no ${missing.join(" or ")} claim; cannot identify the source system`,
+      );
+    }
+
+    const mismatches = [
+      cfg.systemNumber && cfg.systemNumber !== systemNumber
+        ? `EIMS_SYSTEM_NUMBER=${cfg.systemNumber} but the token says ${systemNumber}`
+        : null,
+      cfg.systemType && cfg.systemType !== systemType
+        ? `EIMS_SYSTEM_TYPE=${cfg.systemType} but the token says ${systemType}`
+        : null,
+    ].filter(Boolean);
+    if (mismatches.length > 0) {
+      throw new EimsConfigException(
+        `EIMS source-system configuration disagrees with the issued token: ${mismatches.join("; ")}. ` +
+          "Correct the environment or the credentials — neither value is assumed to win.",
+      );
+    }
+
+    return { systemNumber, systemType };
+  }
+
+  private async login(): Promise<string> {
+    const cfg = this.cfg;
+    if (!cfg.enabled) {
+      throw new EimsConfigException("EIMS integration is disabled; set EIMS_ENABLED=true to use it");
+    }
+
+    const request: EimsLoginRequest = {
+      clientId: cfg.clientId,
+      clientSecret: cfg.clientSecret,
+      apikey: cfg.apiKey,
+      tin: cfg.tin,
+    };
+    const body = toSignedBody(this.signer.signRequest(request));
+
+    let response: EimsLoginResponse;
+    try {
+      const res = await firstValueFrom(
+        this.http.post<EimsLoginResponse>(`${cfg.baseUrl}/auth/login`, body, {
+          headers: { "Content-Type": "application/json" },
+          timeout: cfg.httpTimeoutMs,
+        }),
+      );
+      response = res.data;
+    } catch (err) {
+      const mapped = toEimsApiException(err, "login");
+      this.logger.error(mapped.message);
+      throw mapped;
+    }
+
+    const accessToken = response?.data?.accessToken;
+    if (!accessToken) {
+      throw new EimsApiException("UNKNOWN", "EIMS login returned no accessToken");
+    }
+
+    const expiresIn =
+      Number.isFinite(response.data.expiresIn) && response.data.expiresIn > 0
+        ? response.data.expiresIn
+        : FALLBACK_EXPIRES_IN_SECONDS;
+
+    // TODO: implement `POST /auth/refresh-token` and hold `response.data.refreshToken`. The
+    // collection shows a bare `{refreshToken}` body with no envelope, but it also carries unsigned
+    // examples of calls that do require signing, so whether refresh must be signed is unconfirmed.
+    // Until MoR confirms it, an expired token just triggers a fresh login — `expiresIn` is 3600s,
+    // so that is one extra call an hour.
+    // Reject the session before caching it: a token we cannot identify a source system from is
+    // useless for registration, and a configured expectation that disagrees is a deployment fault.
+    const session = this.readSessionContext(accessToken, cfg);
+
+    this.cache = {
+      accessToken,
+      expiresAt: Date.now() + Math.max(expiresIn * 1000 - cfg.tokenSkewMs, 1000),
+      session,
+    };
+    this.logger.log(
+      `EIMS login succeeded; token cached for ~${expiresIn}s ` +
+        `(system ${session.systemNumber}, type ${session.systemType})`,
+    );
+    return accessToken;
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-auto-submit.service.spec.ts b/apps/edr-freight-api/src/modules/eims/eims-auto-submit.service.spec.ts
new file mode 100644
index 000000000..6246d5a89
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-auto-submit.service.spec.ts
@@ -0,0 +1,139 @@
+import { ConfigService } from "@nestjs/config";
+import { DataSource } from "typeorm";
+
+import { EimsConfig } from "../../config/eims.config";
+import { EimsAutoSubmitService } from "./eims-auto-submit.service";
+import { EimsInvoiceRegistrationService } from "./eims-invoice-registration.service";
+import { EimsInvoiceStatus } from "./eims-registration.types";
+import { eimsConfig } from "./eims-test-fixtures";
+
+const INVOICE_ID = "11111111-1111-4111-8111-111111111111";
+
+/**
+ * `query` is answered by shape: the first call is the system-state guard, the second is the
+ * candidate lookup. Keeps the fake honest about the order the service actually asks in.
+ */
+const build = (
+  opts: {
+    cfg?: Partial<EimsConfig>;
+    state?: { in_flight_invoice_id?: string | null; blocked_reason?: string | null };
+    candidate?: { id: string; invoiceNumber: string } | null;
+    register?: jest.Mock;
+  } = {},
+) => {
+  const register =
+    opts.register ??
+    jest.fn().mockResolvedValue({ eimsStatus: EimsInvoiceStatus.Registered, eimsIrn: "IRN-1" });
+
+  const query = jest.fn().mockImplementation((sql: string) => {
+    if (sql.includes("eims_system_state")) {
+      return Promise.resolve(
+        opts.state ? [{ in_flight_invoice_id: null, blocked_reason: null, ...opts.state }] : [],
+      );
+    }
+    return Promise.resolve(opts.candidate === undefined ? [] : opts.candidate ? [opts.candidate] : []);
+  });
+
+  const service = new EimsAutoSubmitService(
+    { query } as unknown as DataSource,
+    { get: () => eimsConfig({ autoSubmit: true, ...opts.cfg }) } as unknown as ConfigService,
+    { registerInvoiceWithEims: register } as unknown as EimsInvoiceRegistrationService,
+  );
+  return { service, register, query };
+};
+
+const candidate = { id: INVOICE_ID, invoiceNumber: "INV-20260807-00006" };
+
+describe("EimsAutoSubmitService.tick", () => {
+  it("files the oldest eligible invoice through the registration service", async () => {
+    const { service, register } = build({ candidate });
+
+    await service.tick();
+
+    expect(register).toHaveBeenCalledTimes(1);
+    expect(register).toHaveBeenCalledWith(INVOICE_ID);
+  });
+
+  it("files nothing when EIMS_AUTO_SUBMIT is off", async () => {
+    const { service, register, query } = build({ cfg: { autoSubmit: false }, candidate });
+
+    await service.tick();
+
+    expect(register).not.toHaveBeenCalled();
+    expect(query).not.toHaveBeenCalled();
+  });
+
+  it("files nothing when EIMS itself is disabled, even with auto-submit on", async () => {
+    const { service, register, query } = build({ cfg: { enabled: false }, candidate });
+
+    await service.tick();
+
+    expect(register).not.toHaveBeenCalled();
+    expect(query).not.toHaveBeenCalled();
+  });
+
+  it("does not submit while another submission is in flight", async () => {
+    const { service, register } = build({
+      state: { in_flight_invoice_id: "22222222-2222-4222-8222-222222222222" },
+      candidate,
+    });
+
+    await service.tick();
+
+    expect(register).not.toHaveBeenCalled();
+  });
+
+  it("does not submit while the system number is blocked", async () => {
+    const { service, register } = build({
+      state: { blocked_reason: "never acknowledged" },
+      candidate,
+    });
+
+    await service.tick();
+
+    expect(register).not.toHaveBeenCalled();
+  });
+
+  it("does nothing when no invoice is eligible", async () => {
+    const { service, register } = build({ candidate: null });
+
+    await service.tick();
+
+    expect(register).not.toHaveBeenCalled();
+  });
+
+  it("asks only for NOT_SUBMITTED invoices, so UNKNOWN and FAILED are never retried", async () => {
+    const { service, query } = build({ candidate });
+
+    await service.tick();
+
+    const [sql, params] = query.mock.calls.find(([s]: [string]) => s.includes("freight.invoices"))!;
+    expect(sql).toContain("i.eims_status = $1");
+    expect(params[0]).toBe(EimsInvoiceStatus.NotSubmitted);
+    expect(sql).toContain("i.issued_at IS NOT NULL");
+  });
+
+  it("survives a filing failure so the job keeps running", async () => {
+    const register = jest.fn().mockRejectedValue(new Error("EIMS register failed (406)"));
+    const { service } = build({ candidate, register });
+
+    await expect(service.tick()).resolves.toBeUndefined();
+    expect(register).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not start a second tick while one is still filing", async () => {
+    let release: () => void = () => {};
+    const register = jest.fn().mockImplementation(
+      () => new Promise((resolve) => (release = () => resolve({ eimsStatus: "REGISTERED" }))),
+    );
+    const { service } = build({ candidate, register });
+
+    const first = service.tick();
+    await new Promise((r) => setImmediate(r));
+    await service.tick(); // overlapping tick, must be a no-op
+
+    expect(register).toHaveBeenCalledTimes(1);
+    release();
+    await first;
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/eims/eims-auto-submit.service.ts b/apps/edr-freight-api/src/modules/eims/eims-auto-submit.service.ts
new file mode 100644
index 000000000..fb5a0d1f6
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-auto-submit.service.ts
@@ -0,0 +1,126 @@
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { Cron } from "@nestjs/schedule";
+import { InjectDataSource } from "@nestjs/typeorm";
+import { DataSource } from "typeorm";
+
+import { EimsConfig } from "../../config/eims.config";
+import { EimsInvoiceRegistrationService } from "./eims-invoice-registration.service";
+import { EimsInvoiceStatus } from "./eims-registration.types";
+
+/**
+ * Files issued invoices with MoR EIMS on a timer.
+ *
+ * Invoices are produced by the freight workflow rather than by a person, so this — not the manual
+ * endpoint — is the production path. It is a sweep rather than a hook on the eleven places an
+ * invoice can be created or issued, which buys three things: the workflow is untouched, the HTTP
+ * call is by construction outside the invoice's transaction, and an invoice missed through a crash
+ * or a restart is picked up on the next tick.
+ *
+ * `invoices.eims_status` is the queue — nothing new is persisted. Only `NOT_SUBMITTED` is eligible:
+ * `UNKNOWN` must never be retried automatically (the document may already be filed), and `FAILED`
+ * waits for an explicit retry policy rather than a timer's guess.
+ *
+ * Off unless **both** `EIMS_ENABLED` and `EIMS_AUTO_SUBMIT` are true. Enabling it starts filing
+ * real documents with the tax authority, and a registration cannot be undone from this side.
+ */
+@Injectable()
+export class EimsAutoSubmitService {
+  private readonly logger = new Logger(EimsAutoSubmitService.name);
+  /** Guards against a tick starting while the previous one is still filing. */
+  private running = false;
+
+  constructor(
+    @InjectDataSource() private readonly dataSource: DataSource,
+    private readonly config: ConfigService,
+    private readonly registration: EimsInvoiceRegistrationService,
+  ) {}
+
+  private get cfg(): EimsConfig {
+    return this.config.get<EimsConfig>("eims")!;
+  }
+
+  /**
+   * One invoice per tick.
+   *
+   * Deliberately not a batch: each filing consumes a counter and advances the IRN chain, an
+   * ambiguous result blocks the system number until a human resolves it, and a misconfiguration
+   * should cost one rejected document rather than a burst of them.
+   */
+  @Cron(process.env.EIMS_AUTO_SUBMIT_CRON ?? "0 */5 * * * *", { name: "eims-auto-submit" })
+  async tick(): Promise<void> {
+    const cfg = this.cfg;
+    if (!cfg.enabled || !cfg.autoSubmit) return;
+    if (this.running) return;
+
+    this.running = true;
+    try {
+      // Rule of the chain: nothing may be filed while a submission is in flight or the system is
+      // blocked. The reservation would refuse anyway — checking first keeps the log quiet and
+      // avoids burning a tick on a guaranteed conflict.
+      const blocked = await this.systemBlockReason();
+      if (blocked) {
+        this.logger.warn(`EIMS auto-submit paused: ${blocked}`);
+        return;
+      }
+
+      const candidate = await this.nextCandidate();
+      if (!candidate) return;
+
+      const view = await this.registration.registerInvoiceWithEims(candidate.id);
+      this.logger.log(
+        `EIMS auto-submit: invoice ${candidate.invoiceNumber} -> ${view.eimsStatus}` +
+          (view.eimsIrn ? ` (IRN ${view.eimsIrn})` : ""),
+      );
+    } catch (err) {
+      // Never let a filing failure kill the job. The outcome is already persisted on the invoice
+      // (FAILED or UNKNOWN with the gateway's own message), and a blocked system number stops the
+      // next tick at the guard above.
+      this.logger.error(`EIMS auto-submit tick failed: ${(err as Error).message}`);
+    } finally {
+      this.running = false;
+    }
+  }
+
+  /** Why filing is currently impossible for this system number, or null when it is free. */
+  private async systemBlockReason(): Promise<string | null> {
+    const rows: { in_flight_invoice_id: string | null; blocked_reason: string | null }[] =
+      await this.dataSource.query(
+        `SELECT in_flight_invoice_id, blocked_reason
+           FROM freight.eims_system_state
+          WHERE system_number = $1 AND deleted_at IS NULL
+          LIMIT 1`,
+        [this.cfg.systemNumber],
+      );
+    const state = rows[0];
+    if (!state) return null;
+    if (state.blocked_reason) return state.blocked_reason;
+    if (state.in_flight_invoice_id) {
+      return `a submission for invoice ${state.in_flight_invoice_id} is still in flight`;
+    }
+    return null;
+  }
+
+  /**
+   * Oldest never-submitted invoice that is issued, still inside MoR's document-age window, and
+   * carries at least one line.
+   */
+  private async nextCandidate(): Promise<{ id: string; invoiceNumber: string } | null> {
+    const rows: { id: string; invoiceNumber: string }[] = await this.dataSource.query(
+      `SELECT i.id, i.invoice_number AS "invoiceNumber"
+         FROM freight.invoices i
+        WHERE i.eims_status = $1
+          AND i.issued_at IS NOT NULL
+          AND i.deleted_at IS NULL
+          AND i.issued_at > now() - ($2 || ' days')::interval
+          AND EXISTS (
+                SELECT 1 FROM freight.invoice_lines l
+                 WHERE l.invoice_id = i.id AND l.deleted_at IS NULL
+              )
+        ORDER BY i.issued_at ASC
+        LIMIT 1`,
+      [EimsInvoiceStatus.NotSubmitted, this.cfg.autoSubmitMaxAgeDays],
+    );
+    return rows[0] ?? null;
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-client.service.ts b/apps/edr-freight-api/src/modules/eims/eims-client.service.ts
new file mode 100644
index 000000000..610647b1a
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-client.service.ts
@@ -0,0 +1,80 @@
+import { HttpService } from "@nestjs/axios";
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { firstValueFrom } from "rxjs";
+import { EimsConfig } from "../../config/eims.config";
+import { EimsAuthService } from "./eims-auth.service";
+import { EimsSignerService, toSignedBody } from "./eims-signer.service";
+import { toEimsApiException } from "./eims.errors";
+
+/**
+ * Foundation for EIMS's bearer-authenticated endpoints (`/v1/register`, `/v1/verify`, …).
+ *
+ * Login is not routed through here: `/auth/login` carries no bearer token and lives in
+ * `EimsAuthService`. Nothing calls `postSigned` yet — invoice registration is a later phase.
+ */
+@Injectable()
+export class EimsClientService {
+  private readonly logger = new Logger(EimsClientService.name);
+
+  constructor(
+    private readonly http: HttpService,
+    private readonly config: ConfigService,
+    private readonly auth: EimsAuthService,
+    private readonly signer: EimsSignerService,
+  ) {}
+
+  private get cfg(): EimsConfig {
+    return this.config.get<EimsConfig>("eims")!;
+  }
+
+  /**
+   * Sign `request`, POST it to `path` with a valid bearer token, and return the parsed response.
+   * A 401 invalidates the cached token and retries exactly once.
+   */
+  async postSigned<TRequest, TResponse>(path: string, request: TRequest): Promise<TResponse> {
+    return this.send<TRequest, TResponse>(path, request, false, true);
+  }
+
+  /**
+   * POST `request` verbatim — bearer-authenticated but **not** wrapped in a signed envelope.
+   *
+   * `/v1/verify` is the only endpoint observed to work this way: the supplied collection sends a
+   * raw `{"irn":"…"}` body with no `signature`/`certificate` siblings. Kept as its own entry point
+   * so that if the live gateway turns out to require signing after all, exactly one call site
+   * changes — `postSigned` is already the alternative.
+   */
+  async postBearer<TRequest, TResponse>(path: string, request: TRequest): Promise<TResponse> {
+    return this.send<TRequest, TResponse>(path, request, false, false);
+  }
+
+  private async send<TRequest, TResponse>(
+    path: string,
+    request: TRequest,
+    isRetry: boolean,
+    signed: boolean,
+  ): Promise<TResponse> {
+    const cfg = this.cfg;
+    const token = await this.auth.getValidAccessToken();
+    const body = signed ? toSignedBody(this.signer.signRequest(request)) : request;
+
+    try {
+      const res = await firstValueFrom(
+        this.http.post<TResponse>(`${cfg.baseUrl}${path}`, body, {
+          headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+          timeout: cfg.httpTimeoutMs,
+        }),
+      );
+      return res.data;
+    } catch (err) {
+      const mapped = toEimsApiException(err, `POST ${path}`);
+      if (mapped.kind === "AUTH" && !isRetry) {
+        this.logger.warn(`EIMS rejected the token on ${path}; re-authenticating once`);
+        this.auth.invalidate();
+        return this.send<TRequest, TResponse>(path, request, true, signed);
+      }
+      this.logger.error(mapped.message);
+      throw mapped;
+    }
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-credentials.provider.ts b/apps/edr-freight-api/src/modules/eims/eims-credentials.provider.ts
new file mode 100644
index 000000000..b68a4a32f
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-credentials.provider.ts
@@ -0,0 +1,77 @@
+import { readFileSync } from "node:fs";
+import { KeyObject, createPrivateKey } from "node:crypto";
+import { Injectable, Logger } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { EimsConfig } from "../../config/eims.config";
+import { EimsConfigException } from "./eims.errors";
+
+/**
+ * Loads the INSA-issued EIMS credentials from disk, once, and keeps them in memory.
+ *
+ * The certificate is sent as base64 of the **exact bytes of the issued file** — it is deliberately
+ * never parsed, re-encoded or re-exported, because that is what produced a working live login.
+ * The private key never leaves this process: it is only ever used to produce a signature.
+ */
+@Injectable()
+export class EimsCredentialsProvider {
+  private readonly logger = new Logger(EimsCredentialsProvider.name);
+  private privateKey: KeyObject | null = null;
+  private certificateBase64: string | null = null;
+
+  constructor(private readonly config: ConfigService) {}
+
+  private get cfg(): EimsConfig {
+    return this.config.get<EimsConfig>("eims")!;
+  }
+
+  /** RSA private key, parsed once. Throws a config error if the path is missing or unusable. */
+  getPrivateKey(): KeyObject {
+    if (this.privateKey) return this.privateKey;
+
+    const path = this.cfg.privateKeyPath;
+    if (!path) throw new EimsConfigException("EIMS_PRIVATE_KEY_PATH is not set");
+
+    let key: KeyObject;
+    try {
+      key = createPrivateKey(readFileSync(path));
+    } catch (err) {
+      // The path is operational information, not a secret; the key material never appears.
+      throw new EimsConfigException(
+        `EIMS private key at ${path} could not be read or parsed: ${(err as Error).message}`,
+      );
+    }
+    if (key.asymmetricKeyType !== "rsa") {
+      throw new EimsConfigException(
+        `EIMS private key at ${path} is ${key.asymmetricKeyType ?? "of unknown type"}; EIMS requires RSA`,
+      );
+    }
+
+    this.privateKey = key;
+    this.logger.log(`EIMS private key loaded (RSA-${key.asymmetricKeyDetails?.modulusLength ?? "?"})`);
+    return key;
+  }
+
+  /** Base64 of the certificate file's exact bytes. No parsing, no re-encoding. */
+  getCertificateBase64(): string {
+    if (this.certificateBase64) return this.certificateBase64;
+
+    const path = this.cfg.certificatePath;
+    if (!path) throw new EimsConfigException("EIMS_CERTIFICATE_PATH is not set");
+
+    let bytes: Buffer;
+    try {
+      bytes = readFileSync(path);
+    } catch (err) {
+      throw new EimsConfigException(
+        `EIMS certificate at ${path} could not be read: ${(err as Error).message}`,
+      );
+    }
+    if (bytes.length === 0) {
+      throw new EimsConfigException(`EIMS certificate at ${path} is empty`);
+    }
+
+    this.certificateBase64 = bytes.toString("base64");
+    this.logger.log(`EIMS certificate bundle loaded (${bytes.length} bytes)`);
+    return this.certificateBase64;
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-invoice-context.ts b/apps/edr-freight-api/src/modules/eims/eims-invoice-context.ts
new file mode 100644
index 000000000..4e7a82069
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-invoice-context.ts
@@ -0,0 +1,150 @@
+import { BadRequestException } from "@nestjs/common";
+import { EimsConfig } from "../../config/eims.config";
+import { EimsSessionContext } from "./eims-auth.service";
+import {
+  EimsMapperContext,
+  EimsMapperLine,
+  EimsSellerDetails,
+} from "../billing/eims-invoice.mapper";
+
+/**
+ * Turns configuration into the seller identity and mapper context that `toEimsInvoice` requires.
+ *
+ * Everything here is unavailable from the database by construction: EDR's own legal identity is not
+ * modelled anywhere, and the application has no tax model at all (`invoice.taxAmount` is always 0,
+ * `invoice_lines` and the rate catalogue carry no fiscal columns). Rather than defaulting any of it,
+ * a missing value fails **here** — locally, before a single byte reaches the gateway — naming the
+ * exact environment variables to set.
+ */
+
+interface RequiredSpec {
+  env: string;
+  value: string | number | null | undefined;
+}
+
+// `systemNumber` / `systemType` are absent by design: they come from the access token, which is
+// MoR's own statement of who we are. See EimsAuthService.getSessionContext.
+const REQUIRED = (invoice: EimsConfig["invoice"], tin: string): RequiredSpec[] => [
+  { env: "EIMS_TIN", value: tin },
+  { env: "EIMS_SELLER_LEGAL_NAME", value: invoice.sellerLegalName },
+  { env: "EIMS_SELLER_VAT_NUMBER", value: invoice.sellerVatNumber },
+  { env: "EIMS_SELLER_PHONE", value: invoice.sellerPhone },
+  { env: "EIMS_SELLER_EMAIL", value: invoice.sellerEmail },
+  { env: "EIMS_SELLER_REGION", value: invoice.sellerRegion },
+  { env: "EIMS_SELLER_WEREDA", value: invoice.sellerWereda },
+  { env: "EIMS_TAX_CODE", value: invoice.taxCode },
+  { env: "EIMS_TAX_RATE_PERCENT", value: invoice.taxRatePercent },
+  { env: "EIMS_INCOME_WITHHOLD_VALUE", value: invoice.incomeWithholdValue },
+  { env: "EIMS_TRANSACTION_WITHHOLD_VALUE", value: invoice.transactionWithholdValue },
+  { env: "EIMS_TRANSACTION_TYPE", value: invoice.transactionType },
+  { env: "EIMS_NATURE_OF_SUPPLIES", value: invoice.natureOfSupplies },
+  { env: "EIMS_PAYMENT_MODE", value: invoice.paymentMode },
+  { env: "EIMS_PAYMENT_TERM", value: invoice.paymentTerm },
+  { env: "EIMS_UNIT_DEFAULT", value: invoice.unitDefault },
+];
+
+/** Throws naming every unset variable at once, so one round trip fixes the whole configuration. */
+export function assertEimsInvoiceConfig(config: EimsConfig): void {
+  const missing = REQUIRED(config.invoice, config.tin)
+    .filter(({ value }) => value === null || value === undefined || value === "")
+    .map(({ env }) => env);
+
+  if (missing.length > 0) {
+    throw new BadRequestException({
+      code: "EIMS_INVOICE_CONFIG_INCOMPLETE",
+      message:
+        "EIMS invoice registration is not configured. Set these environment variables " +
+        `(tax values need finance sign-off — they are deliberately not defaulted): ${missing.join(", ")}`,
+    });
+  }
+
+  assertSellerFormats(config.invoice);
+}
+
+/**
+ * MoR's own patterns for the seller fields, checked here rather than at the gateway.
+ *
+ * A placeholder like `_` is "set" but unfilable, and finding that out costs a real request and a
+ * consumed counter — these are the exact regexes its 400 SCHEMA ERROR quoted back at us.
+ */
+const SELLER_FORMATS: { env: string; value: (i: EimsConfig["invoice"]) => string; pattern: RegExp }[] = [
+  { env: "EIMS_SELLER_PHONE", value: (i) => i.sellerPhone, pattern: /^\+?[0-9]{6,}$/ },
+  {
+    env: "EIMS_SELLER_EMAIL",
+    value: (i) => i.sellerEmail,
+    pattern: /^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+$/,
+  },
+  { env: "EIMS_SELLER_REGION", value: (i) => i.sellerRegion, pattern: /^[0-9]{1,3}$/ },
+  { env: "EIMS_SELLER_WEREDA", value: (i) => i.sellerWereda, pattern: /^[0-9A-Za-z]{1,10}$/ },
+];
+
+function assertSellerFormats(invoice: EimsConfig["invoice"]): void {
+  const bad = SELLER_FORMATS.filter(({ value, pattern }) => !pattern.test(value(invoice))).map(
+    ({ env, pattern }) => `${env} (must match ${pattern.source})`,
+  );
+  if (bad.length > 0) {
+    throw new BadRequestException({
+      code: "EIMS_INVOICE_CONFIG_INVALID",
+      message: `EIMS seller details would be rejected by MoR: ${bad.join("; ")}`,
+    });
+  }
+}
+
+export function buildEimsSeller(config: EimsConfig): EimsSellerDetails {
+  const { invoice } = config;
+  return {
+    City: invoice.sellerCity,
+    Email: invoice.sellerEmail,
+    HouseNumber: invoice.sellerHouseNumber,
+    LegalName: invoice.sellerLegalName,
+    Locality: invoice.sellerLocality,
+    Phone: invoice.sellerPhone,
+    Region: invoice.sellerRegion,
+    SubCity: invoice.sellerSubCity,
+    Tin: config.tin,
+    VatNumber: invoice.sellerVatNumber,
+    Wereda: invoice.sellerWereda,
+  };
+}
+
+export interface EimsContextInput {
+  /** `DocumentDetails.DocumentNumber`. The caller decides its source. */
+  documentNumber: string;
+  invoiceCounter: number;
+  previousIrn: string | null;
+  /** Source-system identity from the access token, never from configuration. */
+  session: EimsSessionContext;
+  /** Required when the invoice currency is not ETB. */
+  exchangeRate?: number | null;
+}
+
+export function buildEimsContext(config: EimsConfig, input: EimsContextInput): EimsMapperContext {
+  const { invoice } = config;
+  // Validated by assertEimsInvoiceConfig; the non-null assertions below are safe after that call.
+  const taxCode = invoice.taxCode;
+  const ratePercent = invoice.taxRatePercent!;
+  const exciseTaxValue = invoice.exciseTaxValue ?? 0;
+
+  return {
+    systemNumber: input.session.systemNumber,
+    systemType: input.session.systemType,
+    documentNumber: input.documentNumber,
+    invoiceCounter: input.invoiceCounter,
+    previousIrn: input.previousIrn,
+    cashierName: invoice.cashierName,
+    salesPersonName: invoice.salesPersonName,
+    transactionType: invoice.transactionType,
+    payment: { mode: invoice.paymentMode, term: invoice.paymentTerm },
+    // One treatment for every line today. The mapper resolves tax per line, so a future
+    // charge-type-specific rule slots in here without touching the mapper.
+    taxForLine: (_line: EimsMapperLine) => ({ code: taxCode, ratePercent, exciseTaxValue }),
+    natureOfSupplies: invoice.natureOfSupplies,
+    unitDefault: invoice.unitDefault,
+    incomeWithholdValue: invoice.incomeWithholdValue!,
+    transactionWithholdValue: invoice.transactionWithholdValue!,
+    buyerCountryCode: invoice.buyerCountryCode,
+    buyerRegionCodes: invoice.buyerRegionCodes,
+    buyerWeredaCodes: invoice.buyerWeredaCodes,
+    exchangeRate: input.exchangeRate ?? null,
+  };
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-invoice-registration.service.spec.ts b/apps/edr-freight-api/src/modules/eims/eims-invoice-registration.service.spec.ts
new file mode 100644
index 000000000..66e27da6b
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-invoice-registration.service.spec.ts
@@ -0,0 +1,657 @@
+import { BadRequestException, ConflictException } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { DataSource } from "typeorm";
+
+import { EimsConfig } from "../../config/eims.config";
+import { Invoice } from "../billing/entities/invoice.entity";
+import { EimsInvoiceRequest } from "../billing/eims-invoice.mapper";
+import { eimsInvoiceConfig } from "./eims-test-fixtures";
+import { NotificationInboxService } from "../notification-inbox/notification-inbox.service";
+import { EimsAuthService } from "./eims-auth.service";
+import { EimsClientService } from "./eims-client.service";
+import { EimsApiException } from "./eims.errors";
+import { EimsInvoiceRegistrationService } from "./eims-invoice-registration.service";
+import { EimsSystemState } from "./entities/eims-system-state.entity";
+import { EimsInvoiceStatus } from "./eims-registration.types";
+
+const SYSTEM_NUMBER = "B0360154BA";
+const INVOICE_ID = "11111111-1111-4111-8111-111111111111";
+const OTHER_INVOICE_ID = "22222222-2222-4222-8222-222222222222";
+const IRN = "9fe9bbbece6ab76c112b617534e6aac7aa8b819d5be79f4d3d088ed2e887b2e0";
+
+const config = (over: Partial<EimsConfig["invoice"]> = {}): EimsConfig =>
+  ({
+    enabled: true,
+    baseUrl: "https://core.mor.gov.et",
+    clientId: "cid",
+    clientSecret: "secret",
+    apiKey: "key",
+    tin: "0000034558",
+    systemNumber: SYSTEM_NUMBER,
+    systemType: "SYS",
+    privateKeyPath: "/dev/null",
+    certificatePath: "/dev/null",
+    httpTimeoutMs: 30_000,
+    tokenSkewMs: 45_000,
+    invoice: eimsInvoiceConfig(over),
+  }) as EimsConfig;
+
+const invoiceRow = (over: Partial<Invoice> = {}): Invoice =>
+  ({
+    id: INVOICE_ID,
+    invoiceNumber: "INV-20260807-00042",
+    currency: "ETB",
+    issuedAt: new Date(2026, 7, 7, 9, 5, 3),
+    totalAmount: "10000.00",
+    eimsStatus: EimsInvoiceStatus.NotSubmitted,
+    eimsIrn: null,
+    eimsInvoiceCounter: null,
+    eimsSubmittedAt: null,
+    eimsAckDate: null,
+    eimsLastError: null,
+    company: {
+      name: "ABC Trading PLC",
+      tin: "0999930000",
+      vatNumber: "123475885858",
+      phone: "0912345678",
+      email: "buyer@abc.et",
+      region: "13",
+      zone: "SHA",
+      woreda: "574",
+      kebele: "03",
+      houseNo: "NEW",
+      country: "Ethiopia",
+    },
+    ...over,
+  }) as unknown as Invoice;
+
+const LINES = [
+  {
+    chargeType: "RAIL_FREIGHT",
+    description: "Addis to Djibouti",
+    quantity: "1.00",
+    unitRate: "10000.00",
+    amount: "10000.00",
+  },
+];
+
+/**
+ * In-memory stand-in for the two locked rows. `update` merges, `createQueryBuilder(...).getOne()`
+ * returns the live object — enough to assert ordering, values and the reservation lifecycle without
+ * a database.
+ */
+class FakeDb {
+  invoices = new Map<string, Invoice>();
+  state: EimsSystemState | null = null;
+  /** Runs before every transaction body, to simulate a concurrent writer. */
+  onTransaction: (() => void) | null = null;
+
+  constructor(invoices: Invoice[], state?: Partial<EimsSystemState>) {
+    for (const inv of invoices) this.invoices.set(inv.id, inv);
+    this.state = {
+      id: "state-1",
+      systemNumber: SYSTEM_NUMBER,
+      nextInvoiceCounter: 7,
+      nextDocumentNumber: 5,
+      previousIrn: null,
+      inFlightInvoiceId: null,
+      inFlightCounter: null,
+      inFlightDocumentNumber: null,
+      blockedReason: null,
+      ...state,
+    } as EimsSystemState;
+  }
+
+  private manager = {
+    createQueryBuilder: (entity: unknown) => {
+      const isInvoice = entity === Invoice;
+      let id: string | undefined;
+      const builder = {
+        setLock: () => builder,
+        where: (_clause: string, params: Record<string, string>) => {
+          id = params.invoiceId ?? params.systemNumber;
+          return builder;
+        },
+        getOne: async () => (isInvoice ? (this.invoices.get(id!) ?? null) : this.state),
+      };
+      return builder;
+    },
+    findOne: async (_entity: unknown, options: { where: { id: string } }) =>
+      this.invoices.get(options.where.id) ?? null,
+    update: async (entity: unknown, id: string, patch: Record<string, unknown>) => {
+      if (entity === Invoice) Object.assign(this.invoices.get(id)!, patch);
+      else Object.assign(this.state!, patch);
+    },
+    query: async () => [],
+    getRepository: () => ({
+      findOne: async (options: { where: { id: string } }) =>
+        this.invoices.get(options.where.id) ?? null,
+    }),
+  };
+
+  asDataSource(): DataSource {
+    return {
+      manager: this.manager,
+      getRepository: this.manager.getRepository,
+      query: async (sql: string) =>
+        sql.includes("eims_system_state")
+          ? [{ in_flight_invoice_id: this.state?.inFlightInvoiceId ?? null }]
+          : LINES,
+      transaction: async (body: (m: unknown) => Promise<unknown>) => {
+        this.onTransaction?.();
+        return body(this.manager);
+      },
+    } as unknown as DataSource;
+  }
+}
+
+/** The source system comes from the access token, so the service is handed a session, not config. */
+const SESSION = { systemNumber: SYSTEM_NUMBER, systemType: "SYS" };
+
+const build = (
+  db: FakeDb,
+  postSigned: jest.Mock,
+  cfg: EimsConfig = config(),
+  postBearer: jest.Mock = jest.fn(),
+  getSessionContext: jest.Mock | undefined = undefined,
+  notify: jest.Mock = jest.fn().mockResolvedValue(undefined),
+) =>
+  new EimsInvoiceRegistrationService(
+    db.asDataSource(),
+    { get: () => cfg } as unknown as ConfigService,
+    { postSigned, postBearer } as unknown as EimsClientService,
+    {
+      getSessionContext: getSessionContext ?? jest.fn().mockResolvedValue(SESSION),
+    } as unknown as EimsAuthService,
+    { notify } as unknown as NotificationInboxService,
+  );
+
+/**
+ * Document number the fixtures register under; `/v1/verify` must echo it back.
+ *
+ * A plain integer, not our `invoiceNumber`: MoR validates the field against
+ * `^(0|[1-9][0-9]{0,8})$`. It is allocated from `nextDocumentNumber` above.
+ */
+const DOCUMENT_NUMBER = "5";
+
+/**
+ * `/v1/verify` success. The response spells the reference `Irn` while the request sends lowercase
+ * `irn`.
+ *
+ * The fixture is deliberately *coherent* — same IRN on both sides. The supplied Postman collection
+ * pairs a saved request and a saved response whose literal IRNs disagree, which is an artefact of
+ * the mock rather than gateway behaviour; asserting against that inconsistency would encode the
+ * mock's bug as a requirement. Resolution requires the returned `Irn` to match the one asked for,
+ * and these fixtures exercise that honestly.
+ */
+const verifyResponse = (over: Record<string, unknown> = {}) => ({
+  statusCode: 200,
+  message: "SUCCESS",
+  body: {
+    Irn: IRN,
+    TransactionType: "B2B",
+    DocumentDetails: { Type: "INV", DocumentNumber: DOCUMENT_NUMBER, Date: "07-08-2026T09:05:03" },
+    Version: "1",
+    ...over,
+  },
+});
+
+const okResponse = (irn = IRN) =>
+  ({ statusCode: 200, message: "SUCCESS", body: { irn, ackDate: "2026-08-07T09:05:03Z[Etc/UTC]" } });
+
+const apiError = (kind: string, status?: number) =>
+  new EimsApiException(kind as never, `EIMS register failed (${status ?? "-"})`, status);
+
+describe("EimsInvoiceRegistrationService.registerInvoiceWithEims", () => {
+  it("registers, persists the IRN and advances the chain", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const postSigned = jest.fn().mockResolvedValue(okResponse());
+
+    const view = await build(db, postSigned).registerInvoiceWithEims(INVOICE_ID);
+
+    expect(postSigned).toHaveBeenCalledTimes(1);
+    expect(postSigned.mock.calls[0][0]).toBe("/v1/register");
+    expect(view).toMatchObject({
+      eimsStatus: EimsInvoiceStatus.Registered,
+      eimsIrn: IRN,
+      eimsInvoiceCounter: 7,
+      eimsAckDate: "2026-08-07T09:05:03Z[Etc/UTC]",
+    });
+    expect(db.state).toMatchObject({
+      previousIrn: IRN,
+      nextInvoiceCounter: 8,
+      inFlightInvoiceId: null,
+      inFlightCounter: null,
+      blockedReason: null,
+    });
+  });
+
+  it("sends the exact reserved counter and previous IRN to the mapper", async () => {
+    const db = new FakeDb([invoiceRow()], { nextInvoiceCounter: 42, previousIrn: "PRIOR-IRN" });
+    const postSigned = jest.fn().mockResolvedValue(okResponse());
+
+    await build(db, postSigned).registerInvoiceWithEims(INVOICE_ID);
+
+    const request = postSigned.mock.calls[0][1] as EimsInvoiceRequest;
+    expect(request.SourceSystem.InvoiceCounter).toBe(42);
+    expect(request.ReferenceDetails.PreviousIrn).toBe("PRIOR-IRN");
+    expect(request.DocumentDetails.DocumentNumber).toBe(DOCUMENT_NUMBER);
+    expect(request.SourceSystem.SystemNumber).toBe(SYSTEM_NUMBER);
+  });
+
+  it("takes SourceSystem from the token session, not from configuration", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const postSigned = jest.fn().mockResolvedValue(okResponse());
+    // Config disagrees on purpose: only the session may reach the wire.
+    const cfg = config();
+    (cfg as { systemNumber: string }).systemNumber = "CONFIG-ONLY";
+    (cfg as { systemType: string }).systemType = "MAN";
+
+    await build(
+      db,
+      postSigned,
+      cfg,
+      jest.fn(),
+      jest.fn().mockResolvedValue({ systemNumber: "FROM-TOKEN", systemType: "POS" }),
+    ).registerInvoiceWithEims(INVOICE_ID);
+
+    const request = postSigned.mock.calls[0][1] as EimsInvoiceRequest;
+    expect(request.SourceSystem.SystemNumber).toBe("FROM-TOKEN");
+    expect(request.SourceSystem.SystemType).toBe("POS");
+  });
+
+  it("does not consume a counter when authentication fails", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const postSigned = jest.fn();
+    const getSessionContext = jest.fn().mockRejectedValue(new Error("login failed"));
+
+    await expect(
+      build(db, postSigned, config(), jest.fn(), getSessionContext).registerInvoiceWithEims(
+        INVOICE_ID,
+      ),
+    ).rejects.toThrow(/login failed/);
+
+    expect(postSigned).not.toHaveBeenCalled();
+    expect(db.state).toMatchObject({ nextInvoiceCounter: 7, inFlightInvoiceId: null });
+    expect(db.invoices.get(INVOICE_ID)!.eimsStatus).toBe(EimsInvoiceStatus.NotSubmitted);
+  });
+
+  it("is idempotent — an invoice with an IRN never reaches EIMS", async () => {
+    const db = new FakeDb([
+      invoiceRow({ eimsIrn: IRN, eimsStatus: EimsInvoiceStatus.Registered }),
+    ]);
+    const postSigned = jest.fn();
+
+    const view = await build(db, postSigned).registerInvoiceWithEims(INVOICE_ID);
+
+    expect(postSigned).not.toHaveBeenCalled();
+    expect(view.eimsIrn).toBe(IRN);
+  });
+
+  it("lets only one of two concurrent calls reach EIMS", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    let resolvePost: (v: unknown) => void = () => {};
+    const postSigned = jest
+      .fn()
+      .mockImplementation(() => new Promise((resolve) => (resolvePost = resolve)));
+    const service = build(db, postSigned);
+
+    const first = service.registerInvoiceWithEims(INVOICE_ID);
+    // Let the first reservation commit and its HTTP call start; it is now parked on `resolvePost`.
+    await new Promise((resolve) => setImmediate(resolve));
+    expect(postSigned).toHaveBeenCalledTimes(1);
+
+    const second = service.registerInvoiceWithEims(INVOICE_ID);
+
+    await expect(second).rejects.toBeInstanceOf(ConflictException);
+    resolvePost(okResponse());
+    await first;
+    expect(postSigned).toHaveBeenCalledTimes(1);
+  });
+
+  it("blocks a different invoice while a submission is in flight (survives a restart)", async () => {
+    // A committed reservation left behind by a dead process.
+    const db = new FakeDb(
+      [
+        invoiceRow({ eimsStatus: EimsInvoiceStatus.Submitting, eimsInvoiceCounter: 7 }),
+        invoiceRow({ id: OTHER_INVOICE_ID, invoiceNumber: "INV-20260807-00043" }),
+      ],
+      { inFlightInvoiceId: INVOICE_ID, inFlightCounter: 7, nextInvoiceCounter: 8 },
+    );
+    const postSigned = jest.fn();
+
+    await expect(
+      build(db, postSigned).registerInvoiceWithEims(OTHER_INVOICE_ID),
+    ).rejects.toThrow(/already in flight/);
+    expect(postSigned).not.toHaveBeenCalled();
+  });
+
+  it("fails locally on incomplete tax configuration, with zero HTTP calls", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const postSigned = jest.fn();
+
+    await expect(
+      build(db, postSigned, config({ taxCode: "", taxRatePercent: null })).registerInvoiceWithEims(
+        INVOICE_ID,
+      ),
+    ).rejects.toBeInstanceOf(BadRequestException);
+
+    expect(postSigned).not.toHaveBeenCalled();
+    expect(db.invoices.get(INVOICE_ID)!.eimsStatus).toBe(EimsInvoiceStatus.NotSubmitted);
+    expect(db.state).toMatchObject({ nextInvoiceCounter: 7, inFlightInvoiceId: null });
+  });
+
+  it.each([
+    ["SCHEMA_VALIDATION", 400],
+    ["RULE_VALIDATION", 406],
+  ])("marks %s (%i) FAILED and clears the global block", async (kind, status) => {
+    const db = new FakeDb([invoiceRow()]);
+    const postSigned = jest.fn().mockRejectedValue(apiError(kind, status));
+
+    await expect(build(db, postSigned).registerInvoiceWithEims(INVOICE_ID)).rejects.toBeInstanceOf(
+      EimsApiException,
+    );
+
+    expect(db.invoices.get(INVOICE_ID)).toMatchObject({
+      eimsStatus: EimsInvoiceStatus.Failed,
+      eimsIrn: null,
+    });
+    expect(db.state).toMatchObject({
+      inFlightInvoiceId: null,
+      blockedReason: null,
+      previousIrn: null,
+      // Returned, not consumed: MoR tracks the sequence and rejects a gap
+      // ("Invoice counter is not correct. expected : 1").
+      nextInvoiceCounter: 7,
+    });
+  });
+
+  it("treats a success response with no IRN as a failed registration", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const postSigned = jest.fn().mockResolvedValue({ statusCode: 200, body: { irn: "" } });
+
+    await expect(build(db, postSigned).registerInvoiceWithEims(INVOICE_ID)).rejects.toThrow(
+      /returned no IRN/,
+    );
+    expect(db.invoices.get(INVOICE_ID)!.eimsStatus).toBe(EimsInvoiceStatus.Failed);
+    expect(db.state).toMatchObject({ inFlightInvoiceId: null, blockedReason: null });
+  });
+
+  it("marks a timeout UNKNOWN and keeps the system blocked", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const postSigned = jest.fn().mockRejectedValue(apiError("TIMEOUT"));
+
+    await expect(build(db, postSigned).registerInvoiceWithEims(INVOICE_ID)).rejects.toBeInstanceOf(
+      EimsApiException,
+    );
+
+    expect(db.invoices.get(INVOICE_ID)).toMatchObject({
+      eimsStatus: EimsInvoiceStatus.Unknown,
+      eimsIrn: null,
+    });
+    expect(db.state!.inFlightInvoiceId).toBe(INVOICE_ID);
+    expect(db.state!.blockedReason).toMatch(/never acknowledged/);
+    expect(db.state!.previousIrn).toBeNull();
+  });
+
+  it("an UNKNOWN result blocks a different invoice too", async () => {
+    const db = new FakeDb([invoiceRow(), invoiceRow({ id: OTHER_INVOICE_ID })]);
+    const postSigned = jest.fn().mockRejectedValueOnce(apiError("TIMEOUT"));
+    const service = build(db, postSigned);
+
+    await expect(service.registerInvoiceWithEims(INVOICE_ID)).rejects.toBeInstanceOf(
+      EimsApiException,
+    );
+    await expect(service.registerInvoiceWithEims(OTHER_INVOICE_ID)).rejects.toThrow(
+      /registration is blocked/,
+    );
+    expect(postSigned).toHaveBeenCalledTimes(1);
+  });
+
+  it("returns the counter after a refusal, but keeps it after an ambiguous result", async () => {
+    const db = new FakeDb([invoiceRow(), invoiceRow({ id: OTHER_INVOICE_ID })]);
+    const postSigned = jest
+      .fn()
+      .mockRejectedValueOnce(apiError("RULE_VALIDATION", 406))
+      .mockResolvedValueOnce(okResponse());
+    const service = build(db, postSigned);
+
+    await expect(service.registerInvoiceWithEims(INVOICE_ID)).rejects.toBeInstanceOf(
+      EimsApiException,
+    );
+    await service.registerInvoiceWithEims(OTHER_INVOICE_ID);
+
+    // The two numbers move differently, because MoR constrains them differently: the counter must
+    // not skip (it returns), the document number must not repeat (it is burned).
+    const first = postSigned.mock.calls[0][1] as EimsInvoiceRequest;
+    const second = postSigned.mock.calls[1][1] as EimsInvoiceRequest;
+    expect(first.SourceSystem.InvoiceCounter).toBe(7);
+    expect(second.SourceSystem.InvoiceCounter).toBe(7);
+    expect(first.DocumentDetails.DocumentNumber).toBe("5");
+    expect(second.DocumentDetails.DocumentNumber).toBe("6");
+  });
+});
+
+describe("EimsInvoiceRegistrationService staff alerting", () => {
+  it("raises a high-priority alert when a result is ambiguous, because all filing is blocked", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const notify = jest.fn().mockResolvedValue(undefined);
+    const postSigned = jest.fn().mockRejectedValue(apiError("TIMEOUT"));
+
+    await expect(
+      build(db, postSigned, config(), jest.fn(), undefined, notify).registerInvoiceWithEims(
+        INVOICE_ID,
+      ),
+    ).rejects.toBeInstanceOf(EimsApiException);
+
+    expect(notify).toHaveBeenCalledTimes(1);
+    const sent = notify.mock.calls[0][0];
+    expect(sent.priority).toBe("HIGH");
+    expect(sent.title).toMatch(/blocked/i);
+    expect(sent.recipients.permissionKeys).toContain("edr_freight_app:invoices:eims_resolve");
+  });
+
+  it("raises a normal-priority alert for a deterministic rejection", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const notify = jest.fn().mockResolvedValue(undefined);
+    const postSigned = jest.fn().mockRejectedValue(apiError("RULE_VALIDATION", 406));
+
+    await expect(
+      build(db, postSigned, config(), jest.fn(), undefined, notify).registerInvoiceWithEims(
+        INVOICE_ID,
+      ),
+    ).rejects.toBeInstanceOf(EimsApiException);
+
+    expect(notify.mock.calls[0][0].priority).toBe("NORMAL");
+  });
+
+  it("does not alert on a successful filing", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const notify = jest.fn();
+
+    await build(db, jest.fn().mockResolvedValue(okResponse()), config(), jest.fn(), undefined, notify)
+      .registerInvoiceWithEims(INVOICE_ID);
+
+    expect(notify).not.toHaveBeenCalled();
+  });
+
+  it("lets the filing outcome stand even if the alert itself fails", async () => {
+    const db = new FakeDb([invoiceRow()]);
+    const notify = jest.fn().mockRejectedValue(new Error("inbox down"));
+    const postSigned = jest.fn().mockRejectedValue(apiError("RULE_VALIDATION", 406));
+
+    await expect(
+      build(db, postSigned, config(), jest.fn(), undefined, notify).registerInvoiceWithEims(
+        INVOICE_ID,
+      ),
+    ).rejects.toThrow(/EIMS register failed \(406\)/);
+
+    expect(db.invoices.get(INVOICE_ID)!.eimsStatus).toBe(EimsInvoiceStatus.Failed);
+  });
+});
+
+describe("EimsInvoiceRegistrationService.verifyInvoiceWithEims", () => {
+  it("verifies the stored IRN over the unsigned bearer transport", async () => {
+    const db = new FakeDb([invoiceRow({ eimsIrn: IRN })]);
+    const postSigned = jest.fn();
+    const postBearer = jest.fn().mockResolvedValue(verifyResponse());
+
+    const result = await build(db, postSigned, config(), postBearer).verifyInvoiceWithEims(
+      INVOICE_ID,
+    );
+
+    // Lowercase `irn`, raw body — not a signed envelope. `postSigned` must stay untouched.
+    expect(postBearer).toHaveBeenCalledWith("/v1/verify", { irn: IRN });
+    expect(postSigned).not.toHaveBeenCalled();
+    expect(result.body).toMatchObject({ Irn: IRN });
+  });
+
+  it("rejects a 200 that carries no Irn", async () => {
+    const db = new FakeDb([invoiceRow({ eimsIrn: IRN })]);
+    const postBearer = jest.fn().mockResolvedValue({ statusCode: 200, body: { Irn: "  " } });
+
+    await expect(
+      build(db, jest.fn(), config(), postBearer).verifyInvoiceWithEims(INVOICE_ID),
+    ).rejects.toThrow(/returned no Irn/);
+  });
+
+  it("refuses to verify an invoice with no IRN", async () => {
+    const db = new FakeDb([invoiceRow({ eimsStatus: EimsInvoiceStatus.Unknown })]);
+    const postBearer = jest.fn();
+
+    await expect(
+      build(db, jest.fn(), config(), postBearer).verifyInvoiceWithEims(INVOICE_ID),
+    ).rejects.toThrow(/no EIMS IRN to verify/);
+    expect(postBearer).not.toHaveBeenCalled();
+  });
+});
+
+describe("EimsInvoiceRegistrationService.resolveEimsRegistration", () => {
+  const blocked = () =>
+    new FakeDb(
+      [
+        invoiceRow({
+          eimsStatus: EimsInvoiceStatus.Unknown,
+          eimsInvoiceCounter: 7,
+          eimsDocumentNumber: DOCUMENT_NUMBER,
+        }),
+      ],
+      {
+      inFlightInvoiceId: INVOICE_ID,
+      inFlightCounter: 7,
+      nextInvoiceCounter: 8,
+      blockedReason: "never acknowledged",
+    });
+
+  it("records a confirmed IRN, resumes the chain and clears the block", async () => {
+    const db = blocked();
+    const postBearer = jest.fn().mockResolvedValue(verifyResponse());
+
+    const view = await build(db, jest.fn(), config(), postBearer).resolveEimsRegistration(
+      INVOICE_ID,
+      { irn: IRN },
+    );
+
+    // The IRN is confirmed at the gateway before it is ever written.
+    expect(postBearer).toHaveBeenCalledWith("/v1/verify", { irn: IRN });
+    expect(view).toMatchObject({ eimsStatus: EimsInvoiceStatus.Registered, eimsIrn: IRN });
+    expect(db.state).toMatchObject({
+      previousIrn: IRN,
+      inFlightInvoiceId: null,
+      blockedReason: null,
+    });
+  });
+
+  it("refuses an IRN the gateway answers with a different one, leaving the block intact", async () => {
+    const db = blocked();
+    const postBearer = jest
+      .fn()
+      .mockResolvedValue(verifyResponse({ Irn: "0000000000000000000000000000000000000000" }));
+
+    await expect(
+      build(db, jest.fn(), config(), postBearer).resolveEimsRegistration(INVOICE_ID, { irn: IRN }),
+    ).rejects.toThrow(/answered the lookup for IRN/);
+
+    expect(db.invoices.get(INVOICE_ID)).toMatchObject({
+      eimsStatus: EimsInvoiceStatus.Unknown,
+      eimsIrn: null,
+    });
+    expect(db.state).toMatchObject({
+      inFlightInvoiceId: INVOICE_ID,
+      blockedReason: "never acknowledged",
+      previousIrn: null,
+    });
+  });
+
+  it("refuses an IRN whose document number is not this invoice, leaving the block intact", async () => {
+    const db = blocked();
+    const postBearer = jest.fn().mockResolvedValue(
+      verifyResponse({
+        DocumentDetails: { Type: "INV", DocumentNumber: "99999" },
+      }),
+    );
+
+    await expect(
+      build(db, jest.fn(), config(), postBearer).resolveEimsRegistration(INVOICE_ID, { irn: IRN }),
+    ).rejects.toThrow(/not 5/);
+
+    expect(db.invoices.get(INVOICE_ID)).toMatchObject({
+      eimsStatus: EimsInvoiceStatus.Unknown,
+      eimsIrn: null,
+    });
+    expect(db.state).toMatchObject({
+      inFlightInvoiceId: INVOICE_ID,
+      blockedReason: "never acknowledged",
+      previousIrn: null,
+    });
+  });
+
+  it("refuses an IRN the gateway does not acknowledge at all", async () => {
+    const db = blocked();
+    const postBearer = jest.fn().mockResolvedValue({ statusCode: 200, body: {} });
+
+    await expect(
+      build(db, jest.fn(), config(), postBearer).resolveEimsRegistration(INVOICE_ID, { irn: IRN }),
+    ).rejects.toThrow(/returned no Irn/);
+    expect(db.state!.blockedReason).toBe("never acknowledged");
+  });
+
+  it("discards the attempt, leaving the chain where it was", async () => {
+    const db = blocked();
+    const postBearer = jest.fn();
+
+    const view = await build(db, jest.fn(), config(), postBearer).resolveEimsRegistration(
+      INVOICE_ID,
+      { discard: true },
+    );
+
+    expect(view).toMatchObject({ eimsStatus: EimsInvoiceStatus.Failed, eimsIrn: null });
+    expect(postBearer).not.toHaveBeenCalled(); // nothing to confirm
+    expect(db.state).toMatchObject({
+      previousIrn: null,
+      inFlightInvoiceId: null,
+      blockedReason: null,
+    });
+  });
+
+  it("refuses to resolve an invoice that is not the in-flight one", async () => {
+    const db = blocked();
+    db.invoices.set(
+      OTHER_INVOICE_ID,
+      invoiceRow({ id: OTHER_INVOICE_ID, eimsDocumentNumber: "6" }),
+    );
+    const postBearer = jest.fn().mockResolvedValue(verifyResponse());
+
+    await expect(
+      build(db, jest.fn(), config(), postBearer).resolveEimsRegistration(OTHER_INVOICE_ID, {
+        irn: IRN,
+      }),
+    ).rejects.toThrow(/in-flight EIMS submission is invoice/);
+  });
+
+  it("requires either an IRN or an explicit discard", async () => {
+    await expect(
+      build(blocked(), jest.fn()).resolveEimsRegistration(INVOICE_ID, {}),
+    ).rejects.toBeInstanceOf(BadRequestException);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/eims/eims-invoice-registration.service.ts b/apps/edr-freight-api/src/modules/eims/eims-invoice-registration.service.ts
new file mode 100644
index 000000000..64854bf53
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-invoice-registration.service.ts
@@ -0,0 +1,588 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  Logger,
+  NotFoundException,
+} from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { InjectDataSource } from "@nestjs/typeorm";
+import { DataSource, EntityManager } from "typeorm";
+import type { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity.js";
+
+import { EimsConfig } from "../../config/eims.config";
+import { Invoice } from "../billing/entities/invoice.entity";
+import {
+  EimsInvoiceRequest,
+  EimsMapperLine,
+  toEimsInvoice,
+} from "../billing/eims-invoice.mapper";
+import { NotificationAudience, NotificationPriority, NotificationType } from "@edr/types";
+import { NotificationInboxService } from "../notification-inbox/notification-inbox.service";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
+import { EimsAuthService } from "./eims-auth.service";
+import { EimsClientService } from "./eims-client.service";
+import { EimsApiException } from "./eims.errors";
+import { EimsSystemState } from "./entities/eims-system-state.entity";
+import {
+  assertEimsInvoiceConfig,
+  buildEimsContext,
+  buildEimsSeller,
+} from "./eims-invoice-context";
+import {
+  EimsInvoiceError,
+  EimsInvoiceStatus,
+  EimsInvoiceStatusView,
+  EimsRegisterResponse,
+  EimsVerifyRequest,
+  EimsVerifyResponse,
+} from "./eims-registration.types";
+
+/**
+ * Failure kinds where the gateway gave a complete answer: the document was rejected and is
+ * definitively not registered. These clear the system-wide block; anything else does not.
+ */
+const DETERMINISTIC_KINDS = new Set(["SCHEMA_VALIDATION", "RULE_VALIDATION", "AUTH", "FORBIDDEN"]);
+
+interface Reservation {
+  stateId: string;
+  invoiceCounter: number;
+  /** MoR requires a plain integer here, so it cannot be our own `invoiceNumber`. */
+  documentNumber: string;
+  previousIrn: string;
+}
+
+/**
+ * Registers a single invoice with MoR EIMS.
+ *
+ * Sequencing is a **durable reservation**: the counter is consumed and the holder recorded in a
+ * committed transaction *before* the request leaves the process, and the network call happens
+ * outside any transaction. That gives three properties the naive design could not:
+ *
+ *  - a counter is never reused once an attempt has begun, even across a crash;
+ *  - a crash mid-flight leaves the reservation standing, so nothing blindly resubmits a document
+ *    that may already have reached MoR;
+ *  - an ambiguous result blocks every invoice for the system number, not just its own, because
+ *    `PreviousIrn` is unknown and any later document would chain to a stale IRN.
+ *
+ * Signing, authentication and error normalisation belong to `EimsClientService`. Manual only —
+ * nothing in invoice creation calls this.
+ */
+@Injectable()
+export class EimsInvoiceRegistrationService {
+  private readonly logger = new Logger(EimsInvoiceRegistrationService.name);
+
+  constructor(
+    @InjectDataSource() private readonly dataSource: DataSource,
+    private readonly config: ConfigService,
+    private readonly client: EimsClientService,
+    private readonly auth: EimsAuthService,
+    private readonly inbox: NotificationInboxService,
+  ) {}
+
+  private get cfg(): EimsConfig {
+    return this.config.get<EimsConfig>("eims")!;
+  }
+
+  async registerInvoiceWithEims(invoiceId: string): Promise<EimsInvoiceStatusView> {
+    const cfg = this.cfg;
+    // Static seller/tax configuration is validated before anything is locked, allocated or sent.
+    assertEimsInvoiceConfig(cfg);
+
+    const invoice = await this.loadInvoiceForMapping(invoiceId);
+    if (invoice.eimsIrn) return this.toView(invoice);
+
+    // Authenticate before reserving: the source system comes from the token, and the state row is
+    // keyed by it. A login failure here costs nothing — no counter has been consumed yet.
+    const session = await this.auth.getSessionContext();
+
+    const reservation = await this.reserve(invoiceId, session.systemNumber);
+    if (!reservation) return this.getEimsStatus(invoiceId);
+
+    // The request can only be built now: InvoiceCounter and PreviousIrn come from the reservation.
+    const request = toEimsInvoice(
+      invoice,
+      buildEimsSeller(cfg),
+      buildEimsContext(cfg, {
+        // Allocated from the system state, not our invoiceNumber: MoR validates DocumentNumber
+        // against ^(0|[1-9][0-9]{0,8})$, which "INV-20260807-00006" can never satisfy.
+        documentNumber: reservation.documentNumber,
+        invoiceCounter: reservation.invoiceCounter,
+        previousIrn: reservation.previousIrn,
+        session,
+      }),
+    );
+
+    let irn: string;
+    let ackDate: string | undefined;
+    try {
+      // Deliberately outside every transaction — no DB lock is held across the wire.
+      const result = await this.submit(request);
+      irn = result.irn;
+      ackDate = result.ackDate;
+    } catch (err) {
+      await this.settleFailure(invoiceId, reservation, err);
+      throw err;
+    }
+
+    await this.settleSuccess(invoiceId, reservation, irn, ackDate);
+    this.logger.log(
+      `Invoice ${invoice.invoiceNumber} registered with EIMS (counter ${reservation.invoiceCounter})`,
+    );
+    return this.getEimsStatus(invoiceId);
+  }
+
+  /**
+   * Verify a registered invoice at `POST /v1/verify`.
+   *
+   * Requires a stored IRN. An invoice whose submission was never acknowledged cannot be reconciled
+   * here — the gateway offers no lookup by document number — so it must be resolved with MoR and
+   * recorded through `resolveEimsRegistration`.
+   */
+  async verifyInvoiceWithEims(invoiceId: string): Promise<EimsVerifyResponse> {
+    const invoice = await this.loadInvoiceRow(this.dataSource.manager, invoiceId);
+    if (!invoice.eimsIrn) {
+      throw new BadRequestException({
+        code: "EIMS_NO_IRN",
+        message:
+          `Invoice ${invoice.invoiceNumber} has no EIMS IRN to verify (status ${invoice.eimsStatus}). ` +
+          "EIMS can only be queried by IRN, so an unacknowledged submission must be resolved with MoR first.",
+      });
+    }
+    return this.queryVerify(invoice.eimsIrn);
+  }
+
+  /**
+   * `POST /v1/verify` for one IRN, with the one check that always applies: the gateway must echo
+   * an `Irn` back. A 200 without it is not a confirmation of anything.
+   *
+   * The request property is lowercase `irn`; the response spells it `Irn`. The two are never
+   * compared — the supplied collection's own fixture uses different example values on each side,
+   * so equality there would assert a property of the mock rather than of the gateway.
+   *
+   * Bearer-authenticated but unsigned, via `postBearer` — see that method for why.
+   */
+  private async queryVerify(irn: string): Promise<EimsVerifyResponse> {
+    const response = await this.client.postBearer<EimsVerifyRequest, EimsVerifyResponse>(
+      "/v1/verify",
+      { irn },
+    );
+    if (!response?.body?.Irn?.trim()) {
+      throw new EimsApiException(
+        "SCHEMA_VALIDATION",
+        "EIMS verify returned no Irn in its response body",
+        response?.statusCode,
+      );
+    }
+    return response;
+  }
+
+  /**
+   * Refuse a manual resolution unless the gateway confirms *both* halves of the claim: that this
+   * IRN is the one it holds, and that it belongs to this invoice.
+   *
+   * The document-number check is against `DocumentDetails.DocumentNumber`, which registration
+   * allocated and stored on the invoice as `eimsDocumentNumber` — the only field tying an IRN back
+   * to a row in this database.
+   *
+   * Recording a wrong IRN is not a local mistake: it marks an unregistered invoice as filed and
+   * chains every later document to a stranger's reference, so both checks are refusals rather
+   * than warnings.
+   */
+  private async assertIrnBelongsToInvoice(
+    irn: string,
+    expectedDocumentNumber: string,
+  ): Promise<void> {
+    const response = await this.queryVerify(irn);
+    const returnedIrn = response.body?.Irn?.trim();
+    const documentNumber = response.body?.DocumentDetails?.DocumentNumber?.trim();
+
+    if (returnedIrn !== irn) {
+      throw new ConflictException({
+        code: "EIMS_RESOLVE_IRN_MISMATCH",
+        message:
+          `EIMS answered the lookup for IRN ${irn} with ${returnedIrn ?? "(none)"}. ` +
+          "Refusing to record it — recheck the IRN in the MoR portal.",
+      });
+    }
+
+    if (documentNumber !== expectedDocumentNumber) {
+      throw new ConflictException({
+        code: "EIMS_RESOLVE_DOCUMENT_MISMATCH",
+        message:
+          `EIMS reports IRN ${irn} against document ${documentNumber ?? "(none)"}, not ` +
+          `${expectedDocumentNumber}. Refusing to record it — recheck the IRN in the MoR portal.`,
+      });
+    }
+  }
+
+  /**
+   * Manual reconciliation of a blocked system number.
+   *
+   * With an `irn` (found in the MoR portal) the invoice is recorded as registered and the chain
+   * resumes from it. With `discard` the invoice is marked failed and the chain resumes from the
+   * previous IRN. Either way the block is cleared — this is the only exit from an ambiguous result.
+   *
+   * An IRN is never taken on trust: it is verified at the gateway first, and the document it
+   * belongs to must be *this* invoice. A transposed digit would otherwise chain every later
+   * document to a stranger's IRN and mark this invoice registered when it is not.
+   */
+  async resolveEimsRegistration(
+    invoiceId: string,
+    input: { irn?: string; discard?: boolean },
+  ): Promise<EimsInvoiceStatusView> {
+    const irn = input.irn?.trim();
+    if (!irn && !input.discard) {
+      throw new BadRequestException({
+        code: "EIMS_RESOLVE_INPUT_REQUIRED",
+        message: "Provide the IRN confirmed with MoR, or discard: true to abandon the submission",
+      });
+    }
+
+    // Cheap ownership check before touching the gateway: resolving an invoice that does not hold
+    // the reservation is a caller mistake, not something to spend a MoR round trip on. The
+    // authoritative re-check happens under lock in the transaction below.
+    const [preState]: { in_flight_invoice_id: string | null }[] = await this.dataSource.query(
+      `SELECT in_flight_invoice_id FROM freight.eims_system_state
+        WHERE system_number = $1 AND deleted_at IS NULL LIMIT 1`,
+      [(await this.auth.getSessionContext()).systemNumber],
+    );
+    if (preState?.in_flight_invoice_id && preState.in_flight_invoice_id !== invoiceId) {
+      throw new ConflictException({
+        code: "EIMS_RESOLVE_WRONG_INVOICE",
+        message: `The in-flight EIMS submission is invoice ${preState.in_flight_invoice_id}, not ${invoiceId}`,
+      });
+    }
+
+    // Outside the transaction: no lock is held across the wire, and a refused verification must
+    // leave the block exactly as it was.
+    if (irn) {
+      const invoice = await this.loadInvoiceRow(this.dataSource.manager, invoiceId);
+      if (!invoice.eimsDocumentNumber) {
+        throw new BadRequestException({
+          code: "EIMS_NO_DOCUMENT_NUMBER",
+          message:
+            `Invoice ${invoice.invoiceNumber} was never allocated an EIMS document number, so a ` +
+            "returned IRN cannot be tied back to it.",
+        });
+      }
+      await this.assertIrnBelongsToInvoice(irn, invoice.eimsDocumentNumber);
+    }
+
+    // Same source of truth as registration: the state row is keyed by the token's system number.
+    const session = await this.auth.getSessionContext();
+
+    await this.dataSource.transaction(async (manager) => {
+      const state = await this.lockSystemState(manager, session.systemNumber);
+      if (state.inFlightInvoiceId && state.inFlightInvoiceId !== invoiceId) {
+        throw new ConflictException({
+          code: "EIMS_RESOLVE_WRONG_INVOICE",
+          message: `The in-flight EIMS submission is invoice ${state.inFlightInvoiceId}, not ${invoiceId}`,
+        });
+      }
+      const invoice = await this.lockInvoice(manager, invoiceId);
+      if (invoice.eimsIrn) {
+        throw new ConflictException({
+          code: "EIMS_ALREADY_REGISTERED",
+          message: `Invoice ${invoice.invoiceNumber} already has IRN ${invoice.eimsIrn}`,
+        });
+      }
+
+      await manager.update(Invoice, invoiceId, {
+        eimsStatus: irn ? EimsInvoiceStatus.Registered : EimsInvoiceStatus.Failed,
+        eimsIrn: irn ?? null,
+      });
+      await manager.update(EimsSystemState, state.id, {
+        // Only a confirmed IRN may advance the chain; a discard leaves it where it was.
+        ...(irn ? { previousIrn: irn } : {}),
+        inFlightInvoiceId: null,
+        inFlightCounter: null,
+        inFlightDocumentNumber: null,
+        blockedReason: null,
+      });
+    });
+
+    this.logger.warn(
+      `EIMS block on invoice ${invoiceId} resolved manually (${irn ? "IRN recorded" : "discarded"})`,
+    );
+    return this.getEimsStatus(invoiceId);
+  }
+
+  async getEimsStatus(invoiceId: string): Promise<EimsInvoiceStatusView> {
+    return this.toView(await this.loadInvoiceRow(this.dataSource.manager, invoiceId));
+  }
+
+  // ── transactions ─────────────────────────────────────────────────────────────────────────────
+
+  /**
+   * TX1. Consume a counter and record the holder, committed before any HTTP call. Returns `null`
+   * when the invoice turned out to be registered already (checked under the lock).
+   */
+  private async reserve(invoiceId: string, systemNumber: string): Promise<Reservation | null> {
+    return this.dataSource.transaction(async (manager) => {
+      const state = await this.lockSystemState(manager, systemNumber);
+
+      if (state.blockedReason) {
+        throw new ConflictException({
+          code: "EIMS_SYSTEM_BLOCKED",
+          message:
+            `EIMS registration is blocked for system ${systemNumber}: ${state.blockedReason}. ` +
+            "Resolve the affected invoice before registering anything else.",
+        });
+      }
+      if (state.inFlightInvoiceId) {
+        throw new ConflictException({
+          code: "EIMS_SUBMISSION_IN_FLIGHT",
+          message:
+            `A submission for invoice ${state.inFlightInvoiceId} is already in flight on system ` +
+            `${systemNumber}. Wait for it to settle, or resolve it if the process was interrupted.`,
+        });
+      }
+
+      const invoice = await this.lockInvoice(manager, invoiceId);
+      if (invoice.eimsIrn) return null;
+
+      const invoiceCounter = Number(state.nextInvoiceCounter);
+      const documentNumber = String(Number(state.nextDocumentNumber));
+      const previousIrn = state.previousIrn ?? "";
+
+      // Counter consumed here, not on success: once an attempt begins it can never be reused,
+      // whatever happens next. A gap is harmless at MoR; a collision is not.
+      await manager.update(EimsSystemState, state.id, {
+        nextInvoiceCounter: invoiceCounter + 1,
+        nextDocumentNumber: Number(documentNumber) + 1,
+        inFlightInvoiceId: invoiceId,
+        inFlightCounter: invoiceCounter,
+        inFlightDocumentNumber: Number(documentNumber),
+      });
+      await manager.update(Invoice, invoiceId, {
+        eimsStatus: EimsInvoiceStatus.Submitting,
+        eimsInvoiceCounter: invoiceCounter,
+        eimsDocumentNumber: documentNumber,
+        eimsSubmittedAt: new Date(),
+        eimsLastError: null,
+      });
+
+      return { stateId: state.id, invoiceCounter, documentNumber, previousIrn };
+    });
+  }
+
+  /** TX2a. Record the IRN, advance the chain, release the reservation. */
+  private async settleSuccess(
+    invoiceId: string,
+    reservation: Reservation,
+    irn: string,
+    ackDate?: string,
+  ): Promise<void> {
+    await this.dataSource.transaction(async (manager) => {
+      await this.lockInvoice(manager, invoiceId);
+      await manager.update(Invoice, invoiceId, {
+        eimsStatus: EimsInvoiceStatus.Registered,
+        eimsIrn: irn,
+        eimsAckDate: ackDate ?? null,
+        eimsLastError: null,
+      });
+      await manager.update(EimsSystemState, reservation.stateId, {
+        previousIrn: irn,
+        inFlightInvoiceId: null,
+        inFlightCounter: null,
+        inFlightDocumentNumber: null,
+        blockedReason: null,
+      });
+    });
+  }
+
+  /**
+   * TX2b. A deterministic rejection releases the reservation **and returns the counter**; an
+   * ambiguous result keeps both and blocks the system number, because `PreviousIrn` is now unknown
+   * for every later document.
+   *
+   * The two numbers move differently, because MoR constrains them differently:
+   *
+   *  - `InvoiceCounter` must not **skip** — "Invoice counter is not correct. expected : 1". A
+   *    document MoR definitively refused was never counted there, so ours must not advance either.
+   *  - `DocumentNumber` must not **repeat** — the documented rule is "Document number is not
+   *    unique". It is therefore spent by the attempt itself and never handed back, even for a
+   *    refusal.
+   *
+   * An ambiguous result keeps both: MoR may have counted and stored the document.
+   */
+  private async settleFailure(
+    invoiceId: string,
+    reservation: Reservation,
+    err: unknown,
+  ): Promise<void> {
+    const api = err instanceof EimsApiException ? err : null;
+    const deterministic = api ? DETERMINISTIC_KINDS.has(api.kind) : false;
+    const status = deterministic ? EimsInvoiceStatus.Failed : EimsInvoiceStatus.Unknown;
+    const lastError: EimsInvoiceError = {
+      kind: api?.kind ?? "UNKNOWN",
+      message: (err as Error)?.message ?? "unknown error",
+      httpStatus: api?.httpStatus,
+      details: api?.details,
+      at: new Date().toISOString(),
+    };
+
+    await this.dataSource.transaction(async (manager) => {
+      await manager.update(Invoice, invoiceId, {
+        eimsStatus: status,
+        eimsLastError: lastError,
+      } as QueryDeepPartialEntity<Invoice>);
+
+      await manager.update(
+        EimsSystemState,
+        reservation.stateId,
+        deterministic
+          ? {
+              // Counter returns (MoR never counted a refused document); the document number does
+              // not (MoR requires it to be unique, so it is burned by the attempt).
+              nextInvoiceCounter: reservation.invoiceCounter,
+              inFlightInvoiceId: null,
+              inFlightCounter: null,
+              inFlightDocumentNumber: null,
+              blockedReason: null,
+            }
+          : {
+              blockedReason:
+                `Invoice ${invoiceId} was submitted with counter ${reservation.invoiceCounter} but ` +
+                `never acknowledged (${lastError.kind}). Its IRN is unknown, so no further document ` +
+                "can be chained until it is resolved with MoR.",
+            },
+      );
+    });
+
+    this.logger.error(`Invoice ${invoiceId} EIMS registration ${status}: ${lastError.message}`);
+    await this.alertStaff(invoiceId, status, lastError, deterministic);
+  }
+
+  /**
+   * Tell the people who can act about a failed filing.
+   *
+   * An ambiguous result is the urgent one: it blocks *every* further invoice for this system
+   * number until a human resolves it, and nothing else in the system would surface that — the
+   * sweep just goes quiet. A deterministic rejection affects one invoice, so it is normal
+   * priority. Never throws: an alert that fails must not mask the filing outcome.
+   */
+  private async alertStaff(
+    invoiceId: string,
+    status: EimsInvoiceStatus,
+    error: EimsInvoiceError,
+    deterministic: boolean,
+  ): Promise<void> {
+    try {
+      await this.inbox.notify({
+        recipients: { permissionKeys: [FREIGHT_PERMS.invoices.eimsResolve] },
+        audience: NotificationAudience.BACKOFFICE,
+        type: NotificationType.GENERIC,
+        priority: deterministic ? NotificationPriority.NORMAL : NotificationPriority.HIGH,
+        title: deterministic
+          ? "EIMS rejected an invoice"
+          : "EIMS filing unresolved — all further filing is blocked",
+        body: deterministic
+          ? `MoR rejected the filing (${error.kind}): ${error.message}. The invoice is marked FAILED; correct it and file again.`
+          : `A submission was sent but never acknowledged (${error.kind}). Its IRN is unknown, so no further invoice can be filed until it is resolved with MoR.`,
+        link: `/dashboard/invoices/${invoiceId}`,
+        data: { invoiceId, eimsStatus: status, kind: error.kind, action: "EIMS_FILING_FAILED" },
+      });
+    } catch (err) {
+      this.logger.warn(`EIMS staff alert failed for invoice ${invoiceId}: ${(err as Error).message}`);
+    }
+  }
+
+  // ── internals ────────────────────────────────────────────────────────────────────────────────
+
+  /** A non-empty IRN is the only success signal; anything else is a failed registration. */
+  private async submit(request: EimsInvoiceRequest): Promise<{ irn: string; ackDate?: string }> {
+    const response = await this.client.postSigned<EimsInvoiceRequest, EimsRegisterResponse>(
+      "/v1/register",
+      request,
+    );
+    const irn = response?.body?.irn;
+    if (!irn) {
+      // The gateway answered, so this is deterministic: the document is not registered.
+      throw new EimsApiException(
+        "SCHEMA_VALIDATION",
+        `EIMS register returned no IRN${response?.body?.errorMessage ? `: ${response.body.errorMessage}` : ""}`,
+        response?.statusCode,
+      );
+    }
+    return { irn, ackDate: response.body?.ackDate };
+  }
+
+  private async lockInvoice(manager: EntityManager, invoiceId: string): Promise<Invoice> {
+    const invoice = await manager
+      .createQueryBuilder(Invoice, "invoice")
+      .setLock("pessimistic_write")
+      .where("invoice.id = :invoiceId", { invoiceId })
+      .getOne();
+    if (!invoice) throw new NotFoundException(`Invoice ${invoiceId} not found`);
+    return invoice;
+  }
+
+  /** Locks the system-state row, creating it on first use. */
+  private async lockSystemState(
+    manager: EntityManager,
+    systemNumber: string,
+  ): Promise<EimsSystemState> {
+    const select = () =>
+      manager
+        .createQueryBuilder(EimsSystemState, "state")
+        .setLock("pessimistic_write")
+        .where("state.system_number = :systemNumber", { systemNumber })
+        .getOne();
+
+    const existing = await select();
+    if (existing) return existing;
+
+    await manager.query(
+      `INSERT INTO freight.eims_system_state (system_number) VALUES ($1)
+       ON CONFLICT (system_number) DO NOTHING`,
+      [systemNumber],
+    );
+    const created = await select();
+    if (!created) throw new Error(`Could not initialise EIMS system state for ${systemNumber}`);
+    return created;
+  }
+
+  /** Header + buyer + lines — everything the mapper needs. */
+  private async loadInvoiceForMapping(
+    invoiceId: string,
+  ): Promise<Invoice & { lines: EimsMapperLine[] }> {
+    const invoice = await this.dataSource.getRepository(Invoice).findOne({
+      where: { id: invoiceId },
+      relations: { company: true, companyProfile: true },
+    });
+    if (!invoice) throw new NotFoundException(`Invoice ${invoiceId} not found`);
+
+    const lines: EimsMapperLine[] = await this.dataSource.query(
+      `SELECT charge_type AS "chargeType", description, quantity, unit_rate AS "unitRate",
+              amount, currency, metadata
+         FROM freight.invoice_lines
+        WHERE invoice_id = $1 AND deleted_at IS NULL
+        ORDER BY created_at ASC`,
+      [invoiceId],
+    );
+    return Object.assign(invoice, { lines });
+  }
+
+  private async loadInvoiceRow(manager: EntityManager, invoiceId: string): Promise<Invoice> {
+    const invoice = await manager.findOne(Invoice, { where: { id: invoiceId } });
+    if (!invoice) throw new NotFoundException(`Invoice ${invoiceId} not found`);
+    return invoice;
+  }
+
+  private toView(invoice: Invoice): EimsInvoiceStatusView {
+    const counter = invoice.eimsInvoiceCounter;
+    return {
+      invoiceId: invoice.id,
+      invoiceNumber: invoice.invoiceNumber,
+      eimsStatus: invoice.eimsStatus ?? EimsInvoiceStatus.NotSubmitted,
+      eimsIrn: invoice.eimsIrn ?? null,
+      eimsDocumentNumber: invoice.eimsDocumentNumber ?? null,
+      eimsInvoiceCounter: counter === null || counter === undefined ? null : Number(counter),
+      eimsSubmittedAt: invoice.eimsSubmittedAt ?? null,
+      eimsAckDate: invoice.eimsAckDate ?? null,
+      eimsLastError: invoice.eimsLastError ?? null,
+    };
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-invoice.controller.ts b/apps/edr-freight-api/src/modules/eims/eims-invoice.controller.ts
new file mode 100644
index 000000000..f47cfe9d9
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-invoice.controller.ts
@@ -0,0 +1,68 @@
+import { Body, Controller, Get, 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 { ResolveEimsRegistrationDto } from "./dto/resolve-eims-registration.dto";
+import { EimsInvoiceRegistrationService } from "./eims-invoice-registration.service";
+
+/**
+ * Manual EIMS actions on an existing invoice.
+ *
+ * Invoices are produced by the freight workflow, not by a person, so these routes are **not** the
+ * normal production path — they exist for controlled testing and exceptional operations. Automatic
+ * submission after an invoice is issued is a separate phase; nothing here is called by it.
+ *
+ * `eims_register` and `eims_resolve` are intentionally left out of every role preset and assigned
+ * to named admins instead. They are also separate permissions: resolving clears the system-wide
+ * chain block and can record an IRN against an invoice, which is a supervisor action, not an
+ * operational one. Only `eims/status` rides on the ordinary `invoices:view`.
+ *
+ * Filing gets its own permission (`invoices:eims_register`) rather than riding on an existing key:
+ * registration is irreversible at MoR, so it must not follow from the right to download a PDF.
+ * The key is seeded through FINANCE_PERMISSIONS, which reaches `iam.permissions` via
+ * ADVANCED_BACKOFFICE_PERMISSIONS → BOOKING_RULE_ENGINE_PERMISSIONS → EDR_FREIGHT_PERMISSIONS.
+ */
+@ApiTags("eims")
+@ApiBearerAuth()
+@Controller("invoices")
+export class EimsInvoiceController {
+  constructor(private readonly registration: EimsInvoiceRegistrationService) {}
+
+  @Post(":id/eims/register")
+  @BookingStaff(FREIGHT_PERMS.invoices.eimsRegister)
+  @ApiOperation({
+    summary:
+      "Register the invoice with MoR EIMS. Idempotent — an invoice that already has an IRN is returned unchanged.",
+  })
+  register(@Param("id", ParseUUIDPipe) id: string) {
+    return this.registration.registerInvoiceWithEims(id);
+  }
+
+  @Post(":id/eims/verify")
+  @BookingStaff(FREIGHT_PERMS.invoices.eimsRegister)
+  @ApiOperation({ summary: "Verify the invoice's stored IRN against EIMS" })
+  verify(@Param("id", ParseUUIDPipe) id: string) {
+    return this.registration.verifyInvoiceWithEims(id);
+  }
+
+  @Post(":id/eims/resolve")
+  @BookingStaff(FREIGHT_PERMS.invoices.eimsResolve)
+  @ApiOperation({
+    summary:
+      "Resolve an unacknowledged submission: record the IRN confirmed with MoR, or discard it. Clears the system-wide block.",
+  })
+  resolve(
+    @Param("id", ParseUUIDPipe) id: string,
+    @Body() dto: ResolveEimsRegistrationDto,
+  ) {
+    return this.registration.resolveEimsRegistration(id, dto);
+  }
+
+  @Get(":id/eims/status")
+  @BookingStaff(FREIGHT_PERMS.invoices.view)
+  @ApiOperation({ summary: "EIMS registration status, IRN and last error for the invoice" })
+  status(@Param("id", ParseUUIDPipe) id: string) {
+    return this.registration.getEimsStatus(id);
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-registration.types.ts b/apps/edr-freight-api/src/modules/eims/eims-registration.types.ts
new file mode 100644
index 000000000..c4d9f3842
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-registration.types.ts
@@ -0,0 +1,89 @@
+import { EimsErrorResponse } from "./eims.types";
+
+/**
+ * Registration state of one invoice at MoR EIMS.
+ *
+ * `UNKNOWN` is not a synonym for failure: the request left this process and no answer came back,
+ * so the invoice may or may not be registered at the gateway. It is never auto-retried — a resend
+ * would risk a duplicate registration.
+ */
+export enum EimsInvoiceStatus {
+  NotSubmitted = "NOT_SUBMITTED",
+  Submitting = "SUBMITTING",
+  Registered = "REGISTERED",
+  Failed = "FAILED",
+  Unknown = "UNKNOWN",
+}
+
+/** `body` of a successful `POST /v1/register`, as observed in the collection. */
+export interface EimsRegisterResponseBody {
+  irn: string;
+  ackDate?: string;
+  signedQR?: string;
+  signedInvoice?: string;
+  status?: string;
+  documentNumber?: string;
+  errorMessage?: string | null;
+}
+
+export interface EimsRegisterResponse {
+  statusCode?: number;
+  message?: string;
+  body?: EimsRegisterResponseBody;
+}
+
+/**
+ * Inner request of `POST /v1/verify`. The wire property is lowercase `irn` and is required —
+ * omitting it yields a 400 "SCHEMA ERROR" reporting `$: required property 'irn' not found`.
+ */
+export interface EimsVerifyRequest {
+  irn: string;
+}
+
+/**
+ * `body` of a successful `POST /v1/verify` — the stored document echoed back. Note the casing
+ * flip against the request: the response spells the reference `Irn`.
+ *
+ * Only the fields we actually assert on are typed; the rest of the echoed document (SellerDetails,
+ * BuyerDetails, ItemList, …) is carried through untyped because nothing here reads it.
+ */
+export interface EimsVerifyResponseBody {
+  Irn?: string;
+  TransactionType?: string;
+  DocumentDetails?: {
+    Type?: string;
+    DocumentNumber?: string;
+    Date?: string;
+  };
+  Version?: string;
+  [section: string]: unknown;
+}
+
+export interface EimsVerifyResponse {
+  statusCode?: number;
+  message?: string;
+  body?: EimsVerifyResponseBody;
+}
+
+/** Persisted failure detail. Carries the gateway's own error fields only — never our envelope. */
+export interface EimsInvoiceError {
+  kind: string;
+  message: string;
+  httpStatus?: number;
+  details?: EimsErrorResponse;
+  at: string;
+}
+
+/** What the status endpoint returns, and what a later invoice-detail panel will render. */
+export interface EimsInvoiceStatusView {
+  invoiceId: string;
+  invoiceNumber: string;
+  eimsStatus: EimsInvoiceStatus;
+  eimsIrn: string | null;
+  /** The numeric DocumentNumber filed with MoR; not our own invoiceNumber. */
+  eimsDocumentNumber: string | null;
+  eimsInvoiceCounter: number | null;
+  eimsSubmittedAt: Date | null;
+  eimsAckDate: string | null;
+  eimsLastError: EimsInvoiceError | null;
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims-signer.service.spec.ts b/apps/edr-freight-api/src/modules/eims/eims-signer.service.spec.ts
new file mode 100644
index 000000000..5e408ddf7
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-signer.service.spec.ts
@@ -0,0 +1,118 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { createVerify, generateKeyPairSync } from "node:crypto";
+import { ConfigService } from "@nestjs/config";
+import { EimsCredentialsProvider } from "./eims-credentials.provider";
+import { EimsSignerService, toSignedBody } from "./eims-signer.service";
+
+/**
+ * Test-only key material: generated per run, never a production key. The "certificate" fixture is
+ * an arbitrary byte blob — the point is that its exact bytes survive base64 round-tripping, not
+ * that it is a valid X.509 chain.
+ */
+const CERTIFICATE_FIXTURE = "Subject: CN=TEST\n-----BEGIN CERTIFICATE-----\nZm9vYmFy\n-----END CERTIFICATE-----\n";
+
+let dir: string;
+let keyPath: string;
+let certPath: string;
+let publicKeyPem: string;
+let signer: EimsSignerService;
+
+beforeAll(() => {
+  dir = mkdtempSync(join(tmpdir(), "eims-signer-"));
+  keyPath = join(dir, "private_key.key");
+  certPath = join(dir, "certificate.pem.txt");
+
+  const { privateKey, publicKey } = generateKeyPairSync("rsa", { modulusLength: 2048 });
+  writeFileSync(keyPath, privateKey.export({ type: "pkcs8", format: "pem" }));
+  writeFileSync(certPath, CERTIFICATE_FIXTURE, "utf8");
+  publicKeyPem = publicKey.export({ type: "spki", format: "pem" }).toString();
+
+  const config = {
+    get: () => ({ privateKeyPath: keyPath, certificatePath: certPath }),
+  } as unknown as ConfigService;
+  signer = new EimsSignerService(new EimsCredentialsProvider(config));
+});
+
+afterAll(() => rmSync(dir, { recursive: true, force: true }));
+
+const login = () => ({ clientId: "cid", clientSecret: "secret", apikey: "key", tin: "0000000000" });
+
+const verify = (payload: string, signature: string): boolean =>
+  createVerify("RSA-SHA512").update(payload, "utf8").verify(publicKeyPem, signature, "base64");
+
+describe("EimsSignerService", () => {
+  it("produces a signature that verifies against the matching public key", () => {
+    const signed = signer.signRequest(login());
+    expect(verify(JSON.stringify(signed.request), signed.signature)).toBe(true);
+  });
+
+  it("fails verification when a single request field changes", () => {
+    const signed = signer.signRequest(login());
+    const tampered = JSON.stringify({ ...signed.request, tin: "9999999999" });
+    expect(verify(tampered, signed.signature)).toBe(false);
+  });
+
+  it("emits a 256-byte signature for an RSA-2048 key", () => {
+    const signed = signer.signRequest(login());
+    expect(Buffer.from(signed.signature, "base64")).toHaveLength(256);
+  });
+
+  it("sends the certificate as base64 of the file's exact bytes", () => {
+    const signed = signer.signRequest(login());
+    expect(signed.certificate).toBe(readFileSync(certPath).toString("base64"));
+    expect(Buffer.from(signed.certificate, "base64").equals(readFileSync(certPath))).toBe(true);
+  });
+
+  it("signs the inner request only, and the wire body carries those exact bytes", () => {
+    const signed = signer.signRequest(login());
+    const body = toSignedBody(signed);
+
+    // The signed string appears verbatim inside the transmitted envelope.
+    expect(body).toContain(`"request":${JSON.stringify(signed.request)}`);
+    // Compact, never pretty-printed.
+    expect(body).not.toMatch(/\n/);
+    expect(JSON.parse(body)).toEqual({
+      request: login(),
+      signature: signed.signature,
+      certificate: signed.certificate,
+    });
+  });
+
+  it("does not mutate the request object", () => {
+    const request = login();
+    const signed = signer.signRequest(request);
+    expect(signed.request).toBe(request);
+    expect(request).toEqual(login());
+  });
+
+  it("reuses the loaded key and certificate across calls", () => {
+    const first = signer.signRequest(login());
+    const second = signer.signRequest(login());
+    // PKCS#1 v1.5 is deterministic: same key + same payload ⇒ identical signature.
+    expect(second.signature).toBe(first.signature);
+    expect(second.certificate).toBe(first.certificate);
+  });
+});
+
+describe("EimsCredentialsProvider", () => {
+  const providerFor = (paths: { privateKeyPath?: string; certificatePath?: string }) =>
+    new EimsCredentialsProvider({ get: () => paths } as unknown as ConfigService);
+
+  it("fails clearly when the key path is unset", () => {
+    expect(() => providerFor({}).getPrivateKey()).toThrow(/EIMS_PRIVATE_KEY_PATH is not set/);
+  });
+
+  it("fails clearly when the key file is missing", () => {
+    expect(() => providerFor({ privateKeyPath: join(dir, "nope.key") }).getPrivateKey()).toThrow(
+      /could not be read or parsed/,
+    );
+  });
+
+  it("fails clearly when the certificate file is empty", () => {
+    const emptyPath = join(dir, "empty.txt");
+    writeFileSync(emptyPath, "");
+    expect(() => providerFor({ certificatePath: emptyPath }).getCertificateBase64()).toThrow(/is empty/);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/eims/eims-signer.service.ts b/apps/edr-freight-api/src/modules/eims/eims-signer.service.ts
new file mode 100644
index 000000000..babec6b44
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-signer.service.ts
@@ -0,0 +1,37 @@
+import { createSign } from "node:crypto";
+import { Injectable } from "@nestjs/common";
+import { EimsCredentialsProvider } from "./eims-credentials.provider";
+import { EimsSignedRequest } from "./eims.types";
+
+/**
+ * Signs EIMS request objects, reproducing the process that produced a working live access token:
+ *
+ *   1. compact `JSON.stringify` of the **inner** request object only,
+ *   2. those exact UTF-8 bytes,
+ *   3. RSA + SHA-512 (`SHA512withRSA`, PKCS#1 v1.5 — Node's default RSA padding),
+ *   4. base64 of the raw signature bytes (256 bytes for an RSA-2048 key),
+ *   5. base64 of the certificate file's exact bytes.
+ *
+ * The outer `{request, signature, certificate}` envelope is never itself signed, and the request
+ * object is never mutated after serialization.
+ */
+@Injectable()
+export class EimsSignerService {
+  constructor(private readonly credentials: EimsCredentialsProvider) {}
+
+  signRequest<T>(request: T): EimsSignedRequest<T> {
+    const payload = JSON.stringify(request);
+    const signature = createSign("RSA-SHA512")
+      .update(payload, "utf8")
+      .sign(this.credentials.getPrivateKey(), "base64");
+
+    return { request, signature, certificate: this.credentials.getCertificateBase64() };
+  }
+}
+
+/**
+ * Exact wire body for a signed envelope. Serializing here (rather than handing axios an object)
+ * keeps one serializer in play: the `request` segment of this string is byte-identical to the
+ * string that was signed.
+ */
+export const toSignedBody = <T>(signed: EimsSignedRequest<T>): string => JSON.stringify(signed);
diff --git a/apps/edr-freight-api/src/modules/eims/eims-test-fixtures.ts b/apps/edr-freight-api/src/modules/eims/eims-test-fixtures.ts
new file mode 100644
index 000000000..edd079b51
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims-test-fixtures.ts
@@ -0,0 +1,80 @@
+import { EimsConfig, EimsInvoiceConfig } from "../../config/eims.config";
+
+/**
+ * Fixtures shared by the EIMS specs.
+ *
+ * Deliberately not a `.spec.ts`: importing fixtures from a spec file makes jest execute that
+ * file's `describe` blocks inside every importing suite, so the same tests run — and report —
+ * twice.
+ */
+
+export const EIMS_SYSTEM_NUMBER = "B0360154BA";
+export const EIMS_SYSTEM_TYPE = "SYS";
+
+export const eimsInvoiceConfig = (over: Partial<EimsInvoiceConfig> = {}): EimsInvoiceConfig => ({
+  sellerLegalName: "Ethio-Djibouti Railway S.C.",
+  sellerVatNumber: "0000000000",
+  sellerPhone: "0911223344",
+  sellerEmail: "finance@example.et",
+  sellerRegion: "13",
+  sellerWereda: "574",
+  sellerCity: null,
+  sellerSubCity: null,
+  sellerHouseNumber: null,
+  sellerLocality: null,
+  taxCode: "VAT15",
+  taxRatePercent: 15,
+  exciseTaxValue: 0,
+  incomeWithholdValue: 0,
+  transactionWithholdValue: 0,
+  transactionType: "B2B",
+  natureOfSupplies: "Service",
+  paymentMode: "CASH",
+  paymentTerm: "IMMIDIATE",
+  unitDefault: "PCS",
+  buyerCountryCode: null,
+  buyerRegionCodes: { "Addis Ababa": "13" },
+  buyerWeredaCodes: { Yeka: "99" }, // test-only, not a real MoR code
+  cashierName: null,
+  salesPersonName: null,
+  ...over,
+});
+
+export const eimsConfig = (over: Partial<EimsConfig> = {}): EimsConfig => ({
+  enabled: true,
+  baseUrl: "https://core.mor.gov.et",
+  clientId: "cid",
+  clientSecret: "super-secret-value",
+  apiKey: "super-secret-apikey",
+  tin: "0000034558",
+  systemNumber: EIMS_SYSTEM_NUMBER,
+  systemType: EIMS_SYSTEM_TYPE,
+  privateKeyPath: "/dev/null",
+  certificatePath: "/dev/null",
+  httpTimeoutMs: 30_000,
+  tokenSkewMs: 45_000,
+  autoSubmit: false,
+  autoSubmitCron: "0 */5 * * * *",
+  autoSubmitMaxAgeDays: 3,
+  invoice: eimsInvoiceConfig(),
+  ...over,
+});
+
+/**
+ * A structurally real access token. MoR stamps the source-system identity into the JWT payload and
+ * `EimsAuthService` reads it from there; only the payload segment is meaningful, since the token is
+ * never verified locally — it is MoR's, signed with MoR's key.
+ *
+ * Pass a claim as `undefined` to omit it (spreading beats `delete`, which the defaults would undo).
+ */
+export const eimsToken = (claims: Record<string, unknown> = {}): string => {
+  const payload = { systemNumber: EIMS_SYSTEM_NUMBER, systemType: EIMS_SYSTEM_TYPE, ...claims };
+  for (const [key, value] of Object.entries(payload)) {
+    if (value === undefined) delete (payload as Record<string, unknown>)[key];
+  }
+  return [
+    "eyJhbGciOiJSUzI1NiJ9",
+    Buffer.from(JSON.stringify(payload)).toString("base64url"),
+    "signature",
+  ].join(".");
+};
diff --git a/apps/edr-freight-api/src/modules/eims/eims.errors.ts b/apps/edr-freight-api/src/modules/eims/eims.errors.ts
new file mode 100644
index 000000000..3be21fdd3
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims.errors.ts
@@ -0,0 +1,89 @@
+import { BadGatewayException, ServiceUnavailableException } from "@nestjs/common";
+import { AxiosError } from "axios";
+import { EimsErrorResponse } from "./eims.types";
+
+export type EimsFailureKind =
+  | "NETWORK"
+  | "TIMEOUT"
+  | "SCHEMA_VALIDATION"
+  | "AUTH"
+  | "FORBIDDEN"
+  | "RULE_VALIDATION"
+  | "SERVER"
+  | "UNKNOWN";
+
+/** Raised when EIMS is disabled or its credential files are unusable. */
+export class EimsConfigException extends ServiceUnavailableException {
+  constructor(message: string) {
+    super({ code: "EIMS_NOT_CONFIGURED", message });
+  }
+}
+
+/**
+ * A failed EIMS call. Carries only the gateway's own error reporting — never the request body,
+ * signature, certificate, bearer token or any configured secret.
+ */
+export class EimsApiException extends BadGatewayException {
+  constructor(
+    readonly kind: EimsFailureKind,
+    message: string,
+    readonly httpStatus?: number,
+    readonly details?: EimsErrorResponse,
+  ) {
+    super({ code: `EIMS_${kind}`, message });
+  }
+}
+
+const SAFE_KEYS = ["message", "statusCode", "code", "details", "body"] as const;
+
+/**
+ * Keep only the gateway's error-reporting fields. Anything else a response might carry — an echoed
+ * request, a token, a signature — is dropped before it can reach a log or an exception payload.
+ */
+export function redactEimsBody(data: unknown): EimsErrorResponse | undefined {
+  if (!data || typeof data !== "object") return undefined;
+  const source = data as Record<string, unknown>;
+  const safe: Record<string, unknown> = {};
+  for (const key of SAFE_KEYS) {
+    if (source[key] !== undefined) safe[key] = source[key];
+  }
+  return Object.keys(safe).length > 0 ? (safe as EimsErrorResponse) : undefined;
+}
+
+const kindFor = (status: number): EimsFailureKind => {
+  if (status === 400) return "SCHEMA_VALIDATION";
+  if (status === 401) return "AUTH";
+  if (status === 403) return "FORBIDDEN";
+  if (status === 406) return "RULE_VALIDATION";
+  if (status >= 500) return "SERVER";
+  return "UNKNOWN";
+};
+
+/** First error line the gateway gives us, whichever shape it used. */
+const describe = (body: EimsErrorResponse | undefined): string => {
+  if (!body) return "no error body";
+  const detail = body.details?.find((d) => d.errorMessage)?.errorMessage;
+  return [body.message, body.code && `code=${body.code}`, detail].filter(Boolean).join(" ") || "no error body";
+};
+
+/**
+ * Normalise anything thrown by an EIMS HTTP call into an `EimsApiException`. `operation` is a
+ * short label such as `"login"` or `"POST /v1/register"` — never a payload.
+ */
+export function toEimsApiException(err: unknown, operation: string): EimsApiException {
+  if (err instanceof EimsApiException) return err;
+
+  if (err instanceof AxiosError) {
+    if (err.code === "ECONNABORTED" || err.code === "ETIMEDOUT") {
+      return new EimsApiException("TIMEOUT", `EIMS ${operation} timed out`);
+    }
+    if (!err.response) {
+      return new EimsApiException("NETWORK", `EIMS ${operation} could not reach the gateway (${err.code ?? "no code"})`);
+    }
+    const status = err.response.status;
+    const body = redactEimsBody(err.response.data);
+    return new EimsApiException(kindFor(status), `EIMS ${operation} failed (${status}): ${describe(body)}`, status, body);
+  }
+
+  return new EimsApiException("UNKNOWN", `EIMS ${operation} failed: ${(err as Error)?.message ?? "unknown error"}`);
+}
diff --git a/apps/edr-freight-api/src/modules/eims/eims.module.ts b/apps/edr-freight-api/src/modules/eims/eims.module.ts
new file mode 100644
index 000000000..53d3d4090
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims.module.ts
@@ -0,0 +1,39 @@
+import { HttpModule } from "@nestjs/axios";
+import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+
+import { Invoice } from "../billing/entities/invoice.entity";
+import { NotificationInboxModule } from "../notification-inbox/notification-inbox.module";
+import { EimsAuthService } from "./eims-auth.service";
+import { EimsAutoSubmitService } from "./eims-auto-submit.service";
+import { EimsClientService } from "./eims-client.service";
+import { EimsCredentialsProvider } from "./eims-credentials.provider";
+import { EimsInvoiceController } from "./eims-invoice.controller";
+import { EimsInvoiceRegistrationService } from "./eims-invoice-registration.service";
+import { EimsSignerService } from "./eims-signer.service";
+import { EimsSystemState } from "./entities/eims-system-state.entity";
+
+/**
+ * MoR EIMS e-invoicing: signed transport, authentication, and manual single-invoice registration.
+ *
+ * Exports only what other modules will consume; the credential loader and signer stay internal so
+ * the private key has exactly one user. Nothing here is called from invoice creation.
+ */
+@Module({
+  imports: [
+    HttpModule.register({ timeout: Number(process.env.EIMS_HTTP_TIMEOUT_MS) || 30_000 }),
+    TypeOrmModule.forFeature([EimsSystemState, Invoice]),
+    NotificationInboxModule,
+  ],
+  controllers: [EimsInvoiceController],
+  providers: [
+    EimsCredentialsProvider,
+    EimsSignerService,
+    EimsAuthService,
+    EimsClientService,
+    EimsInvoiceRegistrationService,
+    EimsAutoSubmitService,
+  ],
+  exports: [EimsAuthService, EimsClientService, EimsInvoiceRegistrationService],
+})
+export class EimsModule {}
diff --git a/apps/edr-freight-api/src/modules/eims/eims.types.ts b/apps/edr-freight-api/src/modules/eims/eims.types.ts
new file mode 100644
index 000000000..6e74604bd
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/eims.types.ts
@@ -0,0 +1,46 @@
+/**
+ * Wire types for the MoR EIMS gateway, taken from the supplied Postman collection.
+ *
+ * Every protected payload is the same envelope: the business object under `request`, a base64
+ * RSA-SHA512 signature over the *inner* object only, and the base64 certificate bundle.
+ */
+export interface EimsSignedRequest<T> {
+  request: T;
+  signature: string;
+  certificate: string;
+}
+
+/** Inner request of `POST /auth/login`. Note the lowercase `apikey` — that is the wire name. */
+export interface EimsLoginRequest {
+  clientId: string;
+  clientSecret: string;
+  apikey: string;
+  tin: string;
+}
+
+export interface EimsLoginData {
+  accessToken: string;
+  refreshToken: string;
+  /** Observed as a UUID on login and `null` on refresh; unused today. */
+  encryptionKey: string | null;
+  /** Seconds. Observed value: 3600. */
+  expiresIn: number;
+}
+
+export interface EimsLoginResponse {
+  data: EimsLoginData;
+  status: string;
+}
+
+/**
+ * Error bodies differ per failure mode: gateway errors carry `message`/`code`/`details`,
+ * schema errors carry a JSON-Schema violation array under `body`, rule errors carry
+ * `[{portion, errorMessage[]}]` under `body`. Only these fields are ever surfaced or logged.
+ */
+export interface EimsErrorResponse {
+  message?: string;
+  statusCode?: number;
+  code?: string;
+  details?: { errorMessage?: string; field?: string }[];
+  body?: unknown;
+}
diff --git a/apps/edr-freight-api/src/modules/eims/entities/eims-system-state.entity.ts b/apps/edr-freight-api/src/modules/eims/entities/eims-system-state.entity.ts
new file mode 100644
index 000000000..a21057042
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/eims/entities/eims-system-state.entity.ts
@@ -0,0 +1,54 @@
+import { BaseEntity } from "@edr/api-common";
+import { Column, Entity } from "typeorm";
+
+/**
+ * One row per MoR system number, holding the sequence state EIMS expects across registrations:
+ * the next `SourceSystem.InvoiceCounter` and the IRN that the next document must chain to via
+ * `ReferenceDetails.PreviousIrn`.
+ *
+ * Registration locks this row `FOR UPDATE` for the duration of the submission, which is what keeps
+ * two concurrent registrations from claiming the same counter or breaking the IRN chain.
+ */
+@Entity({ schema: "freight", name: "eims_system_state" })
+export class EimsSystemState extends BaseEntity {
+  @Column({ name: "system_number", type: "varchar", length: 32, unique: true })
+  systemNumber!: string;
+
+  /** Counter to send on the next registration; advanced only once an attempt has consumed it. */
+  @Column({ name: "next_invoice_counter", type: "bigint", default: 1 })
+  nextInvoiceCounter!: number;
+
+  /**
+   * `DocumentDetails.DocumentNumber` for the next registration.
+   *
+   * Separate from our own `invoiceNumber`, which MoR cannot accept: it validates the field against
+   * `^(0|[1-9][0-9]{0,8})$`, a plain integer.
+   */
+  @Column({ name: "next_document_number", type: "bigint", default: 1 })
+  nextDocumentNumber!: number;
+
+  @Column({ name: "in_flight_document_number", type: "bigint", nullable: true })
+  inFlightDocumentNumber?: number | null;
+
+  /** IRN of the last successful registration; null until the first one succeeds. */
+  @Column({ name: "previous_irn", type: "varchar", length: 64, nullable: true })
+  previousIrn?: string | null;
+
+  /**
+   * Invoice holding the current reservation. Committed before the HTTP call, so it survives a
+   * crash and blocks a blind resubmission of a document that may already have reached MoR.
+   */
+  @Column({ name: "in_flight_invoice_id", type: "uuid", nullable: true })
+  inFlightInvoiceId?: string | null;
+
+  /** Counter handed to the in-flight submission. */
+  @Column({ name: "in_flight_counter", type: "bigint", nullable: true })
+  inFlightCounter?: number | null;
+
+  /**
+   * Why registration is blocked for this system number. Set when a submission ends ambiguously:
+   * the IRN is unknown, so no further document can chain correctly until it is resolved.
+   */
+  @Column({ name: "blocked_reason", type: "text", nullable: true })
+  blockedReason?: string | null;
+}
diff --git a/apps/edr-freight-api/src/modules/exchange-settings/exchange-settings.controller.ts b/apps/edr-freight-api/src/modules/exchange-settings/exchange-settings.controller.ts
index a6c08a317..001fc90d2 100644
--- a/apps/edr-freight-api/src/modules/exchange-settings/exchange-settings.controller.ts
+++ b/apps/edr-freight-api/src/modules/exchange-settings/exchange-settings.controller.ts
@@ -3,7 +3,8 @@ import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger";
 import { CurrentUser } from "@edr/api-common";
 import type { TCurrentUser } from "@tria-plc/api-common/modules/auth/types/current-user.type";
 
-import { FreightAdmin } from "../../common/booking-guards";
+import { BookingStaff } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { UpdateExchangeSettingDto } from "./dto/update-exchange-setting.dto";
 import { ExchangeSettingsService } from "./exchange-settings.service";
 
@@ -14,7 +15,7 @@ export class ExchangeSettingsController {
   constructor(private readonly service: ExchangeSettingsService) {}
 
   @Get()
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.exchangeRate.view, FREIGHT_PERMS.admin])
   @ApiOperation({
     summary: "Current USD→ETB fallback rate and CBE feed health",
   })
@@ -32,7 +33,7 @@ export class ExchangeSettingsController {
   }
 
   @Patch()
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.exchangeRate.manage, FREIGHT_PERMS.admin])
   @ApiOperation({
     summary:
       "Set the USD→ETB fallback by hand (used only while CBE is unreachable)",
diff --git a/apps/edr-freight-api/src/modules/facilities/facilities.controller.ts b/apps/edr-freight-api/src/modules/facilities/facilities.controller.ts
index 25fbbc365..7db35d432 100644
--- a/apps/edr-freight-api/src/modules/facilities/facilities.controller.ts
+++ b/apps/edr-freight-api/src/modules/facilities/facilities.controller.ts
@@ -1,6 +1,8 @@
 import { Body, Controller, Delete, Get, HttpCode, Param, Patch, Post } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 
+import { BookingStaff } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateFacilityDto } from './dto/create-facility.dto';
 import { UpdateFacilityDto } from './dto/update-facility.dto';
 import { Facility } from './entities/facility.entity';
@@ -8,10 +10,17 @@ import { FacilitiesService } from './facilities.service';
 
 @ApiTags('Facilities')
 @Controller('facilities')
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.facilities.view,
+  FREIGHT_PERMS.facilities.manage,
+])
 export class FacilitiesController {
   constructor(private readonly facilitiesService: FacilitiesService) {}
 
   @Post()
+  @BookingStaff(FREIGHT_PERMS.facilities.manage)
   @ApiOperation({ summary: 'Create a new facility' })
   async create(@Body() createFacilityDto: CreateFacilityDto): Promise<Facility> {
     return this.facilitiesService.create(createFacilityDto);
@@ -30,6 +39,7 @@ export class FacilitiesController {
   }
 
   @Patch(':id')
+  @BookingStaff(FREIGHT_PERMS.facilities.manage)
   @ApiOperation({ summary: 'Update a facility' })
   async update(@Param('id') id: string, @Body() updateFacilityDto: UpdateFacilityDto): Promise<Facility | null> {
     return this.facilitiesService.update(id, updateFacilityDto);
@@ -37,6 +47,7 @@ export class FacilitiesController {
 
   @Delete(':id')
   @HttpCode(204)
+  @BookingStaff(FREIGHT_PERMS.facilities.manage)
   @ApiOperation({ summary: 'Delete a facility (soft delete)' })
   async remove(@Param('id') id: string): Promise<void> {
     return this.facilitiesService.remove(id);
diff --git a/apps/edr-freight-api/src/modules/file-upload-settings/file-upload-settings.controller.ts b/apps/edr-freight-api/src/modules/file-upload-settings/file-upload-settings.controller.ts
index 661339902..ab4ae98f0 100644
--- a/apps/edr-freight-api/src/modules/file-upload-settings/file-upload-settings.controller.ts
+++ b/apps/edr-freight-api/src/modules/file-upload-settings/file-upload-settings.controller.ts
@@ -13,7 +13,8 @@ import {
 } from "@nestjs/common";
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 
-import { FreightAdmin } from "../../common/booking-guards";
+import { BookingStaff } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { CreateFileUploadFieldDto } from "./dto/create-file-upload-field.dto";
 import { CreateFileUploadSettingDto } from "./dto/create-file-upload-setting.dto";
 import { UpdateFileUploadFieldDto } from "./dto/update-file-upload-field.dto";
@@ -53,14 +54,14 @@ export class FileUploadSettingsController {
   }
 
   @Post()
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.fileUpload.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Create a new file upload setting" })
   create(@Body() dto: CreateFileUploadSettingDto) {
     return this.service.create(dto);
   }
 
   @Patch(":id")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.fileUpload.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Update a file upload setting's metadata" })
   update(
     @Param("id", ParseUUIDPipe) id: string,
@@ -70,7 +71,7 @@ export class FileUploadSettingsController {
   }
 
   @Delete(":id")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.fileUpload.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Soft-delete a file upload setting" })
   @HttpCode(HttpStatus.NO_CONTENT)
   remove(@Param("id", ParseUUIDPipe) id: string) {
@@ -80,7 +81,7 @@ export class FileUploadSettingsController {
   /* ------------------------- field routes ------------------------- */
 
   @Put(":id/fields")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.fileUpload.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Replace the full field list for a setting" })
   replaceFields(
     @Param("id", ParseUUIDPipe) id: string,
@@ -90,7 +91,7 @@ export class FileUploadSettingsController {
   }
 
   @Post(":id/fields")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.fileUpload.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Append a single field to a setting" })
   addField(
     @Param("id", ParseUUIDPipe) id: string,
@@ -100,7 +101,7 @@ export class FileUploadSettingsController {
   }
 
   @Patch("fields/:fieldId")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.fileUpload.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Update a single field" })
   updateField(
     @Param("fieldId", ParseUUIDPipe) fieldId: string,
@@ -110,7 +111,7 @@ export class FileUploadSettingsController {
   }
 
   @Delete("fields/:fieldId")
-  @FreightAdmin()
+  @BookingStaff([FREIGHT_PERMS.settings.fileUpload.manage, FREIGHT_PERMS.admin])
   @ApiOperation({ summary: "Soft-delete a single field" })
   @HttpCode(HttpStatus.NO_CONTENT)
   removeField(@Param("fieldId", ParseUUIDPipe) fieldId: string) {
diff --git a/apps/edr-freight-api/src/modules/files/files.controller.ts b/apps/edr-freight-api/src/modules/files/files.controller.ts
index fc58a731c..139da9fbd 100644
--- a/apps/edr-freight-api/src/modules/files/files.controller.ts
+++ b/apps/edr-freight-api/src/modules/files/files.controller.ts
@@ -16,6 +16,7 @@ import {
 } from "@nestjs/swagger";
 import { Response } from "express";
 
+import { MixedAudience } from "../../common/booking-guards";
 import { FilesService } from "./files.service";
 
 @ApiTags("files")
@@ -25,6 +26,7 @@ export class FilesController {
   constructor(private readonly filesService: FilesService) {}
 
   @Get(":fileId")
+  @MixedAudience([])
   // Authenticated: no @Public, so the global JwtGuard applies. Unguessable file
   // UUIDs are obscurity, not authorization — raw byte streams must require auth.
   // Browser inline previews (<img>/<iframe>/<a>) that can't carry the Bearer
diff --git a/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts b/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts
index 952f924d6..e6610a59d 100644
--- a/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts
+++ b/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts
@@ -28,7 +28,9 @@ import { FirstMileInvoiceService } from './first-mile-invoice.service';
 @ApiTags('first-mile')
 @ApiBearerAuth()
 @Controller('first-mile')
-@BookingStaff(FREIGHT_PERMS.firstMile.view)
+// No class-level key: Nest stacks class and method guards, so a class-level
+// `view` would AND with every action key below and lock out staff granted only
+// an action (e.g. assign_vehicles). Each route carries its own key instead.
 export class FirstMileController {
   constructor(
     private readonly firstMileService: FirstMileService,
@@ -36,6 +38,7 @@ export class FirstMileController {
   ) { }
 
   @Get()
+  @BookingStaff(FREIGHT_PERMS.firstMile.view)
   @ApiOperation({ summary: 'List first-mile legs' })
   findAll(
     @Query('status') status?: string,
@@ -58,6 +61,7 @@ export class FirstMileController {
   }
 
   @Get(':id')
+  @BookingStaff(FREIGHT_PERMS.firstMile.view)
   @ApiOperation({ summary: 'Get a first-mile leg by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.firstMileService.findById(id);
diff --git a/apps/edr-freight-api/src/modules/gps-tracking/gps-tracking.controller.ts b/apps/edr-freight-api/src/modules/gps-tracking/gps-tracking.controller.ts
index 8bd4a31d8..d0cc2d1b4 100644
--- a/apps/edr-freight-api/src/modules/gps-tracking/gps-tracking.controller.ts
+++ b/apps/edr-freight-api/src/modules/gps-tracking/gps-tracking.controller.ts
@@ -19,7 +19,12 @@ import { RegisterDeviceDto, UpdateDeviceDto } from './dto/gps-device.dto';
 @ApiTags('gps-tracking')
 @ApiBearerAuth()
 @Controller('gps')
-@BookingStaff(FREIGHT_PERMS.tracking.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.tracking.view,
+  FREIGHT_PERMS.tracking.manage,
+])
 export class GpsTrackingController {
   constructor(private readonly gps: GpsTrackingService) {}
 
diff --git a/apps/edr-freight-api/src/modules/incidents/incidents.controller.ts b/apps/edr-freight-api/src/modules/incidents/incidents.controller.ts
index b9cebd653..2e9dfb169 100644
--- a/apps/edr-freight-api/src/modules/incidents/incidents.controller.ts
+++ b/apps/edr-freight-api/src/modules/incidents/incidents.controller.ts
@@ -22,7 +22,14 @@ import { IncidentStatus, IncidentType } from './entities/incident.entity';
 // No incidents-specific permission exists in the registry, so this reuses the
 // (real) drivers.* fleet-road keys — incident records are driver-safety data
 // (driver stats / incident history). TODO: add a dedicated incidents:* key.
-@BookingStaff(FREIGHT_PERMS.drivers.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.drivers.view,
+  FREIGHT_PERMS.drivers.create,
+  FREIGHT_PERMS.drivers.update,
+  FREIGHT_PERMS.drivers.delete,
+])
 export class IncidentsController {
   constructor(private readonly incidentsService: IncidentsService) {}
 
diff --git a/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts b/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts
index 61a13744e..b5e92ca39 100644
--- a/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts
+++ b/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts
@@ -15,7 +15,14 @@ import { InterchangeDocumentsService } from './interchange-documents.service';
 @ApiBearerAuth()
 @Controller('interchange-documents')
 // Class-level view guard; each write route adds its own manage permission below.
-@BookingStaff(FREIGHT_PERMS.interchangeDocuments.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.interchangeDocuments.view,
+  FREIGHT_PERMS.interchangeDocuments.generate,
+  FREIGHT_PERMS.interchangeDocuments.acknowledge,
+  FREIGHT_PERMS.interchangeDocuments.dispute,
+])
 export class InterchangeDocumentsController {
   constructor(private readonly service: InterchangeDocumentsService) {}
 
diff --git a/apps/edr-freight-api/src/modules/last-mile-requests/dto/approve-last-mile-request.dto.ts b/apps/edr-freight-api/src/modules/last-mile-requests/dto/approve-last-mile-request.dto.ts
index 56be0c545..0fa7457a8 100644
--- a/apps/edr-freight-api/src/modules/last-mile-requests/dto/approve-last-mile-request.dto.ts
+++ b/apps/edr-freight-api/src/modules/last-mile-requests/dto/approve-last-mile-request.dto.ts
@@ -1,13 +1,19 @@
-import { ApiProperty } from '@nestjs/swagger';
+import { ApiPropertyOptional } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
-import { IsNumber, Min } from 'class-validator';
+import { IsNumber, IsOptional, Min } from 'class-validator';
 
 export class ApproveLastMileRequestDto {
-  // The approve dialog prefills this from GET :id/price-estimate (rule-based),
-  // but the chief can still override — the typed value is what's invoiced.
-  @ApiProperty({ description: 'Advance amount the customer must pay before execution proceeds', example: 3000 })
-  @Transform(({ value }) => Number(value))
+  // Omitted = the rule-based last-mile rate estimate is the advance. The chief
+  // can still override with an explicit amount (required when no rate covers
+  // the job).
+  @ApiPropertyOptional({
+    description:
+      'Advance override. Omitted = the amount comes from the live last-mile rates (km × rate).',
+    example: 3000,
+  })
+  @IsOptional()
+  @Transform(({ value }) => (value === null || value === undefined || value === '' ? undefined : Number(value)))
   @IsNumber()
   @Min(0.01)
-  advanceAmount!: number;
+  advanceAmount?: number;
 }
diff --git a/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.controller.ts b/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.controller.ts
index 4c4ac88e5..c6910c7a7 100644
--- a/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.controller.ts
+++ b/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.controller.ts
@@ -6,7 +6,7 @@ import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
 import { LastMileRequestStatus } from '@edr/types';
 
-import { BookingStaff } from '../../common/booking-guards';
+import { BookingStaff, MixedAudience, PortalCustomer } from '../../common/booking-guards';
 import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { ApproveLastMileRequestDto } from './dto/approve-last-mile-request.dto';
 import { RejectLastMileRequestDto } from './dto/reject-last-mile-request.dto';
@@ -61,12 +61,14 @@ export class LastMileRequestsController {
   // Customer-facing like :id/submit — the service ownership-checks against the
   // resolved company; staff may also open it (read-only view).
   @Get(':id/contract/view')
+  @MixedAudience(FREIGHT_PERMS.lastMile.requestView)
   @ApiOperation({ summary: 'LM contract view model + rendered HTML + saved signature' })
   contractView(@Param('id', ParseUUIDPipe) id: string, @CurrentUser() user: TCurrentUser) {
     return this.contractService.getContractView(id, user?.id ?? null);
   }
 
   @Get(':id/contract/document')
+  @MixedAudience(FREIGHT_PERMS.lastMile.requestView)
   @ApiOperation({ summary: 'Download the LM contract PDF (LM_<CustomerName>.pdf)' })
   async contractDocument(
     @Param('id', ParseUUIDPipe) id: string,
@@ -79,6 +81,7 @@ export class LastMileRequestsController {
   }
 
   @Post(':id/contract/sign')
+  @PortalCustomer()
   @ApiOperation({ summary: 'Customer agrees and signs the LM contract — then the advance invoice is issued' })
   signContract(
     @Param('id', ParseUUIDPipe) id: string,
@@ -99,6 +102,7 @@ export class LastMileRequestsController {
   // TODO: integrate @edr/auth — @CurrentUser is a stub until then; the service
   // still cross-checks the request's booking against the resolved company.
   @Post(':id/submit')
+  @PortalCustomer()
   @ApiOperation({ summary: "Customer confirms which containers go via EDR last-mile" })
   submit(
     @Param('id', ParseUUIDPipe) id: string,
@@ -110,7 +114,7 @@ export class LastMileRequestsController {
 
   @Post(':id/approve')
   @BookingStaff(FREIGHT_PERMS.lastMile.requestApprove)
-  @ApiOperation({ summary: 'Truck & Machinery chief approves the request — LM contract becomes signable; the advance invoice follows the customer signature' })
+  @ApiOperation({ summary: 'Truck & Machinery chief approves the request — the advance defaults to the live last-mile rate; LM contract becomes signable and the advance invoice follows the customer signature' })
   approve(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() dto: ApproveLastMileRequestDto,
diff --git a/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.service.ts b/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.service.ts
index 901e7b9b5..b89f06479 100644
--- a/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.service.ts
+++ b/apps/edr-freight-api/src/modules/last-mile-requests/last-mile-requests.service.ts
@@ -299,7 +299,11 @@ export class LastMileRequestsService {
     return this.findById(id);
   }
 
-  async approve(id: string, staffId: string | null, advanceAmount: number): Promise<LastMileRequest> {
+  async approve(
+    id: string,
+    staffId: string | null,
+    advanceOverride?: number | null,
+  ): Promise<LastMileRequest> {
     const request = await this.findById(id);
     if (request.status !== LastMileRequestStatus.Submitted) {
       throw new BadRequestException(`Only a submitted request can be approved (current status: ${request.status})`);
@@ -307,6 +311,18 @@ export class LastMileRequestsService {
     const booking = request.booking ?? (await this.bookingsRepository.findById(request.bookingId));
     if (!booking) throw new NotFoundException(`Booking ${request.bookingId} not found`);
 
+    // The live last-mile rates are the authority on the advance (km × rate);
+    // the chief's typed amount is only an override — and the only path when no
+    // rate covers the job. Snapshotted so the contract and invoice stay immune
+    // to later rate edits.
+    const estimate = await this.priceEstimate(id);
+    const advanceAmount = advanceOverride ?? estimate.total;
+    if (!advanceAmount || advanceAmount <= 0) {
+      throw new BadRequestException(
+        'No live last-mile rate covers this job — enter the advance amount manually.',
+      );
+    }
+
     // Idempotent per booking — reuses the record if one already exists.
     const lastMile = await this.lastMileService.create({
       bookingId: request.bookingId,
@@ -316,10 +332,6 @@ export class LastMileRequestsService {
 
     // No invoice yet: the advance is invoiced by LastMileContractService.sign()
     // once the customer has signed the LM contract — doc first, then payment.
-    // Snapshot the rate estimate now so the contract shows the numbers the
-    // chief actually approved against, immune to later rate edits.
-    const estimate = await this.priceEstimate(id);
-
     await this.requestsRepository.update(id, {
       status: LastMileRequestStatus.Approved,
       reviewedByStaffId: staffId,
@@ -364,7 +376,10 @@ export class LastMileRequestsService {
       type: 'LAST_MILE_ADVANCE',
       companyId: booking.companyId,
       companyProfileId: booking.companyProfileId || '',
-      currency: booking.paymentCurrency || 'ETB',
+      // The advance is priced by the last-mile rate, so it bills in that
+      // rate's currency (birr for domestic trucking) — the booking's payment
+      // currency is only the fallback when the amount was a manual override.
+      currency: request.contractSummary?.currency || booking.paymentCurrency || 'ETB',
       lines: [
         {
           chargeType: 'LAST_MILE_ADVANCE',
diff --git a/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts b/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts
index d7e2ba1ff..7a2765fd8 100644
--- a/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts
@@ -34,7 +34,9 @@ import { LastMileInvoiceService } from './last-mile-invoice.service';
 @ApiTags('last-mile')
 @ApiBearerAuth()
 @Controller('last-mile')
-@BookingStaff(FREIGHT_PERMS.lastMile.view)
+// No class-level key: Nest stacks class and method guards, so a class-level
+// `view` would AND with every action key below and lock out staff granted only
+// an action (e.g. assign_vehicles). Each route carries its own key instead.
 export class LastMileController {
   constructor(
     private readonly lastMileService: LastMileService,
@@ -42,6 +44,7 @@ export class LastMileController {
   ) {}
 
   @Get()
+  @BookingStaff(FREIGHT_PERMS.lastMile.view)
   @ApiOperation({ summary: 'List last-mile legs' })
   findAll(
     @Query('status') status?: string,
@@ -64,18 +67,21 @@ export class LastMileController {
   }
 
   @Get(':id')
+  @BookingStaff(FREIGHT_PERMS.lastMile.view)
   @ApiOperation({ summary: 'Get a last-mile leg by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.lastMileService.findById(id);
   }
 
   @Get('booking/:bookingId/arrival-trucks')
+  @BookingStaff(FREIGHT_PERMS.lastMile.view)
   @ApiOperation({ summary: "Assigned EDR last-mile trucks for a booking (arrival/exit weighing prefill)" })
   arrivalTrucks(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.lastMileService.arrivalTrucksForBooking(bookingId);
   }
 
   @Get('booking/:bookingId/remaining-tons')
+  @BookingStaff(FREIGHT_PERMS.lastMile.view)
   @ApiOperation({ summary: 'Bulk drawdown: tonnage still to be hauled (total − departed trucks)' })
   remainingTons(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.lastMileService.remainingTonsForBooking(bookingId);
diff --git a/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts b/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
index ec7d4ccf6..8ed5ae8aa 100644
--- a/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
@@ -460,8 +460,21 @@ export class LastMileService {
   @OnEvent("last_mile.invoice.paid")
   async onBookingInvoicePaid(payload: InvoiceEventPayload): Promise<void> {
     try {
-      // Invoice paid → the delivery is complete. Route through update() so it
-      // also frees the trucks + records history (same as "Mark Delivered").
+      if (payload.type === 'LAST_MILE_ADVANCE') {
+        // Advance paid → the leg becomes dispatchable, not delivered.
+        await this.update(payload.sourceId, {
+          status: 'READY_TO_TRANSIT',
+          advancedPayment: payload.totalAmount,
+        } as unknown as UpdateLastMileDto);
+        this.logger.log(
+          `Last-mile ${payload.sourceId} READY_TO_TRANSIT on advance invoice ${payload.invoiceId} payment`,
+        );
+        return;
+      }
+      if (payload.type !== 'DELIVERY_FEE') return;
+      // Delivery-fee invoice paid → the delivery is complete. Route through
+      // update() so it also frees the trucks + records history (same as
+      // "Mark Delivered").
       await this.update(payload.sourceId, { status: 'DELIVERED', paid: true } as unknown as UpdateLastMileDto);
       this.logger.log(`Last-mile ${payload.sourceId} marked DELIVERED on invoice ${payload.invoiceId} payment`);
     } catch (err) {
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance-due-alert.spec.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance-due-alert.spec.ts
index 7aac5e863..5726123cf 100644
--- a/apps/edr-freight-api/src/modules/maintenance/maintenance-due-alert.spec.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance-due-alert.spec.ts
@@ -1,6 +1,7 @@
 import { NotificationAudience } from '@edr/types';
 
 import { MaintenanceService } from './maintenance.service';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
 /**
  * The daily due-alert: a SCHEDULED item that crossed its km or date threshold
@@ -37,6 +38,10 @@ describe('MaintenanceService.sendDueAlerts', () => {
     expect(notify).toHaveBeenCalledWith(
       expect.objectContaining({
         audience: NotificationAudience.BACKOFFICE,
+        // The fleet desk, not every employee in the company.
+        recipients: {
+          permissionKeys: [FREIGHT_PERMS.maintenance.getNotification],
+        },
         title: 'Maintenance due — ET-9875',
         body: expect.stringContaining('driven 50200 km (due at 50000 km)'),
       }),
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts
index dd9da55a8..54aab6e36 100644
--- a/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts
@@ -15,6 +15,7 @@ import {
   UpsertMaintenanceIntervalDto,
 } from './dto/create-maintenance.dto';
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
 @Injectable()
 export class MaintenanceService {
@@ -53,7 +54,9 @@ export class MaintenanceService {
             ? `driven ${item.currentKm} km (due at ${item.nextDueKm} km)`
             : `due ${new Date(item.nextDueDate as Date).toLocaleDateString()}`;
         await this.inbox.notify({
-          recipients: { allBackoffice: true },
+          recipients: {
+            permissionKeys: [FREIGHT_PERMS.maintenance.getNotification],
+          },
           audience: NotificationAudience.BACKOFFICE,
           type: NotificationType.GENERIC,
           title: `Maintenance due — ${item.plateNumber}`,
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 80fecf1bf..6fb82c3a0 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
@@ -1,11 +1,5 @@
 import { CurrentUser } from "@edr/api-common";
 import {
-  NotificationAudience,
-  NotificationPriority,
-  NotificationType,
-} from "@edr/types";
-import {
-  Body,
   Controller,
   Get,
   Param,
@@ -62,22 +56,4 @@ export class NotificationInboxController {
     return this.service.markAllRead(resolveAuthUserId(user));
   }
 
-  // TODO: remove before merge — dev/verification helper only.
-  @Post("test")
-  @ApiOperation({
-    summary: "[dev] Send a test notification to the current user",
-  })
-  sendTest(
-    @CurrentUser() user: AuthUserPayload,
-    @Body()
-    body: {
-      audience?: NotificationAudience;
-      type?: NotificationType;
-      priority?: NotificationPriority;
-      title?: string;
-      message?: string;
-    },
-  ) {
-    return this.service.sendTestToUser(resolveAuthUserId(user), body ?? {});
-  }
 }
diff --git a/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.service.ts b/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.service.ts
index 97ee0380e..7cfbf81df 100644
--- a/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.service.ts
+++ b/apps/edr-freight-api/src/modules/notification-inbox/notification-inbox.service.ts
@@ -1,11 +1,9 @@
 import {
-  NotificationAudience,
   NotificationChannels,
   NotificationChannelsSent,
   NotificationDto,
   NotificationListResult,
   NotificationPriority,
-  NotificationType,
   NotifyInput,
 } from "@edr/types";
 import { Injectable, Logger } from "@nestjs/common";
@@ -106,31 +104,6 @@ export class NotificationInboxService {
     return { updated, unreadCount };
   }
 
-  /** [dev/verification only] Send a canned notification straight to one user. */
-  async sendTestToUser(
-    userId: string,
-    body: {
-      audience?: NotificationAudience;
-      type?: NotificationType;
-      priority?: NotificationPriority;
-      title?: string;
-      message?: string;
-    },
-  ): Promise<NotificationDto> {
-    const entity = await this.repo.create({
-      recipientUserId: userId,
-      audience: body.audience ?? NotificationAudience.BACKOFFICE,
-      type: body.type ?? NotificationType.GENERIC,
-      title: body.title ?? "Test notification",
-      body: body.message ?? "This is a test in-app notification.",
-      priority: body.priority ?? NotificationPriority.NORMAL,
-      isRead: false,
-    });
-    const dto = this.toDto(entity);
-    this.gateway.emitNew(userId, dto, await this.repo.countUnread(userId));
-    return dto;
-  }
-
   private async deliverToUser(
     userId: string,
     input: NotifyInput,
diff --git a/apps/edr-freight-api/src/modules/notification-inbox/notification-recipients.service.ts b/apps/edr-freight-api/src/modules/notification-inbox/notification-recipients.service.ts
index e3e711d19..d8e338dbf 100644
--- a/apps/edr-freight-api/src/modules/notification-inbox/notification-recipients.service.ts
+++ b/apps/edr-freight-api/src/modules/notification-inbox/notification-recipients.service.ts
@@ -14,7 +14,9 @@ import { ExternalProfileRepository } from "../companies/external-profile.reposit
  * - `companyProfileId` → resolved to its company, then to that company's users.
  * - `organizationId`   → all current employees of the org (backoffice staff).
  * - `permissionKeys`   → current employees (any org) holding any of these
- *   permission keys (e.g. department/role-scoped targeting).
+ *   permission keys — how every staff-facing notification is targeted. There is
+ *   deliberately no "all backoffice" selector: staff notifications belong to a
+ *   desk, and the `<module>:get_notification` keys name which one.
  */
 @Injectable()
 export class NotificationRecipientsService {
@@ -69,18 +71,6 @@ export class NotificationRecipientsService {
       }
     }
 
-    if (recipients.allBackoffice) {
-      try {
-        for (const uid of await this.backoffice.getAllCurrentEmployeeUserIds()) {
-          ids.add(uid);
-        }
-      } catch (err) {
-        this.logger.warn(
-          `Failed to resolve allBackoffice recipients: ${(err as Error).message}`,
-        );
-      }
-    }
-
     if (recipients.permissionKeys?.length) {
       try {
         for (const uid of await this.backoffice.getEmployeeUserIdsByPermission(
diff --git a/apps/edr-freight-api/src/modules/notifications/email-client.service.ts b/apps/edr-freight-api/src/modules/notifications/email-client.service.ts
index 20a43d061..52dd7802e 100644
--- a/apps/edr-freight-api/src/modules/notifications/email-client.service.ts
+++ b/apps/edr-freight-api/src/modules/notifications/email-client.service.ts
@@ -51,8 +51,11 @@ export class EmailClientService implements OnApplicationBootstrap {
     this.logger.log(
       `EMAIL publish to RabbitMQ [${process.env.EMAIL_QUEUE ?? "email_queue"}] pattern='send-email' confirmed=${queued}`,
     );
-    // Recipient + content are PII — debug only.
-    this.logger.debug(`EMAIL payload to=${dto.to} subject="${dto.subject}"`);
+    // Full content logged on purpose (audit of what actually left the API).
+    // Note: recipient + body are PII and land in plain application logs.
+    this.logger.log(
+      `EMAIL payload to=${dto.to} subject="${dto.subject}" text="${dto.text ?? ""}" html="${dto.html ?? ""}"`,
+    );
     return { queued };
   }
 
diff --git a/apps/edr-freight-api/src/modules/notifications/notify-company.util.ts b/apps/edr-freight-api/src/modules/notifications/notify-company.util.ts
index 9f121e18a..e3b2fd80a 100644
--- a/apps/edr-freight-api/src/modules/notifications/notify-company.util.ts
+++ b/apps/edr-freight-api/src/modules/notifications/notify-company.util.ts
@@ -2,6 +2,7 @@ import { DataSource } from 'typeorm';
 
 import { NotificationsService } from './notifications.service';
 import {
+  companyNotifyEmailExpr,
   companyNotifyPhoneExpr,
   primaryContactUserJoin,
 } from './resolve-company-phone.util';
@@ -19,7 +20,8 @@ export async function sendCompanyChannels(
 ): Promise<void> {
   const [contact]: Array<{ phone: string | null; email: string | null }> =
     await dataSource.query(
-      `SELECT ${companyNotifyPhoneExpr('co')} AS phone, co.email
+      `SELECT ${companyNotifyPhoneExpr('co')} AS phone,
+              ${companyNotifyEmailExpr('co')} AS email
          FROM freight.companies co
          ${primaryContactUserJoin('co')}
         WHERE co.id = $1 AND co.deleted_at IS NULL`,
diff --git a/apps/edr-freight-api/src/modules/notifications/resolve-company-phone.util.ts b/apps/edr-freight-api/src/modules/notifications/resolve-company-phone.util.ts
index 511f3cf8c..886aa8b85 100644
--- a/apps/edr-freight-api/src/modules/notifications/resolve-company-phone.util.ts
+++ b/apps/edr-freight-api/src/modules/notifications/resolve-company-phone.util.ts
@@ -1,7 +1,7 @@
 import { DataSource, EntityManager } from "typeorm";
 
 /**
- * Where a customer-facing SMS actually goes.
+ * Where a customer-facing SMS or email actually goes.
  *
  * The person who signs up, logs in, and receives OTPs is an IAM user, and
  * `iam.users.phone_number` is the number they control and can change themselves
@@ -12,11 +12,13 @@ import { DataSource, EntityManager } from "typeorm";
  * `companies.contact_person_phone` is deliberately NOT consulted: the live write
  * path stores that value in the `attributes` jsonb and has never populated the
  * column, so every reader of it was silently falling through to `phone` anyway.
+ * `companies.general_manager_email` is the same trap on the email side — see
+ * {@link companyNotifyEmailExpr}.
  */
 
 /**
  * LEFT JOIN a company alias to its primary contact's IAM user, exposing
- * `pc.phone_number`.
+ * `pc.phone_number` and `pc.email`.
  *
  * LATERAL + LIMIT 1 rather than a plain join: nothing in the schema stops a
  * company having two `is_primary_contact` rows, and a plain join would then
@@ -28,7 +30,7 @@ import { DataSource, EntityManager } from "typeorm";
 export function primaryContactUserJoin(alias: string): string {
   return `
     LEFT JOIN LATERAL (
-      SELECT u.phone_number
+      SELECT u.phone_number, u.email
         FROM freight.external_profiles ep
         JOIN iam.users u ON u.id = ep.user_id AND u.is_active = true
        WHERE ep.company_id = ${alias}.id
@@ -44,17 +46,45 @@ export function companyNotifyPhoneExpr(alias: string): string {
   return `COALESCE(pc.phone_number, ${alias}.phone)`;
 }
 
-/** The SMS number for one company, or null when neither source has one. */
-export async function resolveCompanyNotifyPhone(
+/**
+ * SQL expression for the company's notification address, given the joined `pc`
+ * alias.
+ *
+ * `companies.email` alone is not enough: it is written from ONE place — a
+ * Fayda-verified owner's email claim — so a foreign company, whose owner proves
+ * identity by passport instead, never gets one. Readers papered over that with
+ * `COALESCE(email, general_manager_email)`, but that column has the same problem
+ * `contact_person_phone` has above: onboarding writes the value into the
+ * `attributes` jsonb and nothing has ever populated the column, so the fallback
+ * could not fire and the mail was dropped in silence.
+ *
+ * So: the company address, then the two the customer actually filled in during
+ * onboarding, then the account that registered them — which always has one,
+ * signup requires it. `NULLIF` because a blank jsonb key is not an address and
+ * `COALESCE` would happily stop on it.
+ */
+export function companyNotifyEmailExpr(alias: string): string {
+  return `COALESCE(
+    NULLIF(${alias}.email, ''),
+    NULLIF(${alias}.attributes->>'generalManagerEmail', ''),
+    NULLIF(${alias}.attributes->>'contactPersonEmail', ''),
+    NULLIF(pc.email, '')
+  )`;
+}
+
+/** Both channels for one company; either side is null when nothing has one. */
+export async function resolveCompanyNotifyContact(
   db: DataSource | EntityManager,
   companyId: string,
-): Promise<string | null> {
-  const rows: Array<{ phone: string | null }> = await db.query(
-    `SELECT ${companyNotifyPhoneExpr("co")} AS phone
-       FROM freight.companies co
-       ${primaryContactUserJoin("co")}
-      WHERE co.id = $1 AND co.deleted_at IS NULL`,
-    [companyId],
-  );
-  return rows[0]?.phone ?? null;
+): Promise<{ phone: string | null; email: string | null }> {
+  const rows: Array<{ phone: string | null; email: string | null }> =
+    await db.query(
+      `SELECT ${companyNotifyPhoneExpr("co")} AS phone,
+              ${companyNotifyEmailExpr("co")} AS email
+         FROM freight.companies co
+         ${primaryContactUserJoin("co")}
+        WHERE co.id = $1 AND co.deleted_at IS NULL`,
+      [companyId],
+    );
+  return { phone: rows[0]?.phone ?? null, email: rows[0]?.email ?? null };
 }
diff --git a/apps/edr-freight-api/src/modules/notifications/sms-client.service.ts b/apps/edr-freight-api/src/modules/notifications/sms-client.service.ts
index 43e47f350..1c4f3adba 100644
--- a/apps/edr-freight-api/src/modules/notifications/sms-client.service.ts
+++ b/apps/edr-freight-api/src/modules/notifications/sms-client.service.ts
@@ -52,8 +52,9 @@ export class SmsClientService implements OnApplicationBootstrap {
     this.logger.log(
       `SMS publish to RabbitMQ [${process.env.SMS_QUEUE ?? "sms_queue"}] pattern='send-sms' confirmed=${queued}`,
     );
-    // Recipient + content are PII — debug only.
-    this.logger.debug(`SMS payload to=${dto.to} text="${dto.message}"`);
+    // Full content logged on purpose (audit of what actually left the API).
+    // Note: recipient + body are PII and land in plain application logs.
+    this.logger.log(`SMS payload to=${dto.to} text="${dto.message}"`);
     return { queued };
   }
 
@@ -81,7 +82,7 @@ export class SmsClientService implements OnApplicationBootstrap {
     this.logger.log(
       `BULK SMS publish to RabbitMQ [${process.env.SMS_QUEUE ?? "sms_queue"}] pattern='ozeking-bulk-sms' count=${messages.length} confirmed=${queued}`,
     );
-    this.logger.debug(`BULK SMS payload messages=${JSON.stringify(messages)}`);
+    this.logger.log(`BULK SMS payload messages=${JSON.stringify(messages)}`);
     return { queued };
   }
 
diff --git a/apps/edr-freight-api/src/modules/overview/overview.controller.ts b/apps/edr-freight-api/src/modules/overview/overview.controller.ts
index 661350f49..45c5cbfed 100644
--- a/apps/edr-freight-api/src/modules/overview/overview.controller.ts
+++ b/apps/edr-freight-api/src/modules/overview/overview.controller.ts
@@ -8,7 +8,8 @@ import {
 import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
 
-import { BookingView } from '../../common/booking-guards';
+import { BookingStaff } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { OverviewQueryDto } from './dto/overview-query.dto';
 import { OverviewResponseDto } from './dto/overview-response.dto';
 import {
@@ -32,7 +33,7 @@ export class OverviewController {
   ) {}
 
   @Get()
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.overview.view)
   @ApiOperation({ summary: 'Aggregated dashboard summary for backoffice overview' })
   @ApiOkResponse({ type: OverviewResponseDto })
   async getDashboard(
@@ -48,7 +49,7 @@ export class OverviewController {
   }
 
   @Get('bookings')
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.overview.view)
   @ApiOperation({ summary: 'Bookings tab metrics and charts' })
   @ApiOkResponse({ type: OverviewBookingsTabDto })
   async getBookingsTab(
@@ -64,7 +65,7 @@ export class OverviewController {
   }
 
   @Get('contracts')
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.overview.view)
   @ApiOperation({ summary: 'Contracts tab metrics and charts' })
   @ApiOkResponse({ type: OverviewContractsTabDto })
   async getContractsTab(
@@ -80,7 +81,7 @@ export class OverviewController {
   }
 
   @Get('billing')
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.overview.view)
   @ApiOperation({ summary: 'Billing tab metrics and charts' })
   @ApiOkResponse({ type: OverviewBillingTabDto })
   async getBillingTab(
@@ -96,7 +97,7 @@ export class OverviewController {
   }
 
   @Get('operations')
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.overview.view)
   @ApiOperation({ summary: 'Operations tab metrics and charts' })
   @ApiOkResponse({ type: OverviewOperationsTabDto })
   getOperationsTab(
@@ -106,7 +107,7 @@ export class OverviewController {
   }
 
   @Get('customers')
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.overview.view)
   @ApiOperation({ summary: 'Customers tab metrics and charts' })
   @ApiOkResponse({ type: OverviewCustomersTabDto })
   async getCustomersTab(
@@ -122,7 +123,7 @@ export class OverviewController {
   }
 
   @Get('staff')
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.overview.view)
   @ApiOperation({ summary: 'Staff tab metrics and charts' })
   @ApiOkResponse({ type: OverviewStaffTabDto })
   getStaffTab(@Query() query: OverviewQueryDto): Promise<OverviewStaffTabDto> {
diff --git a/apps/edr-freight-api/src/modules/payment/internal-payment.dto.ts b/apps/edr-freight-api/src/modules/payment/internal-payment.dto.ts
index e69a0e15a..f437000bd 100644
--- a/apps/edr-freight-api/src/modules/payment/internal-payment.dto.ts
+++ b/apps/edr-freight-api/src/modules/payment/internal-payment.dto.ts
@@ -1,8 +1,8 @@
 import {
     IsEnum,
     IsIn,
-    IsInt,
     IsISO8601,
+    IsNumber,
     IsOptional,
     IsPositive,
     IsString,
@@ -37,7 +37,9 @@ export class PaymentEventDto {
     @ApiProperty() @IsString() referenceId!: string;
     @ApiProperty() @IsString() merchantOrderId!: string;
     @ApiProperty({ enum: ProviderMethod }) @IsEnum(ProviderMethod) provider!: string;
-    @ApiProperty() @IsInt() @IsPositive() amountMinor!: number;
+    // Major units, fractional (payment-api stores it as double precision) — an
+    // invoice of 12345.67 must not be rejected by an integer-only validator.
+    @ApiProperty() @IsNumber() @IsPositive() amountMinor!: number;
     @ApiProperty() @IsString() currency!: string;
 
     @ApiPropertyOptional() @IsOptional() @IsString() providerTxnId?: string;
diff --git a/apps/edr-freight-api/src/modules/payment/payment.controller.ts b/apps/edr-freight-api/src/modules/payment/payment.controller.ts
index b1dafbc85..2a651962b 100644
--- a/apps/edr-freight-api/src/modules/payment/payment.controller.ts
+++ b/apps/edr-freight-api/src/modules/payment/payment.controller.ts
@@ -18,7 +18,7 @@ import {
 import { Response } from "express";
 import { CurrentUser, Public } from "@edr/api-common";
 import type { TCurrentUser } from "@tria-plc/api-common/modules/auth/types/current-user.type";
-import { BookingStaff, BookingView } from "../../common/booking-guards";
+import { BookingStaff, MixedAudience, PortalCustomer } from "../../common/booking-guards";
 import { UserTradeAccessService } from "../user-trade-access/user-trade-access.service";
 import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { PaymentService } from "./payment.service";
@@ -43,14 +43,14 @@ export class PaymentController {
     }
 
     @Get("summary")
-    @BookingView()
+    @BookingStaff(FREIGHT_PERMS.payments.view)
     @ApiOperation({ summary: "Payment count/amount summary for dashboard cards" })
     getSummary() {
         return this.paymentService.getSummary();
     }
 
     @Get("all")
-    @BookingView()
+    @BookingStaff(FREIGHT_PERMS.payments.view)
     @ApiOperation({ summary: "Get all payments with filters (view-only, any staff)" })
     @ApiQuery({ name: "search", required: false })
     @ApiQuery({ name: "status", required: false })
@@ -79,6 +79,7 @@ export class PaymentController {
     }
 
     @Get("intents/:bookingId")
+    @MixedAudience(FREIGHT_PERMS.payments.view)
     @ApiOperation({ summary: "Get payment intent status for a booking" })
     @ApiOkResponse({ type: IntentStatusDto })
     getIntent(@Param("bookingId") bookingId: string) {
@@ -86,6 +87,7 @@ export class PaymentController {
     }
 
     @Post("redirect-success/:bookingId")
+    @PortalCustomer()
     @ApiOperation({
         summary:
             "Success-redirect ack: mark payment processing + invoice PAYMENT_PROCESSING (webhook remains source of truth)",
diff --git a/apps/edr-freight-api/src/modules/procurement/procurement.controller.ts b/apps/edr-freight-api/src/modules/procurement/procurement.controller.ts
index e5c69f37c..e96b9dc74 100644
--- a/apps/edr-freight-api/src/modules/procurement/procurement.controller.ts
+++ b/apps/edr-freight-api/src/modules/procurement/procurement.controller.ts
@@ -1,5 +1,7 @@
 import { Controller, Post, Get, Patch, Delete, Body, Param, Query } from '@nestjs/common';
 import { ApiTags, ApiOperation } from '@nestjs/swagger';
+import { BookingStaff } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { ProcurementService } from './procurement.service';
 import {
   CreateVendorDto,
@@ -11,11 +13,20 @@ import {
 
 @ApiTags('Procurement & Asset Lifecycle')
 @Controller('procurement')
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.procurement.view,
+  FREIGHT_PERMS.procurement.vendorManage,
+  FREIGHT_PERMS.procurement.acquisitionManage,
+  FREIGHT_PERMS.procurement.disposalManage,
+])
 export class ProcurementController {
   constructor(private readonly procurementService: ProcurementService) {}
 
   // ---- Vendors ----
   @Post('vendors')
+  @BookingStaff(FREIGHT_PERMS.procurement.vendorManage)
   @ApiOperation({ summary: 'Create a vendor' })
   async createVendor(@Body() dto: CreateVendorDto) {
     return this.procurementService.createVendor(dto);
@@ -28,12 +39,14 @@ export class ProcurementController {
   }
 
   @Patch('vendors/:id')
+  @BookingStaff(FREIGHT_PERMS.procurement.vendorManage)
   @ApiOperation({ summary: 'Update a vendor' })
   async updateVendor(@Param('id') id: string, @Body() dto: UpdateVendorDto) {
     return this.procurementService.updateVendor(id, dto);
   }
 
   @Delete('vendors/:id')
+  @BookingStaff(FREIGHT_PERMS.procurement.vendorManage)
   @ApiOperation({ summary: 'Delete a vendor' })
   async deleteVendor(@Param('id') id: string) {
     return this.procurementService.deleteVendor(id);
@@ -41,6 +54,7 @@ export class ProcurementController {
 
   // ---- Acquisitions ----
   @Post('acquisitions')
+  @BookingStaff(FREIGHT_PERMS.procurement.acquisitionManage)
   @ApiOperation({ summary: 'Create an asset acquisition' })
   async createAcquisition(@Body() dto: CreateAcquisitionDto) {
     return this.procurementService.createAcquisition(dto);
@@ -59,12 +73,14 @@ export class ProcurementController {
   }
 
   @Patch('acquisitions/:id')
+  @BookingStaff(FREIGHT_PERMS.procurement.acquisitionManage)
   @ApiOperation({ summary: 'Update an asset acquisition' })
   async updateAcquisition(@Param('id') id: string, @Body() dto: UpdateAcquisitionDto) {
     return this.procurementService.updateAcquisition(id, dto);
   }
 
   @Delete('acquisitions/:id')
+  @BookingStaff(FREIGHT_PERMS.procurement.acquisitionManage)
   @ApiOperation({ summary: 'Delete an asset acquisition' })
   async deleteAcquisition(@Param('id') id: string) {
     return this.procurementService.deleteAcquisition(id);
@@ -72,6 +88,7 @@ export class ProcurementController {
 
   // ---- Disposals ----
   @Post('disposals')
+  @BookingStaff(FREIGHT_PERMS.procurement.disposalManage)
   @ApiOperation({ summary: 'Create an asset disposal' })
   async createDisposal(@Body() dto: CreateDisposalDto) {
     return this.procurementService.createDisposal(dto);
@@ -84,6 +101,7 @@ export class ProcurementController {
   }
 
   @Delete('disposals/:id')
+  @BookingStaff(FREIGHT_PERMS.procurement.disposalManage)
   @ApiOperation({ summary: 'Delete an asset disposal' })
   async deleteDisposal(@Param('id') id: string) {
     return this.procurementService.deleteDisposal(id);
diff --git a/apps/edr-freight-api/src/modules/reports/reports.controller.ts b/apps/edr-freight-api/src/modules/reports/reports.controller.ts
index bc2671680..dc64773d8 100644
--- a/apps/edr-freight-api/src/modules/reports/reports.controller.ts
+++ b/apps/edr-freight-api/src/modules/reports/reports.controller.ts
@@ -3,7 +3,8 @@ import { ApiBearerAuth, ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swa
 import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
 
-import { BookingView } from '../../common/booking-guards';
+import { BookingStaff } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { UserTradeAccessService } from '../user-trade-access/user-trade-access.service';
 import { ReportQueryDto } from './dto/report-query.dto';
 import { ReportResultDto } from './dto/report-result.dto';
@@ -19,7 +20,7 @@ export class ReportsController {
   ) {}
 
   @Get(':key')
-  @BookingView()
+  @BookingStaff(FREIGHT_PERMS.reports.view)
   @ApiOperation({ summary: 'Run a canned report by key with optional filters' })
   @ApiOkResponse({ type: ReportResultDto })
   async run(
diff --git a/apps/edr-freight-api/src/modules/routes/routes.controller.ts b/apps/edr-freight-api/src/modules/routes/routes.controller.ts
index ed61f08b0..96812275d 100644
--- a/apps/edr-freight-api/src/modules/routes/routes.controller.ts
+++ b/apps/edr-freight-api/src/modules/routes/routes.controller.ts
@@ -27,7 +27,15 @@ import { RoutesService } from './routes.service';
 @ApiTags('routes')
 @ApiBearerAuth()
 @Controller('routes')
-@FleetView(FREIGHT_PERMS.routes.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@FleetView([
+  FREIGHT_PERMS.routes.view,
+  FREIGHT_PERMS.routes.create,
+  FREIGHT_PERMS.routes.update,
+  FREIGHT_PERMS.routes.hardDelete,
+  FREIGHT_PERMS.routes.delete,
+])
 export class RoutesController {
   constructor(private readonly routesService: RoutesService) {}
 
diff --git a/apps/edr-freight-api/src/modules/rule-engine/controllers/rates.controller.ts b/apps/edr-freight-api/src/modules/rule-engine/controllers/rates.controller.ts
index f10c0afab..7321ddf23 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/controllers/rates.controller.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/controllers/rates.controller.ts
@@ -5,7 +5,7 @@ import {
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
-import { RuleEngineCreate, RuleEngineDelete, RuleEngineUpdate, RuleEngineView } from '../../../common/rule-engine-guards';
+import { RuleEngineApprove, RuleEngineCreate, RuleEngineDelete, RuleEngineUpdate, RuleEngineView } from '../../../common/rule-engine-guards';
 import { isSuperAdmin } from '../../../common/freight-permission.util';
 import { CreateRateDto } from '../dto/create-rate.dto';
 import { ListRatesQueryDto } from '../dto/list-rule-engine-query.dto';
@@ -68,7 +68,7 @@ export class RatesController {
   }
 
   @Post(':id/approve')
-  @RuleEngineUpdate('rates')
+  @RuleEngineApprove('rates')
   @ApiOperation({ summary: 'CEO approves a rate' })
   approve(
     @Param('id', ParseUUIDPipe) id: string,
diff --git a/apps/edr-freight-api/src/modules/rule-engine/dto/create-cargo-type.dto.ts b/apps/edr-freight-api/src/modules/rule-engine/dto/create-cargo-type.dto.ts
index eefc560e8..d116a4b4a 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/dto/create-cargo-type.dto.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/dto/create-cargo-type.dto.ts
@@ -70,6 +70,16 @@ export class CreateCargoTypeDto {
   @IsBoolean()
   hasLashing?: boolean;
 
+  @ApiPropertyOptional({
+    default: false,
+    description:
+      'Allow staff to write bulk contract templates for this cargo type. ' +
+      'Mutually exclusive with the parent group / children having it.',
+  })
+  @IsOptional()
+  @IsBoolean()
+  hasContractTemplate?: boolean;
+
   @ApiPropertyOptional({ default: true })
   @IsOptional()
   @IsBoolean()
diff --git a/apps/edr-freight-api/src/modules/rule-engine/entities/cargo-type.entity.ts b/apps/edr-freight-api/src/modules/rule-engine/entities/cargo-type.entity.ts
index e685f3a2d..b7717684a 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/entities/cargo-type.entity.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/entities/cargo-type.entity.ts
@@ -82,6 +82,14 @@ export class CargoType extends BaseEntity {
   @Column({ name: 'has_lashing', type: 'boolean', default: false })
   hasLashing!: boolean;
 
+  /**
+   * Whether staff may write bulk contract templates against this cargo type.
+   * Mutually exclusive between a parent group and its children: if the parent
+   * provides the template, no child may, and vice versa.
+   */
+  @Column({ name: 'has_contract_template', type: 'boolean', default: false })
+  hasContractTemplate!: boolean;
+
   @Column({ name: 'is_active', type: 'boolean', default: true })
   isActive!: boolean;
 
diff --git a/apps/edr-freight-api/src/modules/rule-engine/repositories/yards.repository.ts b/apps/edr-freight-api/src/modules/rule-engine/repositories/yards.repository.ts
index 5db5b72ae..b99b33a29 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/repositories/yards.repository.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/repositories/yards.repository.ts
@@ -43,6 +43,12 @@ export class YardsRepository implements IYardsRepository {
   findPaged(query: ListYardsQueryDto): Promise<PaginatedResponse<Yard>> {
     const qb = this.repo
       .createQueryBuilder('yard')
+      // createQueryBuilder does NOT auto-apply the soft-delete filter that
+      // repo.find()/findOne() get for free — without this, a renamed/replaced
+      // yard (e.g. an old "DMP" superseded by a new one) still shows up
+      // alongside the live one in every picker built off this endpoint, and a
+      // route picked against the dead yard id never matches any LIVE rate.
+      .where('yard.deleted_at IS NULL')
       .orderBy(`yard.${query.sortBy ?? 'displayOrder'}`, query.sortOrder ?? 'ASC')
       .addOrderBy('yard.label', 'ASC');
 
diff --git a/apps/edr-freight-api/src/modules/rule-engine/services/cargo-types.service.ts b/apps/edr-freight-api/src/modules/rule-engine/services/cargo-types.service.ts
index 1f25b0823..9c11005e9 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/services/cargo-types.service.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/services/cargo-types.service.ts
@@ -135,6 +135,35 @@ export class CargoTypesService {
     return map;
   }
 
+  /**
+   * A cargo type and its parent group may not BOTH offer a contract template —
+   * the template would be ambiguous for bookings of the child. To enable the
+   * child, the parent must be turned off first (and vice versa).
+   */
+  private async assertContractTemplateExclusive(input: {
+    id?: string;
+    parentGroupId?: string | null;
+  }): Promise<void> {
+    if (input.parentGroupId) {
+      const parent = await this.repository.findById(input.parentGroupId);
+      if (parent?.hasContractTemplate) {
+        throw new BadRequestException(
+          `Parent group "${parent.cargoTypeName}" already has a contract template — turn it off there first`,
+        );
+      }
+    }
+    if (input.id) {
+      const children = await this.repository.findAll({
+        where: { parentGroupId: input.id, hasContractTemplate: true },
+      });
+      if (children.length) {
+        throw new BadRequestException(
+          `Child cargo type(s) ${children.map((c) => `"${c.cargoTypeName}"`).join(', ')} already have their own contract template — turn those off first`,
+        );
+      }
+    }
+  }
+
   /** Create a new cargo type. */
   async create(dto: CreateCargoTypeDto): Promise<CargoType> {
     const code = generateCode(dto.cargoTypeName);
@@ -144,6 +173,9 @@ export class CargoTypesService {
       const parent = await this.repository.findById(dto.parentGroupId);
       if (!parent) throw new NotFoundException(`Parent cargo type ${dto.parentGroupId} not found`);
     }
+    if (dto.hasContractTemplate) {
+      await this.assertContractTemplateExclusive({ parentGroupId: dto.parentGroupId });
+    }
 
     const displayOrder = await this.displayOrder.resolveCreateOrder(CargoType, 'displayOrder', {
       explicitOrder: dto.displayOrder,
@@ -160,6 +192,7 @@ export class CargoTypesService {
       code,
       cargoTypeName: dto.cargoTypeName,
       parentGroupId: dto.parentGroupId ?? null,
+      hasContractTemplate: dto.hasContractTemplate ?? false,
       requiresDirectorApproval: dto.requiresDirectorApproval ?? false,
       isActive: dto.isActive ?? true,
       unitOfMeasure: dto.unitOfMeasure ?? null,
@@ -183,6 +216,18 @@ export class CargoTypesService {
       const parent = await this.repository.findById(dto.parentGroupId);
       if (!parent) throw new NotFoundException(`Parent cargo type ${dto.parentGroupId} not found`);
     }
+    // Re-check the parent/child template exclusivity whenever the flag or the
+    // parent moves and the row ends up flagged.
+    const willHaveTemplate = dto.hasContractTemplate ?? existing.hasContractTemplate;
+    if (
+      willHaveTemplate &&
+      (dto.hasContractTemplate !== undefined || dto.parentGroupId !== undefined)
+    ) {
+      await this.assertContractTemplateExclusive({
+        id,
+        parentGroupId: dto.parentGroupId ?? existing.parentGroupId,
+      });
+    }
     const {
       wagonTypeIds,
       itemsPerWagonMap,
diff --git a/apps/edr-freight-api/src/modules/rule-engine/services/priority-rule-change-requests.service.ts b/apps/edr-freight-api/src/modules/rule-engine/services/priority-rule-change-requests.service.ts
index a80221c68..1526769d3 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/services/priority-rule-change-requests.service.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/services/priority-rule-change-requests.service.ts
@@ -22,6 +22,7 @@ import {
   PriorityRuleChangeStatus,
 } from '../entities/priority-rule-change-request.entity';
 import { PriorityConfigsService } from './priority-configs.service';
+import { FREIGHT_PERMS } from '../../../seed/freight-permissions.registry';
 
 /** Backoffice rule-engine page — where both queue and rules live. */
 const RULES_LINK = '/dashboard/rules/priority-configs';
@@ -221,7 +222,9 @@ export class PriorityRuleChangeRequestsService {
   ): void {
     void this.inbox
       .notify({
-        recipients: { allBackoffice: true },
+        recipients: {
+          permissionKeys: [FREIGHT_PERMS.ruleEngine.getNotification],
+        },
         audience: NotificationAudience.BACKOFFICE,
         type: NotificationType.REQUEST_SUBMITTED,
         title,
diff --git a/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts b/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts
index 6dde40d7d..8cc97f343 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts
@@ -19,6 +19,7 @@ import {
 } from '../entities/rate-change-request.entity';
 import { Rate } from '../entities/rate.entity';
 import { RatesService } from './rates.service';
+import { FREIGHT_PERMS } from '../../../seed/freight-permissions.registry';
 
 /** Backoffice page where both the queue and the rates live. */
 const RATES_LINK = '/dashboard/rules/rates';
@@ -234,7 +235,9 @@ export class RateChangeRequestsService {
   private notifyTeam(title: string, body: string, request: RateChangeRequest): void {
     void this.inbox
       .notify({
-        recipients: { allBackoffice: true },
+        recipients: {
+          permissionKeys: [FREIGHT_PERMS.ruleEngine.getNotification],
+        },
         audience: NotificationAudience.BACKOFFICE,
         type: NotificationType.REQUEST_SUBMITTED,
         title,
diff --git a/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts b/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts
index 5645334e5..971097377 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts
@@ -7,7 +7,7 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { PaginatedResponse, YardCountry } from '@edr/types';
-import { Not } from 'typeorm';
+import { IsNull, Not } from 'typeorm';
 import { CreateRateDto } from '../dto/create-rate.dto';
 import { ListRatesQueryDto } from '../dto/list-rule-engine-query.dto';
 import { UpdateRateDto } from '../dto/update-rate.dto';
@@ -344,11 +344,12 @@ export class RatesService {
   /**
    * Validate and normalise the last-mile band fields for a rate shape.
    *
-   * Last-mile rates come in two calculation modes: bulk (PER_TON_KM — price =
-   * tons × km × rate, one row, no scope) and container (PER_KM — one row per
-   * container type per distance band, price = km × rate × quantity). Every
-   * other rate shape has its band fields cleared, mirroring how yard scope is
-   * cleared for non-route rates.
+   * Last-mile rates come in two calculation modes: bulk (PER_TON_KM — one row
+   * per distance band, price = tons × km × rate) and container (PER_KM — one
+   * row per container type per distance band, price = km × rate × quantity).
+   * A bandless bulk row (NULL minKm) is the legacy pre-band shape and still
+   * prices every distance. Every other rate shape has its band fields cleared,
+   * mirroring how yard scope is cleared for non-route rates.
    */
   private resolveLastMileBand(input: {
     appliesTo: Rate['appliesTo'];
@@ -366,7 +367,21 @@ export class RatesService {
           'A bulk last-mile rate (per ton per km) cannot be scoped to a container type.',
         );
       }
-      return { minKm: null, maxKm: null };
+      const minKm = input.minKm ?? null;
+      const maxKm = input.maxKm ?? null;
+      if (minKm === null) {
+        if (maxKm !== null) {
+          throw new BadRequestException(
+            '"To km" needs a "From km" — set the band start (0 for the first tier).',
+          );
+        }
+        // Legacy bandless bulk rate — prices every distance.
+        return { minKm: null, maxKm: null };
+      }
+      if (maxKm !== null && maxKm <= minKm) {
+        throw new BadRequestException('"To km" must be greater than "From km".');
+      }
+      return { minKm, maxKm };
     }
 
     if (rateUnit === 'PER_KM') {
@@ -393,14 +408,16 @@ export class RatesService {
   }
 
   /**
-   * Reject a container last-mile band that overlaps an existing band for the
-   * same container type. Bands are half-open [minKm, maxKm) with NULL maxKm =
-   * open-ended, so 0–30 and 30–∞ tile cleanly. Checked across every
-   * non-superseded row (DRAFT included) — two drafts with colliding bands would
-   * only defer the conflict to approval.
+   * Reject a last-mile band that overlaps an existing band for the same scope —
+   * container bands collide per container type (PER_KM), bulk bands collide
+   * with each other (PER_TON_KM, no container scope). Bands are half-open
+   * [minKm, maxKm) with NULL maxKm = open-ended, so 0–30 and 30–∞ tile
+   * cleanly. Checked across every non-superseded row (DRAFT included) — two
+   * drafts with colliding bands would only defer the conflict to approval.
    */
   private async assertNoBandOverlap(input: {
-    containerTypeId: string;
+    rateUnit: 'PER_KM' | 'PER_TON_KM';
+    containerTypeId: string | null;
     minKm: number;
     maxKm: number | null;
     ignoreId?: string;
@@ -408,8 +425,8 @@ export class RatesService {
     const siblings = await this.repository.findAll({
       where: {
         rateType: 'LAST_MILE',
-        rateUnit: 'PER_KM',
-        containerTypeId: input.containerTypeId,
+        rateUnit: input.rateUnit,
+        containerTypeId: input.containerTypeId ?? IsNull(),
         status: Not('SUPERSEDED'),
       },
     });
@@ -425,7 +442,7 @@ export class RatesService {
       if (input.minKm < sibMax && sibMin < newMax) {
         const sibLabel = `${sibMin}–${sibMax === Number.POSITIVE_INFINITY ? 'open' : sibMax} km`;
         throw new ConflictException(
-          `This distance band overlaps the existing ${sibLabel} band for this container type. Adjust the ranges so each distance falls in exactly one band.`,
+          `This distance band overlaps the existing ${sibLabel} band for ${input.rateUnit === 'PER_TON_KM' ? 'bulk last-mile' : 'this container type'}. Adjust the ranges so each distance falls in exactly one band.`,
         );
       }
     }
@@ -538,8 +555,12 @@ export class RatesService {
       minKm: dto.minKm,
       maxKm: dto.maxKm,
     });
-    if (appliesTo === 'LAST_MILE' && rateUnit === 'PER_KM' && containerTypeId && minKm !== null) {
-      await this.assertNoBandOverlap({ containerTypeId, minKm, maxKm });
+    if (
+      appliesTo === 'LAST_MILE' &&
+      (rateUnit === 'PER_KM' || rateUnit === 'PER_TON_KM') &&
+      minKm !== null
+    ) {
+      await this.assertNoBandOverlap({ rateUnit, containerTypeId, minKm, maxKm });
     }
 
     await this.assertNoDuplicatePattern({
@@ -742,12 +763,12 @@ export class RatesService {
     updates.maxKm = maxKm;
     if (
       appliesTo === 'LAST_MILE' &&
-      rateUnit === 'PER_KM' &&
-      updates.containerTypeId &&
+      (rateUnit === 'PER_KM' || rateUnit === 'PER_TON_KM') &&
       minKm !== null
     ) {
       await this.assertNoBandOverlap({
-        containerTypeId: updates.containerTypeId,
+        rateUnit,
+        containerTypeId: updates.containerTypeId ?? null,
         minKm,
         maxKm,
         ignoreId: id,
diff --git a/apps/edr-freight-api/src/modules/scheduling-reschedule/scheduling-reschedule.service.ts b/apps/edr-freight-api/src/modules/scheduling-reschedule/scheduling-reschedule.service.ts
index fefbbc868..7283c874a 100644
--- a/apps/edr-freight-api/src/modules/scheduling-reschedule/scheduling-reschedule.service.ts
+++ b/apps/edr-freight-api/src/modules/scheduling-reschedule/scheduling-reschedule.service.ts
@@ -11,7 +11,7 @@ import { Booking } from '../bookings/entities/booking.entity';
 import { BookingsRepository } from '../bookings/bookings.repository';
 import { compareSchedulingPriority } from '../scheduling/compare-scheduling-priority.util';
 import { TrainSchedulesRepository } from '../train-schedules/train-schedules.repository';
-import { TrainSchedulingService } from '../train-scheduling/train-scheduling.service';
+import { TrainSchedulingService } from '../train-scheduling/services/train-scheduling.service';
 import { BookingNotifierService } from '../train-scheduling/booking-notifier.service';
 import { ExecuteRescheduleDto, PreviewRescheduleDto } from './dto/preview-reschedule.dto';
 import { MaintenanceRescheduleDto } from './dto/maintenance-reschedule.dto';
diff --git a/apps/edr-freight-api/src/modules/support-chat/support-attachment.controller.ts b/apps/edr-freight-api/src/modules/support-chat/support-attachment.controller.ts
index be7c78fdc..91d4a8e2c 100644
--- a/apps/edr-freight-api/src/modules/support-chat/support-attachment.controller.ts
+++ b/apps/edr-freight-api/src/modules/support-chat/support-attachment.controller.ts
@@ -18,10 +18,12 @@ import {
 } from "@nestjs/swagger";
 import { Response } from "express";
 
+import { MixedAudience } from "../../common/booking-guards";
 import {
   AuthUserPayload,
   resolveAuthUserId,
 } from "../../common/resolve-auth-user-id";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { FilesService } from "../files/files.service";
 import { SupportChatService } from "./support-chat.service";
 
@@ -48,6 +50,7 @@ export class SupportAttachmentController {
   ) {}
 
   @Get(":fileId")
+  @MixedAudience(FREIGHT_PERMS.support.agentView)
   @ApiOperation({
     summary: "Download a support chat attachment",
     description:
diff --git a/apps/edr-freight-api/src/modules/support-chat/support-chat-agent.controller.ts b/apps/edr-freight-api/src/modules/support-chat/support-chat-agent.controller.ts
index 06fe9b2a9..8b8dbee1b 100644
--- a/apps/edr-freight-api/src/modules/support-chat/support-chat-agent.controller.ts
+++ b/apps/edr-freight-api/src/modules/support-chat/support-chat-agent.controller.ts
@@ -17,10 +17,12 @@ import {
 import { FilesInterceptor } from "@nestjs/platform-express";
 import { ApiBody, ApiConsumes, ApiOperation, ApiTags } from "@nestjs/swagger";
 
+import { BookingStaff } from "../../common/booking-guards";
 import {
   AuthUserPayload,
   resolveAuthUserId,
 } from "../../common/resolve-auth-user-id";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import {
   SUPPORT_ATTACHMENT_FIELD,
   supportAttachmentMulterOptions,
@@ -38,12 +40,14 @@ export class SupportChatAgentController {
   constructor(private readonly service: SupportChatService) {}
 
   @Get("conversations")
+  @BookingStaff(FREIGHT_PERMS.support.agentView)
   @ApiOperation({ summary: "List all support threads (shared inbox)" })
   list(@Query() query: ListConversationsQueryDto) {
     return this.service.listForAgents(query);
   }
 
   @Post("conversations")
+  @BookingStaff(FREIGHT_PERMS.support.agentSend)
   @ApiOperation({
     summary: "Start chatting with a company (returns the thread if one exists)",
   })
@@ -52,6 +56,7 @@ export class SupportChatAgentController {
   }
 
   @Get("conversations/:id/messages")
+  @BookingStaff(FREIGHT_PERMS.support.agentView)
   @ApiOperation({
     summary: "List messages in a thread (newest page first)",
     description:
@@ -67,6 +72,7 @@ export class SupportChatAgentController {
   }
 
   @Post("conversations/:id/messages")
+  @BookingStaff(FREIGHT_PERMS.support.agentSend)
   @UseInterceptors(
     FilesInterceptor(
       SUPPORT_ATTACHMENT_FIELD,
@@ -106,6 +112,7 @@ export class SupportChatAgentController {
   }
 
   @Post("conversations/:id/read")
+  @BookingStaff(FREIGHT_PERMS.support.agentView)
   @ApiOperation({ summary: "Mark a thread read (agent side)" })
   read(
     @CurrentUser() user: AuthUserPayload,
@@ -115,6 +122,7 @@ export class SupportChatAgentController {
   }
 
   @Get("unread-count")
+  @BookingStaff(FREIGHT_PERMS.support.agentView)
   @ApiOperation({ summary: "Count unread threads (agent side)" })
   unread(@CurrentUser() user: AuthUserPayload) {
     return this.service.unreadCount(
diff --git a/apps/edr-freight-api/src/modules/support-chat/support-chat.controller.ts b/apps/edr-freight-api/src/modules/support-chat/support-chat.controller.ts
index 88686bfa8..9201cf450 100644
--- a/apps/edr-freight-api/src/modules/support-chat/support-chat.controller.ts
+++ b/apps/edr-freight-api/src/modules/support-chat/support-chat.controller.ts
@@ -23,6 +23,7 @@ import {
   SUPPORT_ATTACHMENT_FIELD,
   supportAttachmentMulterOptions,
 } from "./attachment-upload.options";
+import { PortalCustomer } from "../../common/booking-guards";
 import { ListMessagesQueryDto } from "./dto/list-messages-query.dto";
 import { SendMessageDto } from "./dto/send-message.dto";
 import { SupportChatService } from "./support-chat.service";
@@ -34,6 +35,7 @@ import { SupportChatService } from "./support-chat.service";
  */
 @ApiTags("support-chat")
 @Controller("support")
+@PortalCustomer()
 export class SupportChatController {
   constructor(private readonly service: SupportChatService) {}
 
diff --git a/apps/edr-freight-api/src/modules/support-content/dto/support-content.dto.ts b/apps/edr-freight-api/src/modules/support-content/dto/support-content.dto.ts
new file mode 100644
index 000000000..64b5bfcb2
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/dto/support-content.dto.ts
@@ -0,0 +1,251 @@
+import { SupportDocSlug } from "@edr/types";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import {
+  ArrayMaxSize,
+  IsArray,
+  IsObject,
+  IsOptional,
+  IsString,
+  Matches,
+  MaxLength,
+  MinLength,
+  ValidateNested,
+} from "class-validator";
+
+/**
+ * Markdown bodies are safe on read — the portal renders them with
+ * `react-markdown` and no `rehype-raw`, so any HTML in them is inert. The
+ * fields worth validating are these: they land in `href`/`src` attributes and
+ * bypass markdown entirely, which is where a `javascript:` URL would actually
+ * execute.
+ *
+ * Placeholders survive the check because they sit after the scheme
+ * (`mailto:{{supportEmail}}`, `tel:{{supportPhoneTel}}`).
+ */
+const LINK_PATTERN = /^(https?:\/\/|mailto:|tel:|\/)/;
+const LINK_MESSAGE =
+  "$property must start with http(s)://, mailto:, tel: or /";
+
+/* ------------------------------- CONTACT ------------------------------- */
+
+export class PortalSupportContactDto {
+  @ApiProperty()
+  @IsString()
+  @MinLength(3)
+  @MaxLength(200)
+  email!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(3)
+  @MaxLength(60)
+  phone!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  office!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  hours!: string;
+}
+
+/* ---------------------------- PRIVACY / TERMS --------------------------- */
+
+export class PortalDocSectionDto {
+  @ApiPropertyOptional({ description: "Stable id; generated when omitted" })
+  @IsOptional()
+  @IsString()
+  @MaxLength(64)
+  id?: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  heading!: string;
+
+  @ApiProperty({ description: "Markdown" })
+  @IsString()
+  @MaxLength(20_000)
+  body!: string;
+}
+
+export class PortalLegalContentDto {
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  title!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MaxLength(500)
+  subtitle!: string;
+
+  @ApiProperty({ description: 'Free text, e.g. "6 August 2026"' })
+  @IsString()
+  @MaxLength(60)
+  lastUpdated!: string;
+
+  @ApiProperty({ type: [PortalDocSectionDto] })
+  @IsArray()
+  @ArrayMaxSize(60)
+  @ValidateNested({ each: true })
+  @Type(() => PortalDocSectionDto)
+  sections!: PortalDocSectionDto[];
+}
+
+/* --------------------------------- FAQ --------------------------------- */
+
+export class PortalCtaCardDto {
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  heading!: string;
+
+  @ApiProperty({ description: "Markdown" })
+  @IsString()
+  @MaxLength(2_000)
+  body!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(100)
+  ctaLabel!: string;
+
+  @ApiProperty()
+  @IsString()
+  @Matches(LINK_PATTERN, { message: LINK_MESSAGE })
+  @MaxLength(500)
+  ctaTo!: string;
+}
+
+export class PortalFaqItemDto {
+  @ApiPropertyOptional({ description: "Stable id; generated when omitted" })
+  @IsOptional()
+  @IsString()
+  @MaxLength(64)
+  id?: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(300)
+  question!: string;
+
+  @ApiProperty({ description: "Markdown" })
+  @IsString()
+  @MaxLength(5_000)
+  answer!: string;
+}
+
+export class PortalFaqGroupDto {
+  @ApiPropertyOptional({ description: "Stable id; generated when omitted" })
+  @IsOptional()
+  @IsString()
+  @MaxLength(64)
+  id?: string;
+
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  title!: string;
+
+  @ApiProperty({ type: [PortalFaqItemDto] })
+  @IsArray()
+  @ArrayMaxSize(50)
+  @ValidateNested({ each: true })
+  @Type(() => PortalFaqItemDto)
+  items!: PortalFaqItemDto[];
+}
+
+export class PortalFaqContentDto {
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  title!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MaxLength(500)
+  subtitle!: string;
+
+  @ApiProperty({ type: [PortalFaqGroupDto] })
+  @IsArray()
+  @ArrayMaxSize(20)
+  @ValidateNested({ each: true })
+  @Type(() => PortalFaqGroupDto)
+  groups!: PortalFaqGroupDto[];
+
+  @ApiPropertyOptional({ type: PortalCtaCardDto, nullable: true })
+  @IsOptional()
+  @ValidateNested()
+  @Type(() => PortalCtaCardDto)
+  footer?: PortalCtaCardDto | null;
+}
+
+/* --------------------------------- HELP -------------------------------- */
+
+export class PortalHelpContentDto {
+  @ApiProperty()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  title!: string;
+
+  @ApiProperty()
+  @IsString()
+  @MaxLength(500)
+  subtitle!: string;
+
+  /**
+   * Same section shape as the legal documents — images and videos live inside
+   * the markdown, so a help section needs nothing the others do not have.
+   */
+  @ApiProperty({ type: [PortalDocSectionDto] })
+  @IsArray()
+  @ArrayMaxSize(40)
+  @ValidateNested({ each: true })
+  @Type(() => PortalDocSectionDto)
+  sections!: PortalDocSectionDto[];
+}
+
+/* ------------------------------- request ------------------------------- */
+
+export class UpdateSupportDocumentDto {
+  @ApiProperty({
+    description:
+      "The document's whole payload. Validated against the shape for its slug.",
+    type: Object,
+  })
+  @IsObject()
+  payload!: Record<string, unknown>;
+
+  @ApiPropertyOptional({ description: "Why this change was made" })
+  @IsOptional()
+  @IsString()
+  @MaxLength(255)
+  note?: string;
+}
+
+/** Which DTO class a slug's payload is validated against on write. */
+export const PAYLOAD_DTO_BY_SLUG: Record<
+  SupportDocSlug,
+  new () => object
+> = {
+  CONTACT: PortalSupportContactDto,
+  HELP: PortalHelpContentDto,
+  FAQ: PortalFaqContentDto,
+  PRIVACY: PortalLegalContentDto,
+  TERMS: PortalLegalContentDto,
+};
diff --git a/apps/edr-freight-api/src/modules/support-content/entities/support-document.entity.ts b/apps/edr-freight-api/src/modules/support-content/entities/support-document.entity.ts
new file mode 100644
index 000000000..1b8a1acd7
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/entities/support-document.entity.ts
@@ -0,0 +1,69 @@
+import { BaseEntity } from "@edr/api-common";
+import type { SupportDocPayload, SupportDocSlug } from "@edr/types";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+/**
+ * One editable customer-facing document for the freight portal's public pages
+ * (/help, /faq, /terms, /privacy) plus the support contact block they all
+ * quote. Five fixed rows, keyed by slug and seeded on first boot — there is no
+ * create/delete route.
+ *
+ * The payload is opaque jsonb because the five documents have genuinely
+ * different shapes and the help page's blocks keep changing; typed columns
+ * would mean a migration per copy tweak. Shape safety lives in the per-slug
+ * DTOs the service validates against on write, the same arrangement
+ * `contract_templates.articles` already uses.
+ *
+ * `version` is the live row's version and always equals `max(version)` in
+ * {@link SupportDocumentVersion} — the seeder writes v1 and its history row
+ * together, so the log is never missing the current state.
+ */
+@Entity({ schema: "freight", name: "support_documents" })
+@Index(["slug"], { unique: true })
+export class SupportDocument extends BaseEntity {
+  @Column({ name: "slug", type: "varchar", length: 32, unique: true })
+  slug!: SupportDocSlug;
+
+  @Column({ name: "payload", type: "jsonb", default: () => "'{}'::jsonb" })
+  payload!: SupportDocPayload;
+
+  @Column({ name: "version", type: "int", default: 1 })
+  version!: number;
+
+  @Column({ name: "updated_by_id", type: "uuid", nullable: true })
+  updatedById?: string | null;
+}
+
+/**
+ * Append-only history of every saved state of a document, written in the same
+ * transaction as the live row. Restoring is not a pointer reset: it re-saves an
+ * old payload through the normal write path, producing a *new* version, so a
+ * restore is itself undoable and the log only ever grows.
+ *
+ * Modelled on {@link CompanyRevision}, but snapshots the whole payload rather
+ * than a field diff — rollback needs the full state, not the delta.
+ */
+@Entity({ schema: "freight", name: "support_document_versions" })
+@Index(["documentId"])
+export class SupportDocumentVersion extends BaseEntity {
+  @Column({ name: "document_id", type: "uuid" })
+  documentId!: string;
+
+  @ManyToOne(() => SupportDocument, { onDelete: "CASCADE" })
+  @JoinColumn({ name: "document_id" })
+  document?: SupportDocument;
+
+  @Column({ name: "version", type: "int" })
+  version!: number;
+
+  @Column({ name: "payload", type: "jsonb" })
+  payload!: SupportDocPayload;
+
+  /** Who saved it. Null for the seeded initial version. */
+  @Column({ name: "actor_id", type: "uuid", nullable: true })
+  actorId?: string | null;
+
+  /** Optional "why" the editor typed, shown in the history list. */
+  @Column({ name: "note", type: "varchar", length: 255, nullable: true })
+  note?: string | null;
+}
diff --git a/apps/edr-freight-api/src/modules/support-content/public-support-content.controller.ts b/apps/edr-freight-api/src/modules/support-content/public-support-content.controller.ts
new file mode 100644
index 000000000..905ebc974
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/public-support-content.controller.ts
@@ -0,0 +1,29 @@
+import { Public } from "@edr/api-common";
+import { Controller, Get, Header } from "@nestjs/common";
+import { ApiOperation, ApiTags } from "@nestjs/swagger";
+
+import { SupportContentService } from "./support-content.service";
+
+/**
+ * The portal's /help, /faq, /terms and /privacy routes are deliberately outside
+ * its auth guard — the sign-up screen links to them before a session exists —
+ * so this read must work with no token. `@Public()` is class-level because that
+ * is the idiom the other genuinely-anonymous controllers here use; without it
+ * the globally registered `JwtGuard` would 401 every anonymous visitor.
+ */
+@ApiTags("support-content")
+@Public()
+@Controller("support-content")
+export class PublicSupportContentController {
+  constructor(private readonly service: SupportContentService) {}
+
+  @Get()
+  // Hit on every anonymous page view, and the copy changes a few times a year.
+  @Header("Cache-Control", "public, max-age=300")
+  @ApiOperation({
+    summary: "Public help, FAQ, legal and support-contact copy for the portal",
+  })
+  getBundle() {
+    return this.service.getBundle();
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/support-content/support-content.controller.ts b/apps/edr-freight-api/src/modules/support-content/support-content.controller.ts
new file mode 100644
index 000000000..218a95985
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/support-content.controller.ts
@@ -0,0 +1,135 @@
+import { CurrentUser } from "@edr/api-common";
+import { SUPPORT_MEDIA_MAX_BYTES } from "@edr/types";
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseIntPipe,
+  Patch,
+  Post,
+  Query,
+  UploadedFile,
+  UseInterceptors,
+} from "@nestjs/common";
+import { FileInterceptor } from "@nestjs/platform-express";
+import {
+  ApiBearerAuth,
+  ApiConsumes,
+  ApiOperation,
+  ApiQuery,
+  ApiTags,
+} from "@nestjs/swagger";
+import type { TCurrentUser } from "@tria-plc/api-common/modules/auth/types/current-user.type";
+
+import { BookingStaff } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
+import { UpdateSupportDocumentDto } from "./dto/support-content.dto";
+import { SupportContentService } from "./support-content.service";
+
+const READ = [
+  FREIGHT_PERMS.settings.supportContent.view,
+  FREIGHT_PERMS.settings.supportContent.manage,
+  FREIGHT_PERMS.admin,
+];
+
+const WRITE = [
+  FREIGHT_PERMS.settings.supportContent.manage,
+  FREIGHT_PERMS.admin,
+];
+
+@ApiTags("support-content")
+@ApiBearerAuth()
+@Controller("support-content")
+export class SupportContentController {
+  constructor(private readonly service: SupportContentService) {}
+
+  /**
+   * Stores a help-page image or video and returns its object key. The editor
+   * saves the key, not the returned URL — see `SupportContentService.uploadMedia`.
+   *
+   * The Multer limit duplicates the service-side type check on purpose: it
+   * stops reading the socket once the part is oversized instead of buffering
+   * the whole thing into memory first.
+   */
+  @Post("media")
+  @BookingStaff(WRITE)
+  @UseInterceptors(
+    FileInterceptor("file", { limits: { fileSize: SUPPORT_MEDIA_MAX_BYTES } }),
+  )
+  @ApiConsumes("multipart/form-data")
+  @ApiOperation({ summary: "Upload an image or video for a help section" })
+  uploadMedia(@UploadedFile() file: Express.Multer.File) {
+    return this.service.uploadMedia(file);
+  }
+
+  /**
+   * Signs one stored key so the editor can preview an already-saved image.
+   * The editor stores `minio:<key>`, never a signed URL, so it needs somewhere
+   * to resolve those refs for display — this is it.
+   */
+  @Get("media-url")
+  @BookingStaff(READ)
+  @ApiQuery({ name: "key", description: "MinIO object key" })
+  @ApiOperation({ summary: "Presigned URL for one stored media key" })
+  mediaUrl(@Query("key") key: string) {
+    return this.service.mediaUrl(key);
+  }
+
+  @Get("documents")
+  @BookingStaff(READ)
+  @ApiOperation({ summary: "List the five portal content documents (no payloads)" })
+  list() {
+    return this.service.list();
+  }
+
+  @Get("documents/:slug")
+  @BookingStaff(READ)
+  @ApiOperation({ summary: "Get one document with its payload" })
+  getBySlug(@Param("slug") slug: string) {
+    return this.service.getBySlug(slug);
+  }
+
+  @Patch("documents/:slug")
+  @BookingStaff(WRITE)
+  @ApiOperation({
+    summary: "Replace a document's payload, recording a new version",
+  })
+  update(
+    @Param("slug") slug: string,
+    @Body() dto: UpdateSupportDocumentDto,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    return this.service.update(slug, dto, user?.id ?? null);
+  }
+
+  @Get("documents/:slug/versions")
+  @BookingStaff(READ)
+  @ApiOperation({ summary: "Version history, newest first (no payloads)" })
+  listVersions(@Param("slug") slug: string) {
+    return this.service.listVersions(slug);
+  }
+
+  @Get("documents/:slug/versions/:version")
+  @BookingStaff(READ)
+  @ApiOperation({ summary: "One historical version, with its payload" })
+  getVersion(
+    @Param("slug") slug: string,
+    @Param("version", ParseIntPipe) version: number,
+  ) {
+    return this.service.getVersion(slug, version);
+  }
+
+  @Post("documents/:slug/versions/:version/restore")
+  @BookingStaff(WRITE)
+  @ApiOperation({
+    summary: "Restore a version — re-saves it as a new version, never destructive",
+  })
+  restore(
+    @Param("slug") slug: string,
+    @Param("version", ParseIntPipe) version: number,
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    return this.service.restore(slug, version, user?.id ?? null);
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/support-content/support-content.module.ts b/apps/edr-freight-api/src/modules/support-content/support-content.module.ts
new file mode 100644
index 000000000..53467153d
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/support-content.module.ts
@@ -0,0 +1,23 @@
+import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+
+import { MinioModule } from "../minio/minio.module";
+import {
+  SupportDocument,
+  SupportDocumentVersion,
+} from "./entities/support-document.entity";
+import { PublicSupportContentController } from "./public-support-content.controller";
+import { SupportContentController } from "./support-content.controller";
+import { SupportContentRepository } from "./support-content.repository";
+import { SupportContentService } from "./support-content.service";
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([SupportDocument, SupportDocumentVersion]),
+    MinioModule,
+  ],
+  controllers: [PublicSupportContentController, SupportContentController],
+  providers: [SupportContentRepository, SupportContentService],
+  exports: [SupportContentService],
+})
+export class SupportContentModule {}
diff --git a/apps/edr-freight-api/src/modules/support-content/support-content.repository.ts b/apps/edr-freight-api/src/modules/support-content/support-content.repository.ts
new file mode 100644
index 000000000..eacc28926
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/support-content.repository.ts
@@ -0,0 +1,71 @@
+import { BaseRepository } from "@edr/api-common";
+import type { SupportDocSlug } from "@edr/types";
+import { Injectable } from "@nestjs/common";
+import { InjectRepository } from "@nestjs/typeorm";
+import { Repository } from "typeorm";
+
+import {
+  SupportDocument,
+  SupportDocumentVersion,
+} from "./entities/support-document.entity";
+
+@Injectable()
+export class SupportContentRepository extends BaseRepository<SupportDocument> {
+  constructor(
+    @InjectRepository(SupportDocument)
+    repository: Repository<SupportDocument>,
+    @InjectRepository(SupportDocumentVersion)
+    private readonly versions: Repository<SupportDocumentVersion>,
+  ) {
+    super(repository);
+  }
+
+  findBySlug(slug: SupportDocSlug): Promise<SupportDocument | null> {
+    return this.repository.findOne({ where: { slug } });
+  }
+
+  override findAll(): Promise<SupportDocument[]> {
+    return this.repository.find({ order: { slug: "ASC" } });
+  }
+
+  findVersions(documentId: string): Promise<SupportDocumentVersion[]> {
+    return this.versions.find({
+      where: { documentId },
+      order: { version: "DESC" },
+    });
+  }
+
+  findVersion(
+    documentId: string,
+    version: number,
+  ): Promise<SupportDocumentVersion | null> {
+    return this.versions.findOne({ where: { documentId, version } });
+  }
+
+  /**
+   * Bump the live row and append its history entry atomically. Doing both in
+   * one transaction is what guarantees `document.version` always has a matching
+   * version row — the invariant the history list and rollback both rely on.
+   */
+  async saveWithVersion(
+    document: SupportDocument,
+    actorId: string | null,
+    note: string | null,
+  ): Promise<SupportDocument> {
+    return this.repository.manager.transaction(async (manager) => {
+      const saved = await manager.save(SupportDocument, document);
+
+      await manager.save(
+        manager.create(SupportDocumentVersion, {
+          documentId: saved.id,
+          version: saved.version,
+          payload: saved.payload,
+          actorId,
+          note,
+        }),
+      );
+
+      return saved;
+    });
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/support-content/support-content.service.spec.ts b/apps/edr-freight-api/src/modules/support-content/support-content.service.spec.ts
new file mode 100644
index 000000000..d1d72b397
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/support-content.service.spec.ts
@@ -0,0 +1,230 @@
+import {
+  SUPPORT_CONTENT_DEFAULTS,
+  SUPPORT_DOC_SLUGS,
+  SupportDocPayload,
+  SupportDocSlug,
+} from "@edr/types";
+import { BadRequestException, NotFoundException } from "@nestjs/common";
+
+import { MinioService } from "../minio/minio.service";
+import {
+  SupportDocument,
+  SupportDocumentVersion,
+} from "./entities/support-document.entity";
+import { SupportContentRepository } from "./support-content.repository";
+import { SupportContentService, validatePayload } from "./support-content.service";
+
+const ACTOR = "11111111-1111-4111-8111-111111111111";
+
+/**
+ * In-memory stand-in for the repository: one seeded document plus its version
+ * log, with `saveWithVersion` doing what the real transaction does. Enough to
+ * assert the rollback contract without a database.
+ */
+function makeRepository(slug: SupportDocSlug) {
+  const document = {
+    id: "00000000-0000-0000-0000-000000000001",
+    slug,
+    payload: SUPPORT_CONTENT_DEFAULTS[slug],
+    version: 1,
+    updatedById: null,
+  } as SupportDocument;
+
+  const versions: SupportDocumentVersion[] = [
+    {
+      id: "v1",
+      documentId: document.id,
+      version: 1,
+      payload: document.payload,
+      actorId: null,
+      note: "Initial content",
+    } as SupportDocumentVersion,
+  ];
+
+  const repository = {
+    findAll: jest.fn(async () => [document]),
+    findBySlug: jest.fn(async (s: SupportDocSlug) =>
+      s === slug ? document : null,
+    ),
+    findVersions: jest.fn(async () => [...versions].reverse()),
+    findVersion: jest.fn(
+      async (_id: string, version: number) =>
+        versions.find((v) => v.version === version) ?? null,
+    ),
+    saveWithVersion: jest.fn(
+      async (doc: SupportDocument, actorId: string | null, note: string | null) => {
+        versions.push({
+          id: `v${doc.version}`,
+          documentId: doc.id,
+          version: doc.version,
+          payload: doc.payload,
+          actorId,
+          note,
+        } as SupportDocumentVersion);
+        return doc;
+      },
+    ),
+  };
+
+  // Signing is exercised only through getBundle; the write path never touches it.
+  const minio = {
+    getSignedUrl: jest.fn(async (key: string) => `https://minio.test/${key}?sig=x`),
+    uploadFile: jest.fn(),
+  };
+
+  return {
+    document,
+    versions,
+    minio,
+    service: new SupportContentService(
+      repository as unknown as SupportContentRepository,
+      minio as unknown as MinioService,
+    ),
+  };
+}
+
+describe("SupportContentService.restore", () => {
+  it("rolls back to an older payload as a NEW version, leaving history intact", async () => {
+    const { document, versions, service } = makeRepository("CONTACT");
+    const original = SUPPORT_CONTENT_DEFAULTS.CONTACT;
+
+    await service.update(
+      "CONTACT",
+      { payload: { ...original, phone: "+251 99 999 9999" } },
+      ACTOR,
+    );
+
+    expect(document.version).toBe(2);
+    expect(versions.map((v) => v.version)).toEqual([1, 2]);
+
+    const restored = await service.restore("CONTACT", 1, ACTOR);
+
+    expect(restored.payload).toEqual(original);
+    // The assertion that matters: restore is additive. If someone "optimises"
+    // it into a destructive pointer reset this drops back to 1 and rollback
+    // silently stops being undoable.
+    expect(restored.version).toBe(3);
+    expect(versions.map((v) => v.version)).toEqual([1, 2, 3]);
+    expect(versions[2].note).toBe("Restored version 1");
+  });
+
+  it("404s on a version that was never written", async () => {
+    const { service } = makeRepository("CONTACT");
+    await expect(service.restore("CONTACT", 99, ACTOR)).rejects.toBeInstanceOf(
+      NotFoundException,
+    );
+  });
+
+  it("rejects an unknown slug", async () => {
+    const { service } = makeRepository("CONTACT");
+    await expect(service.getBySlug("NOPE")).rejects.toBeInstanceOf(
+      BadRequestException,
+    );
+  });
+});
+
+describe("SupportContentService.getBundle", () => {
+  it("signs stored keys on read and leaves paths and URLs alone", async () => {
+    const { service, minio } = makeRepository("CONTACT");
+    const help = SUPPORT_CONTENT_DEFAULTS.HELP;
+
+    // findAll returns only CONTACT, so HELP falls back to the defaults — which
+    // is itself worth asserting: an unseeded row must not break the page.
+    const bundle = await service.getBundle();
+    // A shipped asset path is not a stored object, so nothing is signed.
+    expect(bundle.help.sections[0].body).toContain(
+      "/assets/edr-portal-guide.webm",
+    );
+    expect(minio.getSignedUrl).not.toHaveBeenCalled();
+
+    const withUpload = {
+      ...help,
+      sections: [
+        {
+          ...help.sections[0],
+          body:
+            "See ![diagram](minio:support-content/d.png) and " +
+            "![clip](minio:support-content/c.mp4).",
+        },
+      ],
+    };
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const signed = await (service as any).signMedia({
+      ...bundle,
+      help: withUpload,
+    });
+
+    expect(signed.help.sections[0].body).toContain(
+      "https://minio.test/support-content/d.png?sig=x",
+    );
+    expect(signed.help.sections[0].body).toContain(
+      "https://minio.test/support-content/c.mp4?sig=x",
+    );
+    // The stored copy must never be mutated into a URL — that is what would rot.
+    expect(withUpload.sections[0].body).toContain("minio:support-content/d.png");
+  });
+});
+
+describe("validatePayload", () => {
+  const help = SUPPORT_CONTENT_DEFAULTS.HELP;
+
+  it("accepts every shipped default", () => {
+    for (const slug of SUPPORT_DOC_SLUGS) {
+      expect(() =>
+        validatePayload(slug, SUPPORT_CONTENT_DEFAULTS[slug]),
+      ).not.toThrow();
+    }
+  });
+
+  const sectionWithBody = (body: string) => ({
+    ...help,
+    sections: [{ ...help.sections[0], body }],
+  });
+
+  it("stores embedded media as refs, whatever the scheme", () => {
+    // Media now lives in the markdown, so the API no longer validates its URL
+    // scheme — the portal's renderer does, by dropping anything that is not
+    // http(s)/mailto/tel/relative. These all persist fine.
+    for (const body of [
+      "![](minio:support-content/9f1c.png)",
+      "![](/assets/edr-portal-guide.webm)",
+      "![](https://cdn.example.com/clip.mp4)",
+    ]) {
+      expect(() => validatePayload("HELP", sectionWithBody(body))).not.toThrow();
+    }
+  });
+
+  it("rejects a section body past the cap", () => {
+    expect(() =>
+      validatePayload("HELP", sectionWithBody("x".repeat(20_001))),
+    ).toThrow(BadRequestException);
+  });
+
+  it("rejects an unknown property, which is how a stale payload is caught", () => {
+    expect(() =>
+      validatePayload("HELP", { ...help, channels: [] }),
+    ).toThrow(BadRequestException);
+  });
+
+  it("keeps placeholder links, which sit after the scheme", () => {
+    expect(() =>
+      validatePayload("FAQ", {
+        ...SUPPORT_CONTENT_DEFAULTS.FAQ,
+        footer: {
+          ...SUPPORT_CONTENT_DEFAULTS.FAQ.footer!,
+          ctaTo: "mailto:{{supportEmail}}",
+        },
+      }),
+    ).not.toThrow();
+  });
+
+  it("generates ids for items saved without one", () => {
+    const legal = validatePayload("TERMS", {
+      ...SUPPORT_CONTENT_DEFAULTS.TERMS,
+      sections: [{ heading: "1. New", body: "Body." }],
+    }) as Extract<SupportDocPayload, { sections: unknown }>;
+
+    expect(legal.sections[0].id).toEqual(expect.any(String));
+    expect(legal.sections[0].id.length).toBeGreaterThan(0);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/support-content/support-content.service.ts b/apps/edr-freight-api/src/modules/support-content/support-content.service.ts
new file mode 100644
index 000000000..11099ae55
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/support-content/support-content.service.ts
@@ -0,0 +1,345 @@
+import {
+  PORTAL_MEDIA_URI_SCHEME,
+  PortalContentBundle,
+  PortalFaqContent,
+  PortalHelpContent,
+  PortalLegalContent,
+  PortalMediaKind,
+  SUPPORT_CONTENT_DEFAULTS,
+  SUPPORT_DOC_SLUGS,
+  SUPPORT_MEDIA_PREFIX,
+  SupportDocPayload,
+  SupportDocSlug,
+} from "@edr/types";
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from "@nestjs/common";
+import { extname } from "path";
+
+import { MinioService } from "../minio/minio.service";
+import { plainToInstance } from "class-transformer";
+import { validateSync, ValidationError } from "class-validator";
+import { randomUUID } from "crypto";
+
+import {
+  PAYLOAD_DTO_BY_SLUG,
+  UpdateSupportDocumentDto,
+} from "./dto/support-content.dto";
+import {
+  SupportDocument,
+  SupportDocumentVersion,
+} from "./entities/support-document.entity";
+import { SupportContentRepository } from "./support-content.repository";
+
+/**
+ * A paste-bomb in one section would bloat the public bundle every anonymous
+ * visitor downloads, so the whole payload is capped as well as its fields.
+ */
+const MAX_PAYLOAD_BYTES = 200_000;
+
+/**
+ * Comfortably longer than the 5-minute `Cache-Control` on the public bundle, so
+ * a cached response never outlives the URLs inside it.
+ */
+const MEDIA_URL_TTL_SECONDS = 6 * 60 * 60;
+
+/** `minio:support-content/<file>` inside markdown. */
+const MEDIA_REF = new RegExp(
+  `${PORTAL_MEDIA_URI_SCHEME}([A-Za-z0-9._\\-/]+)`,
+  "g",
+);
+
+@Injectable()
+export class SupportContentService {
+  constructor(
+    private readonly repository: SupportContentRepository,
+    private readonly minio: MinioService,
+  ) {}
+
+  /**
+   * Stores an image or video for the help page and returns its object key.
+   *
+   * The key is what gets saved in the document — never the signed URL. A
+   * presigned URL expires, so persisting one would leave every embedded image
+   * broken a few hours later; signing happens per read instead.
+   */
+  async uploadMedia(
+    file?: Express.Multer.File,
+  ): Promise<{ key: string; kind: PortalMediaKind; url: string }> {
+    if (!file) throw new BadRequestException("No file uploaded");
+
+    const kind: PortalMediaKind | null = file.mimetype.startsWith("image/")
+      ? "image"
+      : file.mimetype.startsWith("video/")
+        ? "video"
+        : null;
+
+    if (!kind) {
+      throw new BadRequestException(
+        `Unsupported file type ${file.mimetype} — images and videos only`,
+      );
+    }
+
+    const key = `${SUPPORT_MEDIA_PREFIX}${randomUUID()}${extname(file.originalname).toLowerCase()}`;
+    await this.minio.uploadFile(key, file.buffer, file.mimetype);
+
+    return {
+      key,
+      kind,
+      url: await this.minio.getSignedUrl(key, MEDIA_URL_TTL_SECONDS),
+    };
+  }
+
+  /** Presigned URL for one stored key, for the backoffice editor's previews. */
+  async mediaUrl(key: string): Promise<{ url: string }> {
+    if (!key?.startsWith(SUPPORT_MEDIA_PREFIX)) {
+      throw new BadRequestException(
+        `key must be an uploaded ${SUPPORT_MEDIA_PREFIX} object`,
+      );
+    }
+    return { url: await this.minio.getSignedUrl(key, MEDIA_URL_TTL_SECONDS) };
+  }
+
+  /**
+   * The public bundle. Missing rows fall back to the shipped defaults so an
+   * unseeded or half-migrated environment still serves the legal pages rather
+   * than 404-ing the first thing an anonymous visitor sees.
+   */
+  async getBundle(): Promise<PortalContentBundle> {
+    const documents = await this.repository.findAll();
+    const bySlug = new Map(documents.map((d) => [d.slug, d.payload]));
+
+    const payload = <S extends SupportDocSlug>(slug: S) =>
+      (bySlug.get(slug) ?? SUPPORT_CONTENT_DEFAULTS[slug]) as never;
+
+    return this.signMedia({
+      contact: payload("CONTACT"),
+      help: payload("HELP"),
+      faq: payload("FAQ"),
+      privacy: payload("PRIVACY"),
+      terms: payload("TERMS"),
+    });
+  }
+
+  /**
+   * Swaps every `minio:<key>` reference embedded in the copy for a freshly
+   * signed URL. Media lives inside the markdown, so this one pass covers every
+   * document.
+   *
+   * Each distinct key is signed once per request, and a signing failure
+   * degrades to MinIO's public URL rather than failing the whole page (see
+   * `MinioService.getSignedUrl`).
+   */
+  private async signMedia(
+    bundle: PortalContentBundle,
+  ): Promise<PortalContentBundle> {
+    const keys = new Set<string>();
+
+    const collect = (value: unknown): void => {
+      if (typeof value === "string") {
+        for (const match of value.matchAll(MEDIA_REF)) keys.add(match[1]);
+      } else if (Array.isArray(value)) {
+        value.forEach(collect);
+      } else if (value && typeof value === "object") {
+        Object.values(value).forEach(collect);
+      }
+    };
+    collect(bundle);
+
+    if (keys.size === 0) return bundle;
+
+    const signed = new Map(
+      await Promise.all(
+        [...keys].map(
+          async (key) =>
+            [key, await this.minio.getSignedUrl(key, MEDIA_URL_TTL_SECONDS)] as const,
+        ),
+      ),
+    );
+
+    const rewrite = (value: unknown): unknown => {
+      if (typeof value === "string") {
+        return value.replace(MEDIA_REF, (whole, key: string) =>
+          signed.get(key) ?? whole,
+        );
+      }
+      if (Array.isArray(value)) return value.map(rewrite);
+      if (value && typeof value === "object") {
+        return Object.fromEntries(
+          Object.entries(value).map(([k, v]) => [k, rewrite(v)]),
+        );
+      }
+      return value;
+    };
+
+    return rewrite(bundle) as PortalContentBundle;
+  }
+
+  /** Admin list — metadata only, no payloads. */
+  async list(): Promise<Omit<SupportDocument, "payload">[]> {
+    const documents = await this.repository.findAll();
+    return documents.map(({ payload: _payload, ...rest }) => rest);
+  }
+
+  async getBySlug(rawSlug: string): Promise<SupportDocument> {
+    const slug = assertSlug(rawSlug);
+    const document = await this.repository.findBySlug(slug);
+    if (!document) {
+      throw new NotFoundException(`Support document ${slug} not found`);
+    }
+    return document;
+  }
+
+  /**
+   * Replace a document's whole payload. Writing the whole slice rather than
+   * patching fields is deliberate: one editorial change becomes exactly one
+   * version, which is what keeps the history readable.
+   */
+  async update(
+    rawSlug: string,
+    dto: UpdateSupportDocumentDto,
+    actorId: string | null,
+  ): Promise<SupportDocument> {
+    const document = await this.getBySlug(rawSlug);
+    const payload = validatePayload(document.slug, dto.payload);
+
+    document.payload = payload;
+    document.version += 1;
+    document.updatedById = actorId;
+
+    return this.repository.saveWithVersion(document, actorId, dto.note ?? null);
+  }
+
+  async listVersions(rawSlug: string): Promise<SupportDocumentVersion[]> {
+    const document = await this.getBySlug(rawSlug);
+    return this.repository.findVersions(document.id);
+  }
+
+  async getVersion(
+    rawSlug: string,
+    version: number,
+  ): Promise<SupportDocumentVersion> {
+    const document = await this.getBySlug(rawSlug);
+    const found = await this.repository.findVersion(document.id, version);
+    if (!found) {
+      throw new NotFoundException(
+        `Version ${version} of ${document.slug} not found`,
+      );
+    }
+    return found;
+  }
+
+  /**
+   * Roll back to an earlier version by re-saving its payload through the normal
+   * write path. The result is a NEW version whose content equals the old one —
+   * never a destructive pointer reset — so the history only grows and a restore
+   * is itself undoable.
+   */
+  async restore(
+    rawSlug: string,
+    version: number,
+    actorId: string | null,
+  ): Promise<SupportDocument> {
+    const target = await this.getVersion(rawSlug, version);
+
+    return this.update(
+      rawSlug,
+      {
+        payload: target.payload as unknown as Record<string, unknown>,
+        note: `Restored version ${version}`,
+      },
+      actorId,
+    );
+  }
+}
+
+/* ------------------------------ helpers ------------------------------- */
+
+export function assertSlug(raw: string): SupportDocSlug {
+  const slug = raw?.toUpperCase() as SupportDocSlug;
+  if (!SUPPORT_DOC_SLUGS.includes(slug)) {
+    throw new BadRequestException(
+      `Unknown support document "${raw}". Valid slugs: ${SUPPORT_DOC_SLUGS.join(", ")}`,
+    );
+  }
+  return slug;
+}
+
+/**
+ * Validate an incoming payload against the DTO registered for its slug, then
+ * fill in any missing item ids. Exported so the seeder's spec can assert the
+ * shipped defaults are themselves valid.
+ */
+export function validatePayload(
+  slug: SupportDocSlug,
+  raw: unknown,
+): SupportDocPayload {
+  if (JSON.stringify(raw ?? null).length > MAX_PAYLOAD_BYTES) {
+    throw new BadRequestException(
+      `Payload for ${slug} exceeds ${MAX_PAYLOAD_BYTES} bytes`,
+    );
+  }
+
+  const instance = plainToInstance(PAYLOAD_DTO_BY_SLUG[slug], raw ?? {});
+  const errors = validateSync(instance as object, {
+    whitelist: true,
+    forbidNonWhitelisted: true,
+  });
+
+  if (errors.length) {
+    throw new BadRequestException(flattenErrors(errors));
+  }
+
+  return withGeneratedIds(slug, instance as SupportDocPayload);
+}
+
+function flattenErrors(errors: ValidationError[], path = ""): string[] {
+  return errors.flatMap((error) => {
+    const here = path ? `${path}.${error.property}` : error.property;
+    const own = Object.values(error.constraints ?? {}).map(
+      (message) => `${here}: ${message}`,
+    );
+    return [...own, ...flattenErrors(error.children ?? [], here)];
+  });
+}
+
+const withId = <T extends { id?: string }>(item: T): T => ({
+  ...item,
+  id: item.id || randomUUID(),
+});
+
+/**
+ * Item ids are the React keys in the portal, and admin-authored headings and
+ * questions collide too easily to use as keys. Editors may omit them; the
+ * server mints one rather than making every client remember to.
+ */
+function withGeneratedIds(
+  slug: SupportDocSlug,
+  payload: SupportDocPayload,
+): SupportDocPayload {
+  switch (slug) {
+    case "HELP": {
+      const help = payload as PortalHelpContent;
+      return { ...help, sections: help.sections.map(withId) };
+    }
+    case "FAQ": {
+      const faq = payload as PortalFaqContent;
+      return {
+        ...faq,
+        groups: faq.groups.map((group) => ({
+          ...withId(group),
+          items: group.items.map(withId),
+        })),
+      };
+    }
+    case "PRIVACY":
+    case "TERMS": {
+      const legal = payload as PortalLegalContent;
+      return { ...legal, sections: legal.sections.map(withId) };
+    }
+    default:
+      return payload;
+  }
+}
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 45370f546..b7b907e5b 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
@@ -31,6 +31,19 @@ export function paymentDrainMs(): number {
   );
 }
 
+/**
+ * ISO timestamp of the end of a pay window's drain tail, for client display
+ * (the "payment processing" countdown). Null in ⇒ null out.
+ */
+export function paymentDrainEndsAtIso(
+  deadline: Date | string | null | undefined,
+): string | null {
+  if (deadline == null) return null;
+  const ms = new Date(deadline).getTime();
+  if (!Number.isFinite(ms)) return null;
+  return new Date(ms + paymentDrainMs()).toISOString();
+}
+
 /**
  * A pay window AND its drain tail have closed.
  *
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 5185dcd99..23024bfdf 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
@@ -37,7 +37,7 @@ import { BookingNotifierService } from './booking-notifier.service';
 import {
   TrainSchedulingService,
   effectiveWindowConfig,
-} from './train-scheduling.service';
+} from './services/train-scheduling.service';
 import { eatDay, listConfigBookingWindows } from './batch-window.util';
 import {
   BATCH_BOARD_STATUSES,
@@ -90,7 +90,7 @@ import { BookingWindowGateway } from './booking-window.gateway';
 import {
   MAX_TEU_SLOTS_PER_WAGON,
   containerWagonsForLines,
-} from './wagon-plan.util';
+} from './utils/wagon-plan.util';
 import {
   Capacity,
   CorridorBudget,
@@ -859,7 +859,9 @@ export class BookingBatchService implements OnModuleInit {
       const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !locomotive) continue;
       const limits = await this.capacityLimits(locomotive);
-      const budget = await this.remainingBudget(schedule, limits, wagonDims);
+      const budget = await this.remainingBudget(schedule, limits, wagonDims, [
+        booking.id,
+      ]);
       const leg = budget.legOf(booking.originYardId, booking.destinationYardId);
       if (!leg) continue; // this train's route doesn't carry the booking's leg
       report.corridorMatched = true;
@@ -1012,7 +1014,9 @@ export class BookingBatchService implements OnModuleInit {
       const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !locomotive) continue;
       const limits = await this.capacityLimits(locomotive);
-      const budget = await this.remainingBudget(schedule, limits, wagonDims);
+      const budget = await this.remainingBudget(schedule, limits, wagonDims, [
+        booking.id,
+      ]);
       const leg = budget.legOf(booking.originYardId, booking.destinationYardId);
       if (!leg) continue; // this train's route doesn't carry the booking's leg
       const room = budget.remainingFor(leg);
@@ -1128,7 +1132,9 @@ export class BookingBatchService implements OnModuleInit {
       const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !locomotive) continue;
       const limits = await this.capacityLimits(locomotive);
-      const budget = await this.remainingBudget(schedule, limits, wagonDims);
+      const budget = await this.remainingBudget(schedule, limits, wagonDims, [
+        booking.id,
+      ]);
       const leg = budget.legOf(booking.originYardId, booking.destinationYardId);
       if (!leg) continue; // this train's route doesn't carry the booking's leg
       const room = budget.remainingFor(leg);
@@ -1281,7 +1287,9 @@ export class BookingBatchService implements OnModuleInit {
     if (!schedule || !locomotive) return false;
     const wagonDims = await this.loadWagonDims();
     const limits = await this.capacityLimits(locomotive);
-    const budget = await this.remainingBudget(schedule, limits, wagonDims);
+    const budget = await this.remainingBudget(schedule, limits, wagonDims, [
+      booking.id,
+    ]);
     const leg = budget.legOf(booking.originYardId, booking.destinationYardId);
     if (!leg) return false;
 
@@ -1382,7 +1390,12 @@ export class BookingBatchService implements OnModuleInit {
       }
       const wagonDims = await this.loadWagonDims();
       const limits = await this.capacityLimits(locomotive);
-      const budget = await this.remainingBudget(schedule, limits, wagonDims);
+      const budget = await this.remainingBudget(
+        schedule,
+        limits,
+        wagonDims,
+        bookings.map((b) => b.id),
+      );
       const leg = budget.legOf(
         bookings[0].originYardId,
         bookings[0].destinationYardId,
@@ -4745,6 +4758,7 @@ export class BookingBatchService implements OnModuleInit {
     schedule: TrainSchedule,
     limits: TrainLimits,
     wagonDims: WagonDims,
+    excludeBookingIds?: string[],
   ): Promise<CorridorBudget> {
     const physicalWagons = await this.builtTrainWagonCount(schedule);
     if (physicalWagons != null) {
@@ -4780,7 +4794,21 @@ export class BookingBatchService implements OnModuleInit {
         b.status === "PAID" ||
         !payWindowLapsed(b.paymentDeadline, deadlineCutoff),
     );
-    for (const b of [...allocated, ...reserved]) {
+    // Export FCFS: a customer's pending operation request HOLDS its wagons from
+    // the moment it is submitted — the request named this exact train
+    // (requestedTrainScheduleId), so its capacity must not be shown to or
+    // booked by anyone else while staff review it. The booking(s) being
+    // evaluated are excluded so a request never blocks its own accept.
+    const pendingHolds = (
+      await this.dataSource.getRepository(Booking).find({
+        where: {
+          requestedTrainScheduleId: schedule.id,
+          status: 'OPERATION_REQUEST_PENDING',
+        } as never,
+        relations: ['bookingContainers'],
+      })
+    ).filter((b) => !excludeBookingIds?.includes(b.id));
+    for (const b of [...allocated, ...reserved, ...pendingHolds]) {
       budget.subtract(
         this.needFor(b, wagonDims),
         budget.legForYards(b.originYardId, b.destinationYardId),
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 8668b4f75..bf6ab5069 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
@@ -95,6 +95,20 @@ export class BookingJourneyService {
       await manager
         .getRepository(TrainScheduleBooking)
         .update({ trainScheduleId: scheduleId, bookingId }, { loadingStatus: 'LOADED' });
+      // Warehouse cargo may be loaded either from the warehouse Load-to-Train
+      // queue or from the schedule itself. Loading here must move its inventory
+      // too, otherwise the goods read as still sitting in the shed while the
+      // train leaves with them. No-ops for direct truck-to-train (no inventory).
+      // ponytail: no WarehouseLoading record on this path — those are only read
+      // back as per-inventory loading history, never billed. Create them here if
+      // that history ever has to be complete.
+      await manager.query(
+        `UPDATE freight.warehouse_inventory
+            SET status = 'LOADED', loaded_at = COALESCE(loaded_at, $2), updated_at = NOW()
+          WHERE booking_id = $1 AND deleted_at IS NULL
+            AND status NOT IN ('LOADED', 'DISPATCHED')`,
+        [bookingId, now],
+      );
       // The facility handed the cargo over — raise its GRN. No-ops for yards
       // without a facility (import/export terminals), which keep their own flow.
       await this.facilityHandling.recordHandling(manager, {
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-notifier.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-notifier.service.ts
index efb540066..9468387c5 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-notifier.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-notifier.service.ts
@@ -11,7 +11,7 @@ import {
 import { Booking } from '../bookings/entities/booking.entity';
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
-import { resolveCompanyNotifyPhone } from '../notifications/resolve-company-phone.util';
+import { resolveCompanyNotifyContact } from '../notifications/resolve-company-phone.util';
 import { TrainSchedulesRepository } from '../train-schedules/train-schedules.repository';
 import { BATCH_TIMEZONE } from './booking-batch.constants';
 
@@ -65,10 +65,11 @@ export class BookingNotifierService {
     logLabel: string,
   ): Promise<void> {
     this.logger.log(`${logLabel} — ${this.ref(b)}`);
-    const phone = b.companyId
-      ? await resolveCompanyNotifyPhone(this.dataSource, b.companyId)
-      : null;
-    const email = b.company?.email ?? b.company?.generalManagerEmail ?? null;
+    // One resolver for both channels — the company row's own email column is
+    // only set for a Fayda-verified owner (see companyNotifyEmailExpr).
+    const { phone, email } = b.companyId
+      ? await resolveCompanyNotifyContact(this.dataSource, b.companyId)
+      : { phone: null, email: null };
 
     if (phone) {
       try {
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.gateway.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.gateway.ts
index 69e60dd3a..dbf0cae96 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.gateway.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.gateway.ts
@@ -14,6 +14,7 @@ import { Server, Socket } from 'socket.io';
 
 import { WsAuthService } from '../notification-inbox/ws-auth.service';
 import { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
+import { paymentDrainEndsAtIso } from './booking-batch.constants';
 
 /**
  * Server → client push for booking-window state changes. Same handshake model
@@ -61,6 +62,7 @@ export class BookingWindowGateway implements OnGatewayConnection {
       windowClosesAt: schedule.windowClosesAt?.toISOString() ?? null,
       docReviewEndsAt: schedule.docReviewEndsAt?.toISOString() ?? null,
       paymentPhaseEndsAt: schedule.paymentPhaseEndsAt?.toISOString() ?? null,
+      paymentDrainEndsAt: paymentDrainEndsAtIso(schedule.paymentPhaseEndsAt),
       scheduledDepartureDate: schedule.scheduledDepartureDate?.toISOString() ?? null,
     };
     this.server.emit(BOOKING_WINDOW_WS_EVENTS.PHASE, payload);
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 1a3baa6b4..47d0a0d21 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
@@ -14,12 +14,13 @@ import { TrainSchedulesRepository } from '../train-schedules/train-schedules.rep
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
 import {
+  companyNotifyEmailExpr,
   companyNotifyPhoneExpr,
   primaryContactUserJoin,
 } from '../notifications/resolve-company-phone.util';
 import { BookingBatchService } from './booking-batch.service';
 import { BookingWindowGateway } from './booking-window.gateway';
-import { TrainSchedulingService, effectiveWindowConfig } from './train-scheduling.service';
+import { TrainSchedulingService, effectiveWindowConfig } from './services/train-scheduling.service';
 import { BATCH_TIMEZONE } from './booking-batch.constants';
 import {
   bookingCloseCutoff,
@@ -313,6 +314,8 @@ export class BookingWindowService implements OnModuleInit {
       // Fire-and-forget: a slow SMS/email gateway must not stall the tick loop
       // (the `ticking` guard would otherwise delay every schedule's transition).
       void this.notifyWindowOpened(schedule);
+      // Intercity rides along whatever train passes, export included.
+      void this.notifyIntercityCorridorScheduled(schedule);
       this.logger.log(`Export booking window opened for schedule ${schedule.id}`);
       return true;
     }
@@ -365,7 +368,10 @@ export class BookingWindowService implements OnModuleInit {
       }
       // Only announce the first opening of the day; reopen cycles don't re-notify.
       // Fire-and-forget so a slow SMS/email gateway never stalls the tick loop.
-      if (schedule.bookingCycleNo === 1) void this.notifyWindowOpened(schedule);
+      if (schedule.bookingCycleNo === 1) {
+        void this.notifyWindowOpened(schedule);
+        void this.notifyIntercityCorridorScheduled(schedule);
+      }
       this.logger.log(
         `[WINDOW] ${schedule.id} PRE_WINDOW→OPEN — booking window opened ` +
           `(cycle ${schedule.bookingCycleNo})`,
@@ -644,7 +650,7 @@ export class BookingWindowService implements OnModuleInit {
         `SELECT DISTINCT
                 c.company_id,
                 ${companyNotifyPhoneExpr('co')} AS phone,
-                COALESCE(co.email, co.general_manager_email) AS email
+                ${companyNotifyEmailExpr('co')} AS email
            FROM freight.contract_routes cr
            JOIN freight.contracts c
              ON c.id = cr.contract_id
@@ -710,6 +716,149 @@ export class BookingWindowService implements OnModuleInit {
     }
   }
 
+  /**
+   * SMS + email + inbox the owner of every waiting intercity booking whose
+   * corridor lies on this schedule's route.
+   *
+   * Intercity (DOMESTIC) bookings carry no date — the customer books a corridor
+   * and the cargo waits in a pool until staff ride it along a passing
+   * import/export train (see IntercityService). Until now that wait was silent:
+   * `notifyWindowOpened` only reaches companies holding an ACTIVE contract whose
+   * `contract_routes` match the train's exact origin→destination, and an
+   * intercity booking is neither contracted nor necessarily end-to-end.
+   *
+   * Corridor match mirrors `IntercityService.corridorOnRoute` exactly — both
+   * yards on the route with origin strictly before destination, falling back to
+   * the train's own origin/destination when the route has fewer than two
+   * milestones — so nobody is told about a train they can never be placed on.
+   */
+  private async notifyIntercityCorridorScheduled(
+    schedule: TrainSchedule,
+  ): Promise<void> {
+    try {
+      const rows: Array<{
+        bookingId: string;
+        companyId: string;
+        phone: string | null;
+        email: string | null;
+        corridor: string;
+      }> = await this.dataSource.query(
+        // `stops` is the schedule's stop list, with the two-stop
+        // origin→destination pseudo-route as the legacy fallback — the same
+        // shape IntercityService.milestoneSequenceOf builds in TypeScript.
+        `WITH ms AS (
+           SELECT yard_id, sequence_no
+             FROM freight.route_milestones
+            WHERE route_id = $1 AND deleted_at IS NULL
+         ),
+         stops AS (
+           SELECT yard_id, sequence_no FROM ms WHERE (SELECT count(*) FROM ms) >= 2
+           UNION ALL
+           SELECT v.yard_id, v.seq
+             FROM (VALUES ($2::uuid, 1), ($3::uuid, 2)) AS v(yard_id, seq)
+            WHERE (SELECT count(*) FROM ms) < 2
+         )
+         SELECT DISTINCT
+                b.id                                        AS "bookingId",
+                b.company_id                                AS "companyId",
+                ${companyNotifyPhoneExpr('co')}             AS phone,
+                ${companyNotifyEmailExpr('co')}             AS email,
+                COALESCE(oy.label, oy.code) || ' to ' ||
+                COALESCE(dy.label, dy.code)                 AS corridor
+           FROM freight.bookings b
+           JOIN stops o ON o.yard_id = b.origin_yard_id
+           JOIN stops d ON d.yard_id = b.destination_yard_id
+                       AND d.sequence_no > o.sequence_no
+           JOIN freight.companies co ON co.id = b.company_id AND co.deleted_at IS NULL
+           JOIN freight.yards oy ON oy.id = b.origin_yard_id
+           JOIN freight.yards dy ON dy.id = b.destination_yard_id
+           ${primaryContactUserJoin('co')}
+          WHERE b.deleted_at IS NULL
+            AND b.trade_direction = 'DOMESTIC'
+            AND b.train_schedule_id IS NULL
+            -- Same waiting pool IntercityService.findWaitingIntercityBookings
+            -- draws candidates from: commercial paid/executed, government approved.
+            AND ((b.is_government = false AND b.status IN ('FULLY_EXECUTED', 'PAID'))
+              OR (b.is_government = true AND b.status = 'APPROVED'))
+            -- Once per booking, not once per train. A booking can sit in the
+            -- pool for weeks while several trains open a window on its corridor,
+            -- and "trains run your corridor, you are queued" is the same message
+            -- every time. The inbox row written below is the marker.
+            -- ponytail: unindexed jsonb probe over freight.notifications; add a
+            -- partial index on (data->>'intercityCorridorBookingId') if the
+            -- table grows enough for this to show up in the tick loop.
+            AND NOT EXISTS (
+              SELECT 1 FROM freight.notifications n
+               WHERE n.data->>'intercityCorridorBookingId' = b.id::text)`,
+        [schedule.routeId, schedule.originStationId, schedule.destinationStationId],
+      );
+      if (!rows.length) return;
+
+      const depart = schedule.scheduledDepartureDate.toLocaleDateString('en-GB', {
+        timeZone: BATCH_TIMEZONE,
+      });
+      const msgFor = (corridors: string[]) =>
+        `A train is scheduled on your intercity corridor ${corridors.join(', ')}, ` +
+        `departing ${depart}. EDR will confirm once your cargo is placed on a train.`;
+
+      // One inbox item per booking (its `data` is the once-per-booking marker
+      // the query above reads), but one SMS/email per company — a customer with
+      // three waiting bookings gets one message naming all three corridors.
+      const byCompany = new Map<
+        string,
+        { phone: string | null; email: string | null; corridors: string[] }
+      >();
+      for (const row of rows) {
+        const entry = byCompany.get(row.companyId) ?? {
+          phone: row.phone,
+          email: row.email,
+          corridors: [],
+        };
+        if (!entry.corridors.includes(row.corridor)) entry.corridors.push(row.corridor);
+        byCompany.set(row.companyId, entry);
+
+        await this.inbox.notify({
+          recipients: { companyId: row.companyId },
+          audience: NotificationAudience.PORTAL,
+          type: NotificationType.SCHEDULE_UPDATE,
+          title: 'Train scheduled on your corridor',
+          body: msgFor([row.corridor]),
+          link: `/bookings/${row.bookingId}`,
+          data: {
+            intercityCorridorBookingId: row.bookingId,
+            trainScheduleId: schedule.id,
+          },
+        });
+      }
+
+      for (const [companyId, entry] of byCompany) {
+        const msg = msgFor(entry.corridors);
+        if (entry.phone) {
+          await this.notifications
+            .directSend('sms', entry.phone, msg)
+            .catch((e) =>
+              this.logger.warn(`Intercity corridor SMS failed: ${(e as Error).message}`),
+            );
+        }
+        if (entry.email) {
+          await this.notifications
+            .directSend('email', entry.email, msg)
+            .catch((e) =>
+              this.logger.warn(`Intercity corridor email failed: ${(e as Error).message}`),
+            );
+        }
+        this.logger.log(
+          `Notified company ${companyId} of ${entry.corridors.length} intercity ` +
+            `corridor(s) served by schedule ${schedule.id}`,
+        );
+      }
+    } catch (err) {
+      this.logger.warn(
+        `notifyIntercityCorridorScheduled failed for ${schedule.id}: ${(err as Error).message}`,
+      );
+    }
+  }
+
   private async setPhase(
     schedule: TrainSchedule,
     patch: Partial<
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/container-placement.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/container-placement.util.ts
index 72ee1407e..bbfaedaf0 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/container-placement.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/container-placement.util.ts
@@ -1,4 +1,4 @@
-import type { ContainerPlacementInput } from './wagon-plan.util';
+import type { ContainerPlacementInput } from './utils/wagon-plan.util';
 
 export type ContainerUnitForPlacement = {
   bookingId: string;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts b/apps/edr-freight-api/src/modules/train-scheduling/controllers/train-scheduling.controller.ts
similarity index 90%
rename from apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/controllers/train-scheduling.controller.ts
index 742bd2837..c87d118c8 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/controllers/train-scheduling.controller.ts
@@ -1,8 +1,8 @@
 import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger";
 import type { Response } from "express";
-import type { AuthUserPayload } from "../../common/resolve-auth-user-id";
-import { UserTradeAccessService } from "../user-trade-access/user-trade-access.service";
-import { resolveAuthUserId } from "../../common/resolve-auth-user-id";
+import type { AuthUserPayload } from "../../../common/resolve-auth-user-id";
+import { UserTradeAccessService } from "../../user-trade-access/user-trade-access.service";
+import { resolveAuthUserId } from "../../../common/resolve-auth-user-id";
 
 import {
   Body, Controller, Delete, Get, Param, ParseUUIDPipe, Patch, Post, Query, Res,
@@ -10,51 +10,55 @@ import {
 import { CurrentUser } from "@edr/api-common";
 import {
   BookingDocReviewAlert,
+  BookingStaff,
+  MixedAudience,
+  PortalCustomer,
   TrainSchedulingCancel,
   TrainSchedulingCreate,
   TrainSchedulingReschedule,
   TrainSchedulingRulesManage,
   TrainSchedulingUpdate,
   TrainSchedulingView,
-} from "../../common/booking-guards";
-import { AcceptIntercityBookingsDto } from "./dto/accept-intercity-bookings.dto";
-import { AssignBookingsDto } from "./dto/assign-bookings.dto";
-import { AssignUnassignedBookingDto } from "./dto/assign-unassigned-booking.dto";
-import { SwitchGovernmentBookingDto } from "./dto/switch-government-booking.dto";
-import { CreateContainerTrainScheduleDto } from "./dto/create-container-train-schedule.dto";
-import { GetEligibleBookingsDto } from "./dto/get-eligible-bookings.dto";
-import { GetEligibleBulkBookingsDto } from "./dto/get-eligible-bulk-bookings.dto";
-import { GetEligibleContainerBookingsDto } from "./dto/get-eligible-container-bookings.dto";
-import { PinWagonsDto } from "./dto/pin-wagons.dto";
-import { MoveWagonLoadDto } from "./dto/move-wagon-load.dto";
-import { UpdateContainerItemDto } from "./dto/update-container-item.dto";
-import { UpdateImportLoadingStatusDto } from "./dto/update-import-loading-status.dto";
-import { PreviewBulkTrainScheduleDto } from "./dto/preview-bulk-train-schedule.dto";
-import { PreviewContainerTrainScheduleDto } from "./dto/preview-container-train-schedule.dto";
-import { PreviewTrainScheduleDto } from "./dto/preview-train-schedule.dto";
-import { RecordCheckpointDto } from "./dto/record-checkpoint.dto";
+} from "../../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../../seed/freight-permissions.registry";
+import { AcceptIntercityBookingsDto } from "../dto/accept-intercity-bookings.dto";
+import { AssignBookingsDto } from "../dto/assign-bookings.dto";
+import { AssignUnassignedBookingDto } from "../dto/assign-unassigned-booking.dto";
+import { SwitchGovernmentBookingDto } from "../dto/switch-government-booking.dto";
+import { CreateContainerTrainScheduleDto } from "../dto/create-container-train-schedule.dto";
+import { GetEligibleBookingsDto } from "../dto/get-eligible-bookings.dto";
+import { GetEligibleBulkBookingsDto } from "../dto/get-eligible-bulk-bookings.dto";
+import { GetEligibleContainerBookingsDto } from "../dto/get-eligible-container-bookings.dto";
+import { PinWagonsDto } from "../dto/pin-wagons.dto";
+import { MoveWagonLoadDto } from "../dto/move-wagon-load.dto";
+import { UpdateContainerItemDto } from "../dto/update-container-item.dto";
+import { UpdateImportLoadingStatusDto } from "../dto/update-import-loading-status.dto";
+import { PreviewBulkTrainScheduleDto } from "../dto/preview-bulk-train-schedule.dto";
+import { PreviewContainerTrainScheduleDto } from "../dto/preview-container-train-schedule.dto";
+import { PreviewTrainScheduleDto } from "../dto/preview-train-schedule.dto";
+import { RecordCheckpointDto } from "../dto/record-checkpoint.dto";
 import {
   ImportDjiboutiActionDto,
   UploadImportDjiboutiDocumentDto,
-} from "./dto/import-djibouti-operation.dto";
-import { AvailableLocomotivesQueryDto } from "./dto/available-locomotives-query.dto";
-import { AdjustScheduleConsistDto } from "./dto/adjust-schedule-consist.dto";
-import { AvailableTrainsQueryDto } from "./dto/available-trains-query.dto";
-import { BatchBoardQueryDto } from "./dto/batch-board-query.dto";
-import { BookableSchedulesQueryDto } from "./dto/bookable-schedules-query.dto";
-import { ListTrainSchedulesQueryDto } from "./dto/list-train-schedules-query.dto";
-import { AvailableDaysQueryDto } from "./dto/available-days-query.dto";
-import { AvailableDaysForCargoQueryDto } from "./dto/available-days-for-cargo-query.dto";
-import { UpdateTrainSchedulingGlobalRulesDto } from "./dto/update-train-scheduling-global-rules.dto";
-import { UpdateScheduleWindowRuleDto } from "./dto/update-schedule-window-rule.dto";
-import { UpdateScheduleDateDto } from "./dto/update-schedule-date.dto";
-import { MaintenanceRescheduleDto } from "./dto/maintenance-reschedule.dto";
-import { TrainSchedulingService } from "./train-scheduling.service";
-import { BookingBatchService } from "./booking-batch.service";
-import { BookingJourneyService } from "./booking-journey.service";
-import { BookingWindowService } from "./booking-window.service";
-import { IntercityService } from "./intercity.service";
-import { BillingService } from "../billing/billing.service";
+} from "../dto/import-djibouti-operation.dto";
+import { AvailableLocomotivesQueryDto } from "../dto/available-locomotives-query.dto";
+import { AdjustScheduleConsistDto } from "../dto/adjust-schedule-consist.dto";
+import { AvailableTrainsQueryDto } from "../dto/available-trains-query.dto";
+import { BatchBoardQueryDto } from "../dto/batch-board-query.dto";
+import { BookableSchedulesQueryDto } from "../dto/bookable-schedules-query.dto";
+import { ListTrainSchedulesQueryDto } from "../dto/list-train-schedules-query.dto";
+import { AvailableDaysQueryDto } from "../dto/available-days-query.dto";
+import { AvailableDaysForCargoQueryDto } from "../dto/available-days-for-cargo-query.dto";
+import { UpdateTrainSchedulingGlobalRulesDto } from "../dto/update-train-scheduling-global-rules.dto";
+import { UpdateScheduleWindowRuleDto } from "../dto/update-schedule-window-rule.dto";
+import { UpdateScheduleDateDto } from "../dto/update-schedule-date.dto";
+import { MaintenanceRescheduleDto } from "../dto/maintenance-reschedule.dto";
+import { TrainSchedulingService } from "../services/train-scheduling.service";
+import { BookingBatchService } from "../booking-batch.service";
+import { BookingJourneyService } from "../booking-journey.service";
+import { BookingWindowService } from "../booking-window.service";
+import { IntercityService } from "../intercity.service";
+import { BillingService } from "../../billing/billing.service";
 
 @ApiTags("train-scheduling")
 @ApiBearerAuth()
@@ -71,6 +75,7 @@ export class TrainSchedulingController {
   ) { }
 
   @Get("my-booking-windows")
+  @PortalCustomer()
   @ApiOperation({
     summary:
       "Upcoming/open booking windows announced to the signed-in customer (all window-engine schedules; their own contract lanes carry a Book-now target)",
@@ -85,6 +90,10 @@ export class TrainSchedulingController {
   }
 
   @Get("contracts/:contractId/booking-windows")
+  @MixedAudience([
+    FREIGHT_PERMS.trainScheduling.view,
+    FREIGHT_PERMS.contracts.createBooking,
+  ])
   @ApiOperation({
     summary:
       "Upcoming/open booking windows on a contract's routes — gates the booking form for customer + Ethiopian GL",
@@ -496,14 +505,14 @@ export class TrainSchedulingController {
   }
 
   @Post("schedules/:id/finalize")
-  @TrainSchedulingUpdate()
+  @BookingStaff(FREIGHT_PERMS.trainScheduling.dispatch)
   @ApiOperation({ summary: "Finalize a draft train schedule" })
   finalizeSchedule(@Param("id", ParseUUIDPipe) id: string) {
     return this.trainSchedulingService.finalizeSchedule(id);
   }
 
   @Post("schedules/:id/dispatch")
-  @TrainSchedulingUpdate()
+  @BookingStaff(FREIGHT_PERMS.trainScheduling.dispatch)
   @ApiOperation({ summary: "Dispatch a scheduled train" })
   dispatchSchedule(@Param("id", ParseUUIDPipe) id: string) {
     return this.trainSchedulingService.dispatchSchedule(id);
@@ -824,7 +833,7 @@ export class TrainSchedulingController {
   }
 
   @Post("bookings/:bookingId/mark-paid")
-  @TrainSchedulingUpdate()
+  @BookingStaff(FREIGHT_PERMS.trainScheduling.markPaid)
   @ApiOperation({
     summary: "Staff: mark a reserved booking paid and allocate it now",
   })
@@ -834,7 +843,7 @@ export class TrainSchedulingController {
   }
 
   @Post("bookings/:bookingId/expire")
-  @TrainSchedulingUpdate()
+  @BookingStaff(FREIGHT_PERMS.trainScheduling.expireBooking)
   @ApiOperation({
     summary: "Staff: expire a reservation and free its capacity",
   })
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
index 912f437f4..8521f4001 100644
--- 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
@@ -1,4 +1,4 @@
-import { TrainSchedulingService } from './train-scheduling.service';
+import { TrainSchedulingService } from './services/train-scheduling.service';
 import { Booking } from '../bookings/entities/booking.entity';
 import { ClearanceMilestone } from '../contracts/entities/clearance-milestone.entity';
 
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/intercity-corridor-notify.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/intercity-corridor-notify.spec.ts
new file mode 100644
index 000000000..3b6648c19
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/train-scheduling/intercity-corridor-notify.spec.ts
@@ -0,0 +1,110 @@
+import { BookingWindowService } from './booking-window.service';
+import type { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
+
+/**
+ * Intercity corridor announcement: when a train's booking window opens, every
+ * customer with a waiting intercity booking on that corridor is told over SMS,
+ * email and the portal inbox.
+ *
+ * The corridor SQL itself is EXPLAIN-validated against the dev database; what
+ * this covers is the fan-out shape around it — one inbox row per booking
+ * (that row's `data` is the once-per-booking marker the query dedupes on) but
+ * one SMS/email per company, naming every corridor at once.
+ */
+describe('BookingWindowService — intercity corridor announcement', () => {
+  const schedule = {
+    id: 'sched-1',
+    routeId: 'route-1',
+    originStationId: 'yard-o',
+    destinationStationId: 'yard-d',
+    scheduledDepartureDate: new Date('2026-08-01T06:00:00.000Z'),
+  } as unknown as TrainSchedule;
+
+  const build = (rows: unknown[]) => {
+    const query = jest.fn().mockResolvedValue(rows);
+    const directSend = jest.fn().mockResolvedValue(undefined);
+    const notify = jest.fn().mockResolvedValue(undefined);
+    const service = new BookingWindowService(
+      { query, getRepository: () => ({ update: jest.fn() }) } as never,
+      { findById: jest.fn(), findAll: jest.fn() } as never,
+      {} as never,
+      {} as never,
+      { directSend } as never,
+      { notify } as never,
+      { emitPhase: jest.fn() } as never,
+    );
+    const run = (): Promise<void> =>
+      (
+        service as unknown as {
+          notifyIntercityCorridorScheduled: (s: TrainSchedule) => Promise<void>;
+        }
+      ).notifyIntercityCorridorScheduled(schedule);
+    return { run, query, directSend, notify };
+  };
+
+  it('sends one inbox item per booking and one SMS/email per company', async () => {
+    const { run, directSend, notify } = build([
+      {
+        bookingId: 'bk-1',
+        companyId: 'co-1',
+        phone: '+251900000001',
+        email: 'ops@co1.example',
+        corridor: 'Dire Dawa to Adama',
+      },
+      {
+        bookingId: 'bk-2',
+        companyId: 'co-1',
+        phone: '+251900000001',
+        email: 'ops@co1.example',
+        corridor: 'Adama to Mojo',
+      },
+    ]);
+
+    await run();
+
+    // Per booking: the marker keeps the next train on this corridor from
+    // re-announcing the same thing to the same booking.
+    expect(notify).toHaveBeenCalledTimes(2);
+    expect(notify.mock.calls.map((c) => c[0].data.intercityCorridorBookingId)).toEqual([
+      'bk-1',
+      'bk-2',
+    ]);
+    expect(notify.mock.calls[0][0].recipients).toEqual({ companyId: 'co-1' });
+    expect(notify.mock.calls[0][0].link).toBe('/bookings/bk-1');
+
+    // Per company: two bookings, one SMS and one email, both corridors named.
+    expect(directSend).toHaveBeenCalledTimes(2);
+    const [smsChannel, smsTo, smsBody] = directSend.mock.calls[0];
+    expect([smsChannel, smsTo]).toEqual(['sms', '+251900000001']);
+    expect(smsBody).toContain('Dire Dawa to Adama, Adama to Mojo');
+    expect(smsBody).toContain('01/08/2026');
+    expect(directSend.mock.calls[1][0]).toBe('email');
+  });
+
+  it('sends nothing when no waiting booking rides this corridor', async () => {
+    const { run, directSend, notify } = build([]);
+
+    await run();
+
+    expect(notify).not.toHaveBeenCalled();
+    expect(directSend).not.toHaveBeenCalled();
+  });
+
+  it('skips the channels a company has no contact for', async () => {
+    const { run, directSend, notify } = build([
+      {
+        bookingId: 'bk-3',
+        companyId: 'co-2',
+        phone: null,
+        email: 'ops@co2.example',
+        corridor: 'Dire Dawa to Adama',
+      },
+    ]);
+
+    await run();
+
+    expect(notify).toHaveBeenCalledTimes(1);
+    expect(directSend).toHaveBeenCalledTimes(1);
+    expect(directSend.mock.calls[0][0]).toBe('email');
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/pay-window-drain.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/pay-window-drain.spec.ts
index 6054f28b2..bde0e88ec 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/pay-window-drain.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/pay-window-drain.spec.ts
@@ -1,5 +1,6 @@
 import {
   DEFAULT_PAYMENT_DRAIN_MINUTES,
+  paymentDrainEndsAtIso,
   paymentDrainMs,
   payWindowLapsed,
 } from "./booking-batch.constants";
@@ -64,4 +65,16 @@ describe("payWindowLapsed — pay-window drain tail", () => {
       expect(paymentDrainMs()).toBe(DEFAULT_PAYMENT_DRAIN_MINUTES * MIN);
     }
   });
+
+  it("paymentDrainEndsAtIso reports deadline + drain, null/garbage-safe", () => {
+    expect(paymentDrainEndsAtIso(deadline)).toBe(
+      new Date(at(DEFAULT_PAYMENT_DRAIN_MINUTES * MIN)).toISOString(),
+    );
+    expect(paymentDrainEndsAtIso(deadline.toISOString())).toBe(
+      new Date(at(DEFAULT_PAYMENT_DRAIN_MINUTES * MIN)).toISOString(),
+    );
+    expect(paymentDrainEndsAtIso(null)).toBeNull();
+    expect(paymentDrainEndsAtIso(undefined)).toBeNull();
+    expect(paymentDrainEndsAtIso("not-a-date")).toBeNull();
+  });
 });
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-checkpoint-events.repository.ts b/apps/edr-freight-api/src/modules/train-scheduling/repositories/train-checkpoint-events.repository.ts
similarity index 89%
rename from apps/edr-freight-api/src/modules/train-scheduling/train-checkpoint-events.repository.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/repositories/train-checkpoint-events.repository.ts
index 210de382e..195b2e596 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-checkpoint-events.repository.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/repositories/train-checkpoint-events.repository.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 
-import { TrainCheckpointEvent } from './entities/train-checkpoint-event.entity';
+import { TrainCheckpointEvent } from '../entities/train-checkpoint-event.entity';
 
 @Injectable()
 export class TrainCheckpointEventsRepository extends BaseRepository<TrainCheckpointEvent> {
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/services/train-scheduling.service.spec.ts
similarity index 99%
rename from apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/services/train-scheduling.service.spec.ts
index 455dc3d9c..0a7384cfa 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/services/train-scheduling.service.spec.ts
@@ -1,11 +1,11 @@
 import { BadRequestException, ConflictException } from '@nestjs/common';
 import { WagonStatus } from '@edr/types';
 
-import { Wagon } from '../wagons/entities/wagon.entity';
-import { WagonType } from '../wagon-types/entities/wagon-type.entity';
-import { TrainSetWagon } from '../train-sets/entities/train-set-wagon.entity';
-import { TrainSchedulingGlobalRules } from './entities/train-scheduling-global-rules.entity';
-import { WagonBookingAllocation } from '../train-schedules/entities/wagon-booking-allocation.entity';
+import { Wagon } from '../../wagons/entities/wagon.entity';
+import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
+import { TrainSetWagon } from '../../train-sets/entities/train-set-wagon.entity';
+import { TrainSchedulingGlobalRules } from '../entities/train-scheduling-global-rules.entity';
+import { WagonBookingAllocation } from '../../train-schedules/entities/wagon-booking-allocation.entity';
 import { TrainSchedulingService } from './train-scheduling.service';
 
 const nw5 = {
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/services/train-scheduling.service.ts
similarity index 97%
rename from apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/services/train-scheduling.service.ts
index df5c44fde..657703ada 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/services/train-scheduling.service.ts
@@ -21,7 +21,6 @@ import {
 } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { InjectDataSource } from '@nestjs/typeorm';
-import { SCHEDULE_BOOKINGS_CTE } from '../../common/schedule-bookings.sql';
 import {
   DataSource,
   EntityManager,
@@ -37,71 +36,71 @@ import {
 import {
   buildPaginationMeta,
   normalizePagination,
-} from '../../common/utils/pagination.util';
-import { BookingsRepository } from '../bookings/bookings.repository';
-import { Booking } from '../bookings/entities/booking.entity';
-import { BookingContainer } from '../bookings/entities/booking-container.entity';
-import { ClearanceMilestone } from '../contracts/entities/clearance-milestone.entity';
-import { ClearanceMilestoneService } from '../contracts/clearance-milestone.service';
-import { Contract } from '../contracts/entities/contract.entity';
-import { Container } from '../container-management/entities/container.entity';
-import { Locomotive } from '../locomotives/entities/locomotive.entity';
-import { LocomotivesRepository } from '../locomotives/locomotives.repository';
-import { formatRouteLabel, Route } from '../routes/entities/route.entity';
-import { WagonMovement } from '../wagons/entities/wagon-movement.entity';
-import { Train } from '../trains/entities/train.entity';
-import { TrainSetLocomotive } from '../train-sets/entities/train-set-locomotive.entity';
-import { TrainSetWagon } from '../train-sets/entities/train-set-wagon.entity';
-import { TrainSet } from '../train-sets/entities/train-set.entity';
-import { ScheduleWagonAdjustmentLog } from '../train-schedules/entities/schedule-wagon-adjustment-log.entity';
-import { TrainScheduleBooking } from '../train-schedules/entities/train-schedule-booking.entity';
-import { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
-import { WagonAllocationContainerItem } from '../train-schedules/entities/wagon-allocation-container-item.entity';
-import { WagonBookingAllocation } from '../train-schedules/entities/wagon-booking-allocation.entity';
-import { TrainScheduleBookingsRepository } from '../train-schedules/train-schedule-bookings.repository';
-import { TrainSchedulesRepository } from '../train-schedules/train-schedules.repository';
-import { TrainCompositionRemovalLogRepository } from '../train-schedules/train-composition-removal-log.repository';
-import { WagonAllocationBulkLoadsRepository } from '../train-schedules/wagon-allocation-bulk-loads.repository';
-import { WagonAllocationContainerItemsRepository } from '../train-schedules/wagon-allocation-container-items.repository';
-import { WagonBookingAllocationsRepository } from '../train-schedules/wagon-booking-allocations.repository';
-import { Yard } from '../rule-engine/entities/yard.entity';
-import { WagonType } from '../wagon-types/entities/wagon-type.entity';
-import { WagonTypesRepository } from '../wagon-types/wagon-types.repository';
-import { Wagon } from '../wagons/entities/wagon.entity';
-import { AdjustScheduleConsistDto } from './dto/adjust-schedule-consist.dto';
-import { AssignBookingsDto } from './dto/assign-bookings.dto';
-import { CreateContainerTrainScheduleDto } from './dto/create-container-train-schedule.dto';
-import { GetEligibleBookingsDto } from './dto/get-eligible-bookings.dto';
-import { GetEligibleBulkBookingsDto } from './dto/get-eligible-bulk-bookings.dto';
-import { GetEligibleContainerBookingsDto } from './dto/get-eligible-container-bookings.dto';
+} from '../../../common/utils/pagination.util';
+import { BookingsRepository } from '../../bookings/bookings.repository';
+import { Booking } from '../../bookings/entities/booking.entity';
+import { BookingContainer } from '../../bookings/entities/booking-container.entity';
+import { ClearanceMilestone } from '../../contracts/entities/clearance-milestone.entity';
+import { ClearanceMilestoneService } from '../../contracts/clearance-milestone.service';
+import { Contract } from '../../contracts/entities/contract.entity';
+import { Container } from '../../container-management/entities/container.entity';
+import { Locomotive } from '../../locomotives/entities/locomotive.entity';
+import { LocomotivesRepository } from '../../locomotives/locomotives.repository';
+import { formatRouteLabel, Route } from '../../routes/entities/route.entity';
+import { WagonMovement } from '../../wagons/entities/wagon-movement.entity';
+import { Train } from '../../trains/entities/train.entity';
+import { TrainSetLocomotive } from '../../train-sets/entities/train-set-locomotive.entity';
+import { TrainSetWagon } from '../../train-sets/entities/train-set-wagon.entity';
+import { TrainSet } from '../../train-sets/entities/train-set.entity';
+import { ScheduleWagonAdjustmentLog } from '../../train-schedules/entities/schedule-wagon-adjustment-log.entity';
+import { TrainScheduleBooking } from '../../train-schedules/entities/train-schedule-booking.entity';
+import { TrainSchedule } from '../../train-schedules/entities/train-schedule.entity';
+import { WagonAllocationContainerItem } from '../../train-schedules/entities/wagon-allocation-container-item.entity';
+import { WagonBookingAllocation } from '../../train-schedules/entities/wagon-booking-allocation.entity';
+import { TrainScheduleBookingsRepository } from '../../train-schedules/train-schedule-bookings.repository';
+import { TrainSchedulesRepository } from '../../train-schedules/train-schedules.repository';
+import { TrainCompositionRemovalLogRepository } from '../../train-schedules/train-composition-removal-log.repository';
+import { WagonAllocationBulkLoadsRepository } from '../../train-schedules/wagon-allocation-bulk-loads.repository';
+import { WagonAllocationContainerItemsRepository } from '../../train-schedules/wagon-allocation-container-items.repository';
+import { WagonBookingAllocationsRepository } from '../../train-schedules/wagon-booking-allocations.repository';
+import { Yard } from '../../rule-engine/entities/yard.entity';
+import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
+import { WagonTypesRepository } from '../../wagon-types/wagon-types.repository';
+import { Wagon } from '../../wagons/entities/wagon.entity';
+import { AdjustScheduleConsistDto } from '../dto/adjust-schedule-consist.dto';
+import { AssignBookingsDto } from '../dto/assign-bookings.dto';
+import { CreateContainerTrainScheduleDto } from '../dto/create-container-train-schedule.dto';
+import { GetEligibleBookingsDto } from '../dto/get-eligible-bookings.dto';
+import { GetEligibleBulkBookingsDto } from '../dto/get-eligible-bulk-bookings.dto';
+import { GetEligibleContainerBookingsDto } from '../dto/get-eligible-container-bookings.dto';
 import {
   ListTrainSchedulesQueryDto,
   TrainScheduleFreightType,
-} from './dto/list-train-schedules-query.dto';
-import { PinWagonsDto } from './dto/pin-wagons.dto';
-import { MoveWagonLoadDto } from './dto/move-wagon-load.dto';
-import { UpdateContainerItemDto } from './dto/update-container-item.dto';
-import { UpdateImportLoadingStatusDto } from './dto/update-import-loading-status.dto';
-import { PreviewBulkTrainScheduleDto } from './dto/preview-bulk-train-schedule.dto';
-import { PreviewContainerTrainScheduleDto } from './dto/preview-container-train-schedule.dto';
-import { PreviewTrainScheduleDto } from './dto/preview-train-schedule.dto';
-import { TrainSchedulingGlobalRules } from './entities/train-scheduling-global-rules.entity';
+} from '../dto/list-train-schedules-query.dto';
+import { PinWagonsDto } from '../dto/pin-wagons.dto';
+import { MoveWagonLoadDto } from '../dto/move-wagon-load.dto';
+import { UpdateContainerItemDto } from '../dto/update-container-item.dto';
+import { UpdateImportLoadingStatusDto } from '../dto/update-import-loading-status.dto';
+import { PreviewBulkTrainScheduleDto } from '../dto/preview-bulk-train-schedule.dto';
+import { PreviewContainerTrainScheduleDto } from '../dto/preview-container-train-schedule.dto';
+import { PreviewTrainScheduleDto } from '../dto/preview-train-schedule.dto';
+import { TrainSchedulingGlobalRules } from '../entities/train-scheduling-global-rules.entity';
+import { UpdateTrainSchedulingGlobalRulesDto } from '../dto/update-train-scheduling-global-rules.dto';
 import {
   ImportDjiboutiOperation,
   type ImportDjiboutiDocumentType,
-} from './entities/import-djibouti-operation.entity';
+} from '../entities/import-djibouti-operation.entity';
 import {
   ImportDjiboutiActionDto,
   UploadImportDjiboutiDocumentDto,
-} from './dto/import-djibouti-operation.dto';
-import { UpdateTrainSchedulingGlobalRulesDto } from './dto/update-train-scheduling-global-rules.dto';
-import { UpdateScheduleWindowRuleDto } from './dto/update-schedule-window-rule.dto';
-import { UpdateScheduleDateDto } from './dto/update-schedule-date.dto';
-import { MaintenanceRescheduleDto } from './dto/maintenance-reschedule.dto';
-import { type BookingWindowConfig } from './booking-window.config';
-import { BookingWindowGateway } from './booking-window.gateway';
-import { BookingNotifierService } from './booking-notifier.service';
-import { BookingBatchService } from './booking-batch.service';
+} from '../dto/import-djibouti-operation.dto';
+import { UpdateScheduleWindowRuleDto } from '../dto/update-schedule-window-rule.dto';
+import { UpdateScheduleDateDto } from '../dto/update-schedule-date.dto';
+import { MaintenanceRescheduleDto } from '../dto/maintenance-reschedule.dto';
+import { type BookingWindowConfig } from '../booking-window.config';
+import { BookingWindowGateway } from '../booking-window.gateway';
+import { BookingNotifierService } from '../booking-notifier.service';
+import { BookingBatchService } from '../booking-batch.service';
 import {
   computeFleetAvailability,
   summarizeFleetWarnings,
@@ -110,13 +109,13 @@ import {
   type BookingWagonShortage,
   type DeferredBookingRow,
   type FleetAvailabilityRow,
-} from './fleet-plan.util';
+} from '../utils/fleet-plan.util';
 import {
   applyWagonOrderReversal,
   planWagonsWithStock,
   type AllowedWagonTypeMap,
   type WagonStock,
-} from './wagon-plan-flex.util';
+} from '../wagon-plan-flex.util';
 import {
   containerWagonsForLines,
   expandBookingContainerUnits,
@@ -130,10 +129,10 @@ import {
   validateMixedTrainLimitsPerEdge,
   type ContainerPlacementInput,
   type WagonPlanSlot,
-} from './wagon-plan.util';
-import { CorridorBudget } from './corridor-capacity.util';
-import { deriveScheduleDirection } from './derive-schedule-direction.util';
-import { pickLowestFreeNumber, pickTrainNumberPool } from './train-number.util';
+} from '../utils/wagon-plan.util';
+import { CorridorBudget } from '../corridor-capacity.util';
+import { deriveScheduleDirection } from '../utils/derive-schedule-direction.util';
+import { pickLowestFreeNumber, pickTrainNumberPool } from '../train-number.util';
 import {
   bookingCargoTons,
   bulkItemsFitFor,
@@ -145,7 +144,7 @@ import {
   wagonTypeDimensionsFromEntity,
   LocomotiveLimits,
   WagonTypeDimensions,
-} from './train-capacity.util';
+} from '../train-capacity.util';
 import {
   DEFAULT_BULK_WAGON_CAPACITY_TONS,
   DEFAULT_BULK_WAGON_LENGTH_METERS,
@@ -153,8 +152,9 @@ import {
   DEFAULT_CONTAINER_WAGON_CAPACITY_TONS,
   DEFAULT_CONTAINER_WAGON_LENGTH_METERS,
   DEFAULT_CONTAINER_WAGON_TARE_TONS,
-} from './booking-batch.constants';
-import { orderConsistWagons } from './consist-order.util';
+  paymentDrainEndsAtIso,
+} from '../booking-batch.constants';
+import { orderConsistWagons } from '../consist-order.util';
 import {
   computeExportWindowTimes,
   computeImportWindowTimes,
@@ -162,22 +162,22 @@ import {
   eatDay,
   eatDayToUtc,
   shiftEatDay,
-} from './batch-window.util';
-import { TrainCheckpointEvent } from './entities/train-checkpoint-event.entity';
-import { BookingJourneyService } from './booking-journey.service';
-import { TrainCheckpointEventsRepository } from './train-checkpoint-events.repository';
-import { RecordCheckpointDto } from './dto/record-checkpoint.dto';
-import { RouteMilestone } from '../routes/entities/route-milestone.entity';
-import { deriveTradeDirection } from '../../common/derive-trade-direction.util';
-import { WarehouseInventoryService } from '../warehouses/warehouse-inventory.service';
-import { WarehouseReleaseDocumentService } from '../warehouses/warehouse-release-document.service';
+} from '../batch-window.util';
+import { TrainCheckpointEvent } from '../entities/train-checkpoint-event.entity';
+import { BookingJourneyService } from '../booking-journey.service';
+import { TrainCheckpointEventsRepository } from '../repositories/train-checkpoint-events.repository';
+import { RecordCheckpointDto } from '../dto/record-checkpoint.dto';
+import { RouteMilestone } from '../../routes/entities/route-milestone.entity';
+import { deriveTradeDirection } from '../../../common/derive-trade-direction.util';
+import { WarehouseInventoryService } from '../../warehouses/warehouse-inventory.service';
+import { WarehouseReleaseDocumentService } from '../../warehouses/warehouse-release-document.service';
 import {
   autoFillPlacements,
   findMissingContainerNumberIssues,
   isPlaceholderContainerNumber,
   placementsForBookings,
   type ContainerUnitForPlacement,
-} from './container-placement.util';
+} from '../container-placement.util';
 
 const SCHEDULABLE_BOOKING_STATUSES = ['PAID'] as const;
 
@@ -1546,23 +1546,10 @@ export class TrainSchedulingService {
           }
         : globalCfg;
 
-      // Staff cannot schedule inside the lead window — there must be room for a
-      // booking window before departure. IMPORT/DOMESTIC lead is in whole EAT
-      // days (lead 3, today 11th → first allowed departure is the 14th); EXPORT
-      // lead is in hours (24h = 1 day ahead). Checked against the schedule's OWN
-      // lead, so a custom lead is honoured rather than rejected by the global one.
-      const earliest = earliestSchedulableDeparture(direction, windowCfg, new Date());
-      if (departure.getTime() < earliest.getTime()) {
-        const detail =
-          direction === 'EXPORT'
-            ? `at least ${windowCfg.exportBookingLeadHours} hour(s) ahead`
-            : `at least ${windowCfg.importWindowLeadDays} day(s) ahead`;
-        throw new BadRequestException(
-          `Departure ${departure.toISOString()} is inside the booking lead window; ` +
-            `${direction === 'EXPORT' ? 'export' : 'import'} trains must be scheduled ${detail} ` +
-            `(earliest ${earliest.toISOString()})`,
-        );
-      }
+      // Short-notice trains are allowed: a departure inside the booking lead
+      // window is NOT rejected — the window just opens immediately (opensAt is
+      // clamped to `now` below) instead of waiting out a lead that has already
+      // passed. Only `updateScheduleDate` still enforces the lead floor.
 
       // Freeze the rule this schedule is born with. A later global-rules edit
       // only re-derives NOT-YET-OPEN schedules (see restampPendingWindows); an
@@ -1577,6 +1564,11 @@ export class TrainSchedulingService {
               ...ruleSnapshot,
               ...computeImportWindowTimes(departure, windowCfg, new Date()),
             };
+      // Inside-lead departure (e.g. a huge configured lead): the raw open lands
+      // in the past — clamp it to `now` so the window tick opens it immediately.
+      if (computedTimes.windowOpensAt.getTime() < Date.now()) {
+        computedTimes.windowOpensAt = new Date();
+      }
       if (
         computedTimes.windowOpensAt.getTime() >= computedTimes.windowClosesAt.getTime()
       ) {
@@ -2481,63 +2473,6 @@ export class TrainSchedulingService {
     return this.getTrainScheduleById(scheduleId);
   }
 
-  /**
-   * EXPORT ONLY. An export train must not leave carrying nothing while its cargo
-   * sits in the shed: the goods are received into the origin warehouse, GRN'd and
-   * loaded onto the wagons allocated to the booking, so anything still in the
-   * warehouse at dispatch is being left behind. Blocks dispatch when an allocated
-   * booking has warehouse inventory that never made it onto a wagon (received /
-   * stored / ready but not LOADED) — either load it from the Load-to-Train queue,
-   * or drop the booking's wagon allocation so it rides a later train.
-   *
-   * Import/domestic are untouched: their cargo isn't loaded out of an origin
-   * warehouse, so warehouse inventory says nothing about what's aboard.
-   *
-   * Bookings with no warehouse inventory at all are NOT blocked — allocating a
-   * wagon before the goods arrive is normal planning; they simply aren't aboard.
-   */
-  private async assertAllocatedCargoLoaded(scheduleId: string): Promise<void> {
-    const [route]: Array<{ originCountry: string | null; destinationCountry: string | null }> =
-      await this.dataSource.query(
-        `SELECT oy.country AS "originCountry", dy.country AS "destinationCountry"
-           FROM freight.train_schedules ts
-           LEFT JOIN freight.yards oy ON oy.id = ts.origin_station_id
-           LEFT JOIN freight.yards dy ON dy.id = ts.destination_station_id
-          WHERE ts.id = $1 AND ts.deleted_at IS NULL`,
-        [scheduleId],
-      );
-    if (!route) return;
-    const direction = deriveTradeDirection(
-      { country: route.originCountry },
-      { country: route.destinationCountry },
-    );
-    if (direction !== 'EXPORT') return;
-
-    // Only bookings boarding at the schedule's ORIGIN station gate dispatch —
-    // a mid-corridor boarder (origin B on an A→B→C→D run) is loaded when the
-    // train reaches its yard, so its warehouse state says nothing at departure.
-    const rows: Array<{ reference: string | null; status: string }> = await this.dataSource.query(
-      `WITH ${SCHEDULE_BOOKINGS_CTE}
-       SELECT DISTINCT b.reference AS "reference", inv.status AS "status"
-         FROM sched_bookings sb
-         JOIN freight.bookings b ON b.id = sb.booking_id AND b.deleted_at IS NULL
-         JOIN freight.train_schedules ts ON ts.id = sb.schedule_id
-         JOIN freight.warehouse_inventory inv
-           ON inv.booking_id = b.id AND inv.deleted_at IS NULL
-        WHERE sb.schedule_id = $1
-          AND b.origin_yard_id = ts.origin_station_id
-          AND inv.status IN ('RECEIVED', 'STORED', 'READY_FOR_LOADING')`,
-      [scheduleId],
-    );
-    if (rows.length) {
-      const refs = [...new Set(rows.map((r) => r.reference ?? '?'))].join(', ');
-      throw new BadRequestException(
-        `Cannot dispatch: cargo for booking(s) ${refs} is in the warehouse but not loaded onto a wagon. ` +
-          `Load it from the warehouse Load-to-Train queue, or remove the booking's wagon allocation so it travels on a later train.`,
-      );
-    }
-  }
-
   async dispatchSchedule(scheduleId: string) {
     const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
     if (!schedule) {
@@ -2547,8 +2482,8 @@ export class TrainSchedulingService {
       throw new BadRequestException('Only SCHEDULED trains can be dispatched');
     }
     await this.assertImportDjiboutiMayDepart(schedule);
-    // Export only: don't leave received cargo behind in the warehouse.
-    await this.assertAllocatedCargoLoaded(scheduleId);
+    // Cargo readiness (in the warehouse, not inspected, not loaded onto a wagon)
+    // never blocks departure — the dispatch confirm dialog warns and staff decide.
     // A locomotive may sit on many future schedules, but it can only pull one train
     // at a time — block dispatch while any set locomotive is out on a dispatched train.
     const setLocomotiveIds = this.locomotivesOfTrainSet(schedule.trainSet).map((l) => l.id);
@@ -5774,7 +5709,7 @@ export class TrainSchedulingService {
   }
 
   private resolveScheduleFreightType(
-    schedule: import('../train-schedules/entities/train-schedule.entity').TrainSchedule,
+    schedule: import('../../train-schedules/entities/train-schedule.entity').TrainSchedule,
   ): 'CONTAINER' | 'BULK' | 'MIXED' | null {
     const types = new Set(
       (schedule.scheduleBookings ?? [])
@@ -5816,7 +5751,7 @@ export class TrainSchedulingService {
     throw new ConflictException('Could not allocate a unique schedule reference');
   }
 
-  private mapScheduleListItem(schedule: import('../train-schedules/entities/train-schedule.entity').TrainSchedule) {
+  private mapScheduleListItem(schedule: import('../../train-schedules/entities/train-schedule.entity').TrainSchedule) {
     return {
       id: schedule.id,
       reference: schedule.reference ?? null,
@@ -6948,6 +6883,7 @@ export class TrainSchedulingService {
       windowClosesAt: r.window_closes_at,
       docReviewEndsAt: r.doc_review_ends_at,
       paymentPhaseEndsAt: r.payment_phase_ends_at,
+      paymentDrainEndsAt: paymentDrainEndsAtIso(r.payment_phase_ends_at),
       bookingWindowStatus: r.booking_window_status,
       bookingCycleNo: r.booking_cycle_no,
       departureDate: r.scheduled_departure_date,
@@ -6971,7 +6907,7 @@ export class TrainSchedulingService {
     originYardId?: string,
     destinationYardId?: string,
   ): Promise<
-    import('../train-schedules/entities/train-schedule.entity').TrainSchedule[]
+    import('../../train-schedules/entities/train-schedule.entity').TrainSchedule[]
   > {
     const schedules = await this.trainSchedulesRepository.findAll({
       where: {
@@ -7561,7 +7497,7 @@ export class TrainSchedulingService {
   }
 
   private async mapScheduleDetail(
-    schedule: import('../train-schedules/entities/train-schedule.entity').TrainSchedule,
+    schedule: import('../../train-schedules/entities/train-schedule.entity').TrainSchedule,
   ) {
     const allocations = (schedule.trainSet?.wagons ?? []).flatMap(
       (w) => w.allocations ?? [],
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.module.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.module.ts
index 56f2cff00..dd5cc74bc 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.module.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.module.ts
@@ -24,9 +24,9 @@ import { WarehousesModule } from '../warehouses/warehouses.module';
 import { TrainCheckpointEvent } from './entities/train-checkpoint-event.entity';
 import { ImportDjiboutiOperation } from './entities/import-djibouti-operation.entity';
 import { TrainSchedulingGlobalRules } from './entities/train-scheduling-global-rules.entity';
-import { TrainCheckpointEventsRepository } from './train-checkpoint-events.repository';
-import { TrainSchedulingController } from './train-scheduling.controller';
-import { TrainSchedulingService } from './train-scheduling.service';
+import { TrainCheckpointEventsRepository } from './repositories/train-checkpoint-events.repository';
+import { TrainSchedulingController } from './controllers/train-scheduling.controller';
+import { TrainSchedulingService } from './services/train-scheduling.service';
 import { BookingBatchService } from './booking-batch.service';
 import { BookingNotifierService } from './booking-notifier.service';
 import { BookingWindowGateway } from './booking-window.gateway';
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/derive-schedule-direction.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/derive-schedule-direction.util.spec.ts
similarity index 100%
rename from apps/edr-freight-api/src/modules/train-scheduling/derive-schedule-direction.util.spec.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/derive-schedule-direction.util.spec.ts
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/derive-schedule-direction.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/derive-schedule-direction.util.ts
similarity index 65%
rename from apps/edr-freight-api/src/modules/train-scheduling/derive-schedule-direction.util.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/derive-schedule-direction.util.ts
index 7e7358358..1916f5bb8 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/derive-schedule-direction.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/utils/derive-schedule-direction.util.ts
@@ -1,4 +1,4 @@
-import { deriveTradeDirection } from '../../common/derive-trade-direction.util';
+import { deriveTradeDirection } from '../../../common/derive-trade-direction.util';
 
 /** @deprecated Use deriveTradeDirection from common — kept as alias for train scheduling. */
 export const deriveScheduleDirection = deriveTradeDirection;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/fleet-plan.util.spec.ts
similarity index 96%
rename from apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.spec.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/fleet-plan.util.spec.ts
index ff685d30c..23a432a1c 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/utils/fleet-plan.util.spec.ts
@@ -1,5 +1,5 @@
-import { Booking } from '../bookings/entities/booking.entity';
-import { WagonType } from '../wagon-types/entities/wagon-type.entity';
+import { Booking } from '../../bookings/entities/booking.entity';
+import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
 import {
   computeFleetAvailability,
   selectBookingsWithinFleetCap,
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/fleet-plan.util.ts
similarity index 96%
rename from apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/fleet-plan.util.ts
index 2769c212b..1dbd6e05a 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/utils/fleet-plan.util.ts
@@ -1,6 +1,6 @@
-import { bookingCargoTons, bulkWagonsForAllowedTypes } from './train-capacity.util';
-import type { Booking } from '../bookings/entities/booking.entity';
-import type { WagonType } from '../wagon-types/entities/wagon-type.entity';
+import { bookingCargoTons, bulkWagonsForAllowedTypes } from '../train-capacity.util';
+import type { Booking } from '../../bookings/entities/booking.entity';
+import type { WagonType } from '../../wagon-types/entities/wagon-type.entity';
 import {
   buildBulkWagonPlan,
   buildContainerWagonPlan,
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/utils/wagon-plan.util.spec.ts
similarity index 98%
rename from apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-plan.util.spec.ts
index 43c9d0f31..52176662a 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-plan.util.spec.ts
@@ -1,7 +1,7 @@
 import { AllocationLoadType } from '@edr/types';
 
-import { Booking } from '../bookings/entities/booking.entity';
-import { WagonType } from '../wagon-types/entities/wagon-type.entity';
+import { Booking } from '../../bookings/entities/booking.entity';
+import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
 import {
   buildBulkWagonPlan,
   buildContainerWagonPlan,
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-plan.util.ts
similarity index 99%
rename from apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-plan.util.ts
index 9720e46c4..01c497262 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-plan.util.ts
@@ -1,8 +1,8 @@
 import { AllocationLoadType } from '@edr/types';
 
-import { Booking } from '../bookings/entities/booking.entity';
-import { containersPerWagonForSize, wagonsPerUnitForSize } from '../rule-engine/container-type.util';
-import { WagonType } from '../wagon-types/entities/wagon-type.entity';
+import { Booking } from '../../bookings/entities/booking.entity';
+import { containersPerWagonForSize, wagonsPerUnitForSize } from '../../rule-engine/container-type.util';
+import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
 import {
   bookingCargoTons,
   bulkItemsFitFor,
@@ -10,7 +10,7 @@ import {
   bulkTonsPerWagon,
   bulkTonWagonsRequired,
   consistViolations,
-} from './train-capacity.util';
+} from '../train-capacity.util';
 
 export const MAX_TRAIN_WEIGHT_TONS = 3500;
 export const MAX_TRAIN_LENGTH_METERS = 760;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-readiness.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-readiness.util.spec.ts
similarity index 100%
rename from apps/edr-freight-api/src/modules/train-scheduling/wagon-readiness.util.spec.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-readiness.util.spec.ts
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-readiness.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-readiness.util.ts
similarity index 100%
rename from apps/edr-freight-api/src/modules/train-scheduling/wagon-readiness.util.ts
rename to apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-readiness.util.ts
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-type-resolver.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-type-resolver.util.ts
new file mode 100644
index 000000000..6ce404ed1
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/train-scheduling/utils/wagon-type-resolver.util.ts
@@ -0,0 +1,49 @@
+import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
+
+const CARGO_CODE_TO_WAGON_TYPE: Record<string, string> = {
+  COFFEE: 'KW2',
+  GRAIN: 'KW2',
+  WHEAT: 'KW2',
+  SORGHUM: 'KW2',
+  CORN: 'KW2',
+  FERTILIZER: 'PW2',
+  SUGAR: 'PW2',
+  COAL: 'KW3',
+  STEEL: 'CW3',
+  ORE: 'CW3',
+};
+
+const DEFAULT_BULK_WAGON_TYPE = 'CW3';
+const DEFAULT_CONTAINER_WAGON_TYPE = 'NW5';
+
+/**
+ * Resolve wagon type code from cargo type code for bulk freight.
+ */
+export function resolveBulkWagonTypeCode(cargoTypeCode?: string | null): string {
+  if (!cargoTypeCode) return DEFAULT_BULK_WAGON_TYPE;
+  const normalized = cargoTypeCode.trim().toUpperCase();
+  return CARGO_CODE_TO_WAGON_TYPE[normalized] ?? DEFAULT_BULK_WAGON_TYPE;
+}
+
+/**
+ * Pick the best matching wagon type entity for bulk cargo.
+ */
+export function pickBulkWagonType(
+  wagonTypes: WagonType[],
+  cargoTypeCode?: string | null,
+): WagonType | undefined {
+  const preferredCode = resolveBulkWagonTypeCode(cargoTypeCode);
+  const direct = wagonTypes.find((wt) => wt.code === preferredCode && wt.isActive);
+  if (direct) return direct;
+
+  return wagonTypes.find(
+    (wt) =>
+      wt.isActive &&
+      !wt.supportsContainer &&
+      wt.code !== DEFAULT_CONTAINER_WAGON_TYPE,
+  );
+}
+
+export function getDefaultContainerWagonTypeCode(): string {
+  return DEFAULT_CONTAINER_WAGON_TYPE;
+}
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts
index 8d9339186..af0cd11f4 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts
@@ -4,7 +4,7 @@ import {
   applyWagonOrderReversal,
   planWagonsWithStock,
 } from './wagon-plan-flex.util';
-import type { WagonPlanSlot } from './wagon-plan.util';
+import type { WagonPlanSlot } from './utils/wagon-plan.util';
 
 const nw6: WagonType = {
   id: 'wt-nw6',
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts
index ef1e741be..f7db22506 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts
@@ -11,7 +11,7 @@ import {
   sortBookingsForScheduling,
   type BookingWagonShortage,
   type DeferredBookingRow,
-} from './fleet-plan.util';
+} from './utils/fleet-plan.util';
 import {
   MAX_TEU_SLOTS_PER_WAGON,
   containerWagonsForLines,
@@ -21,7 +21,7 @@ import {
   teuSlotsForSizeFt,
   type SlotLoadType,
   type WagonPlanSlot,
-} from './wagon-plan.util';
+} from './utils/wagon-plan.util';
 
 /**
  * Wagon types allowed to carry each container type / bulk cargo type — the
diff --git a/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts b/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts
index a5cd1ff5c..834663170 100644
--- a/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts
+++ b/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts
@@ -31,7 +31,15 @@ import { TrainBuilderService } from './train-builder.service';
 @ApiTags('train-builder')
 @ApiBearerAuth()
 @Controller('train-builder')
-@FleetView(FREIGHT_PERMS.trains.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@FleetView([
+  FREIGHT_PERMS.trains.view,
+  FREIGHT_PERMS.trains.create,
+  FREIGHT_PERMS.trains.update,
+  FREIGHT_PERMS.trains.assignWagons,
+  FREIGHT_PERMS.trains.delete,
+])
 export class TrainBuilderController {
   constructor(private readonly trainBuilderService: TrainBuilderService) {}
 
diff --git a/apps/edr-freight-api/src/modules/trains/trains.controller.ts b/apps/edr-freight-api/src/modules/trains/trains.controller.ts
index 173a738fa..ede540ce2 100644
--- a/apps/edr-freight-api/src/modules/trains/trains.controller.ts
+++ b/apps/edr-freight-api/src/modules/trains/trains.controller.ts
@@ -19,7 +19,14 @@ import { TrainsService } from "./trains.service";
 
 @ApiTags("trains")
 @Controller("trains")
-@FleetView(FREIGHT_PERMS.trains.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@FleetView([
+  FREIGHT_PERMS.trains.view,
+  FREIGHT_PERMS.trains.create,
+  FREIGHT_PERMS.trains.update,
+  FREIGHT_PERMS.trains.delete,
+])
 export class TrainsController {
   constructor(private readonly trainsService: TrainsService) {}
 
diff --git a/apps/edr-freight-api/src/modules/user-trade-access/user-trade-access.controller.ts b/apps/edr-freight-api/src/modules/user-trade-access/user-trade-access.controller.ts
index 3c6255fd9..5c63b96f9 100644
--- a/apps/edr-freight-api/src/modules/user-trade-access/user-trade-access.controller.ts
+++ b/apps/edr-freight-api/src/modules/user-trade-access/user-trade-access.controller.ts
@@ -11,8 +11,9 @@ import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
 
-import { StaffReference } from '../../common/booking-guards';
+import { BookingStaff, StaffReference } from '../../common/booking-guards';
 import { isFreightApprovalAdmin } from '../../common/freight-permission.util';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { UpsertUserTradeAccessDto } from './dto/upsert-user-trade-access.dto';
 import { UserTradeAccessService } from './user-trade-access.service';
 
@@ -24,6 +25,7 @@ export class UserTradeAccessController {
   constructor(private readonly service: UserTradeAccessService) {}
 
   @Get()
+  @BookingStaff(FREIGHT_PERMS.tradeAccess.view)
   @ApiOperation({ summary: 'List every configured user trade-direction scope' })
   list(@CurrentUser() user: TCurrentUser) {
     this.assertAdmin(user);
@@ -41,6 +43,7 @@ export class UserTradeAccessController {
   }
 
   @Put(':userId')
+  @BookingStaff(FREIGHT_PERMS.tradeAccess.manage)
   @ApiOperation({
     summary: 'Set the trade directions a backoffice user may see',
   })
diff --git a/apps/edr-freight-api/src/modules/vehicles/vehicles.controller.ts b/apps/edr-freight-api/src/modules/vehicles/vehicles.controller.ts
index 737574dd9..d9e2ba224 100644
--- a/apps/edr-freight-api/src/modules/vehicles/vehicles.controller.ts
+++ b/apps/edr-freight-api/src/modules/vehicles/vehicles.controller.ts
@@ -20,7 +20,14 @@ import { FleetHistoryService } from '../fleet-history/fleet-history.service';
 @ApiTags('vehicles')
 @ApiBearerAuth()
 @Controller('vehicles')
-@BookingStaff(FREIGHT_PERMS.vehicles.view)
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.vehicles.view,
+  FREIGHT_PERMS.vehicles.create,
+  FREIGHT_PERMS.vehicles.update,
+  FREIGHT_PERMS.vehicles.delete,
+])
 export class VehiclesController {
   constructor(
     private readonly vehiclesService: VehiclesService,
diff --git a/apps/edr-freight-api/src/modules/wagons/dto/bulk-set-wagon-status.dto.ts b/apps/edr-freight-api/src/modules/wagons/dto/bulk-set-wagon-status.dto.ts
index 6f28418aa..f2e8b6814 100644
--- a/apps/edr-freight-api/src/modules/wagons/dto/bulk-set-wagon-status.dto.ts
+++ b/apps/edr-freight-api/src/modules/wagons/dto/bulk-set-wagon-status.dto.ts
@@ -1,5 +1,13 @@
 import { WagonStatus } from '@edr/types';
-import { ArrayNotEmpty, IsArray, IsEnum, IsUUID } from 'class-validator';
+import {
+  ArrayNotEmpty,
+  IsArray,
+  IsEnum,
+  IsOptional,
+  IsString,
+  IsUUID,
+  MaxLength,
+} from 'class-validator';
 
 export class BulkSetWagonStatusDto {
   @IsArray()
@@ -9,4 +17,10 @@ export class BulkSetWagonStatusDto {
 
   @IsEnum(WagonStatus)
   status!: WagonStatus;
+
+  /** Reason shown in the wagon's status history (maintenance/availability flips). */
+  @IsOptional()
+  @IsString()
+  @MaxLength(500)
+  note?: string;
 }
diff --git a/apps/edr-freight-api/src/modules/wagons/entities/wagon-status-log.entity.ts b/apps/edr-freight-api/src/modules/wagons/entities/wagon-status-log.entity.ts
new file mode 100644
index 000000000..2aa4a0683
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/wagons/entities/wagon-status-log.entity.ts
@@ -0,0 +1,32 @@
+import { BaseEntity } from '@edr/api-common';
+import { Column, Entity, Index, JoinColumn, ManyToOne } from 'typeorm';
+
+import { Wagon } from './wagon.entity';
+
+/**
+ * One wagon status flip (Available ⇄ Maintenance, Detained, …) — the audit
+ * trail behind the maintenance/availability buttons on the wagons desk.
+ * Written in the same transaction as the status change.
+ */
+@Entity({ schema: 'freight', name: 'wagon_status_logs' })
+@Index(['wagonId', 'createdAt'])
+export class WagonStatusLog extends BaseEntity {
+  @Column({ name: 'wagon_id', type: 'uuid' })
+  wagonId!: string;
+
+  @ManyToOne(() => Wagon)
+  @JoinColumn({ name: 'wagon_id' })
+  wagon?: Wagon;
+
+  @Column({ name: 'from_status', type: 'varchar', length: 30 })
+  fromStatus!: string;
+
+  @Column({ name: 'to_status', type: 'varchar', length: 30 })
+  toStatus!: string;
+
+  @Column({ name: 'changed_by_user_id', type: 'uuid', nullable: true })
+  changedByUserId?: string | null;
+
+  @Column({ name: 'note', type: 'text', nullable: true })
+  note?: string | null;
+}
diff --git a/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts b/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts
index 9e69c3bf6..5525132a3 100644
--- a/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts
+++ b/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts
@@ -41,7 +41,9 @@ const toInt = (value?: string): number | undefined => {
  */
 @ApiTags('wagon-transfer-requests')
 @Controller('wagon-transfer-requests')
-@WagonTransferView()
+// No class-level key: Nest stacks class and method guards, so a class-level
+// `transfer_view` would AND with every action key below and lock out the OCC
+// staff granted only `transfer_fulfill`. Reads carry the view key themselves.
 export class WagonTransferRequestsController {
   constructor(private readonly service: WagonTransferRequestsService) {}
 
@@ -56,6 +58,7 @@ export class WagonTransferRequestsController {
   }
 
   @Get()
+  @WagonTransferView()
   @ApiOperation({
     summary:
       'Transfer desk list — paginated, filterable by status (comma-separated), yards and wagon type',
@@ -84,6 +87,7 @@ export class WagonTransferRequestsController {
   // matches in declaration order, so `/history` would otherwise be captured by
   // the `:id` param route (and rejected by ParseUUIDPipe).
   @Get('history')
+  @WagonTransferView()
   @ApiQuery({ name: 'page', required: false })
   @ApiQuery({ name: 'pageSize', required: false })
   @ApiOperation({
@@ -129,6 +133,7 @@ export class WagonTransferRequestsController {
   }
 
   @Get(':id')
+  @WagonTransferView()
   @ApiOperation({ summary: 'Get one transfer request' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
diff --git a/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts b/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts
index f90e9ca32..e4492e5cb 100644
--- a/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts
+++ b/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts
@@ -17,7 +17,7 @@ import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/curre
 import {
   BookingStaff,
   FleetManage,
-  StaffReference,
+  FleetView,
 } from '../../common/booking-guards';
 import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateWagonDto } from './dto/create-wagon.dto';
@@ -44,7 +44,7 @@ export class WagonsController {
   }
 
   @Get()
-  @StaffReference()
+  @FleetView(FREIGHT_PERMS.wagons.view)
   @ApiOperation({
     summary: 'List wagons, paginated ({items, meta}) — 10 per page by default',
   })
@@ -53,14 +53,14 @@ export class WagonsController {
   }
 
   @Get(':id')
-  @StaffReference()
+  @FleetView(FREIGHT_PERMS.wagons.view)
   @ApiOperation({ summary: 'Get a wagon by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.wagonsService.findById(id);
   }
 
   @Get(':id/movements')
-  @StaffReference()
+  @FleetView(FREIGHT_PERMS.wagons.view)
   @ApiOperation({
     summary: "Wagon movement ledger (loaded legs, empty repositions, manual moves), newest first",
   })
@@ -119,9 +119,22 @@ export class WagonsController {
   }
 
   @Post('bulk-status')
-  @FleetManage(FREIGHT_PERMS.wagons.update)
-  @ApiOperation({ summary: 'Set the status of multiple wagons' })
-  bulkSetStatus(@Body() dto: BulkSetWagonStatusDto) {
-    return this.wagonsService.bulkSetStatus(dto);
+  // One-of: the dedicated maintenance⇄availability key, full wagon edit, or
+  // the legacy coarse fleet:manage — operations/OCC hold statusToggle only.
+  @BookingStaff([
+    FREIGHT_PERMS.wagons.statusToggle,
+    FREIGHT_PERMS.wagons.update,
+    FREIGHT_PERMS.fleet.manage,
+  ])
+  @ApiOperation({ summary: 'Set the status of multiple wagons (audited in wagon_status_logs)' })
+  bulkSetStatus(@Body() dto: BulkSetWagonStatusDto, @CurrentUser() user: TCurrentUser) {
+    return this.wagonsService.bulkSetStatus(dto, user?.id);
+  }
+
+  @Get(':id/status-history')
+  @FleetView(FREIGHT_PERMS.wagons.view)
+  @ApiOperation({ summary: 'Status-flip history of a wagon (maintenance ⇄ availability audit)' })
+  statusHistory(@Param('id', ParseUUIDPipe) id: string) {
+    return this.wagonsService.statusHistory(id);
   }
 }
diff --git a/apps/edr-freight-api/src/modules/wagons/wagons.module.ts b/apps/edr-freight-api/src/modules/wagons/wagons.module.ts
index 8c8a0d11f..4204d7618 100644
--- a/apps/edr-freight-api/src/modules/wagons/wagons.module.ts
+++ b/apps/edr-freight-api/src/modules/wagons/wagons.module.ts
@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Wagon } from './entities/wagon.entity';
 import { WagonMovement } from './entities/wagon-movement.entity';
+import { WagonStatusLog } from './entities/wagon-status-log.entity';
 import { WagonTransferRequest } from './entities/wagon-transfer-request.entity';
 import { Train } from '../trains/entities/train.entity';
 import { Yard } from '../rule-engine/entities/yard.entity';
@@ -16,6 +17,7 @@ import { WagonTransferRequestsService } from './wagon-transfer-requests.service'
     TypeOrmModule.forFeature([
       Wagon,
       WagonMovement,
+      WagonStatusLog, 
       WagonTransferRequest,
       Train,
       Yard,
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 038ff83b3..2d8950fb4 100644
--- a/apps/edr-freight-api/src/modules/wagons/wagons.service.ts
+++ b/apps/edr-freight-api/src/modules/wagons/wagons.service.ts
@@ -15,6 +15,7 @@ import { AssignWagonToTrainDto } from './dto/assign-wagon-to-train.dto';
 import { BulkTransferWagonsDto } from './dto/bulk-transfer-wagons.dto';
 import { BulkSetWagonStatusDto } from './dto/bulk-set-wagon-status.dto';
 import { Wagon } from './entities/wagon.entity';
+import { WagonStatusLog } from './entities/wagon-status-log.entity';
 import { WagonMovement } from './entities/wagon-movement.entity';
 import { Train } from '../trains/entities/train.entity';
 import { Yard } from '../rule-engine/entities/yard.entity';
@@ -440,7 +441,10 @@ export class WagonsService {
    * from Available to Assigned in the yard workspace). Only the `status` column
    * is touched — train assignment is managed through the assign/unassign flow.
    */
-  async bulkSetStatus(dto: BulkSetWagonStatusDto): Promise<{ updated: number }> {
+  async bulkSetStatus(
+    dto: BulkSetWagonStatusDto,
+    changedByUserId?: string,
+  ): Promise<{ updated: number }> {
     const { wagonIds, status } = dto;
     if (!wagonIds.length) return { updated: 0 };
 
@@ -466,10 +470,24 @@ export class WagonsService {
         );
       }
 
+      // Audit trail rides the same transaction — a status flip without its
+      // history row can't happen. No-change wagons write no log row.
+      const logs = wagons
+        .filter((w) => w.status !== status)
+        .map((w) =>
+          queryRunner.manager.create(WagonStatusLog, {
+            wagonId: w.id,
+            fromStatus: w.status,
+            toStatus: status,
+            changedByUserId: changedByUserId ?? null,
+            note: dto.note ?? null,
+          }),
+        );
       for (const wagon of wagons) {
         wagon.status = status;
       }
       await queryRunner.manager.save(Wagon, wagons);
+      if (logs.length) await queryRunner.manager.save(WagonStatusLog, logs);
 
       await queryRunner.commitTransaction();
       return { updated: wagons.length };
@@ -481,4 +499,13 @@ export class WagonsService {
     }
   }
 
+  /** Status-flip history of one wagon, newest first (maintenance/availability audit). */
+  async statusHistory(wagonId: string): Promise<WagonStatusLog[]> {
+    return this.dataSource.getRepository(WagonStatusLog).find({
+      where: { wagonId },
+      order: { createdAt: 'DESC' },
+      take: 100,
+    });
+  }
+
 }
diff --git a/apps/edr-freight-api/src/modules/warehouses/mark-customer-truck-arrived.spec.ts b/apps/edr-freight-api/src/modules/warehouses/mark-customer-truck-arrived.spec.ts
new file mode 100644
index 000000000..51a1f4c1c
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/warehouses/mark-customer-truck-arrived.spec.ts
@@ -0,0 +1,56 @@
+import { WarehouseInventoryService } from './warehouse-inventory.service';
+
+/**
+ * Export self-haul has no separate "truck arrived" gate action the way import
+ * does (release()'s arrival branch, fired later when a truck shows up to
+ * COLLECT already-warehoused goods) — the truck delivering cargo TO the
+ * warehouse arrives and is received in the same act, so receive()/
+ * bulkReceive() must stamp customer_truck_assignments.arrived_at themselves.
+ */
+type Marker = (
+  manager: { query: jest.Mock },
+  bookingId: string,
+  plateNumber: string | null | undefined,
+) => Promise<void>;
+
+function makeMarker() {
+  const service = Object.create(WarehouseInventoryService.prototype) as Record<string, unknown>;
+  const marker = (
+    service as unknown as { markCustomerTruckArrived: Marker }
+  ).markCustomerTruckArrived.bind(service);
+  return marker;
+}
+
+describe('markCustomerTruckArrived', () => {
+  it('stamps arrival matched by booking + plate', async () => {
+    const marker = makeMarker();
+    const manager = { query: jest.fn().mockResolvedValue(undefined) };
+
+    await marker(manager, 'b-1', 'AAA-2323');
+
+    expect(manager.query).toHaveBeenCalledTimes(1);
+    const [sql, params] = manager.query.mock.calls[0];
+    expect(sql).toMatch(/UPDATE freight\.customer_truck_assignments/);
+    expect(sql).toMatch(/UPPER\(a\.plate_number\) = UPPER\(\$2\)/);
+    expect(params).toEqual(['b-1', 'AAA-2323']);
+  });
+
+  it('trims the plate before matching', async () => {
+    const marker = makeMarker();
+    const manager = { query: jest.fn().mockResolvedValue(undefined) };
+
+    await marker(manager, 'b-1', '  AAA-2323  ');
+
+    expect(manager.query.mock.calls[0][1]).toEqual(['b-1', 'AAA-2323']);
+  });
+
+  it('no-ops on a missing/blank plate — no query, nothing to match on', async () => {
+    const marker = makeMarker();
+    const manager = { query: jest.fn() };
+
+    await marker(manager, 'b-1', undefined);
+    await marker(manager, 'b-1', '   ');
+
+    expect(manager.query).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-fee.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-fee.service.ts
index aa30b31e7..576933c01 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-fee.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-fee.service.ts
@@ -8,6 +8,7 @@ import { NotificationInboxService } from '../notification-inbox/notification-inb
 import { CreateFeeRuleDto, UpdateFeeRuleDto } from './dto/fee-rule.dto';
 import { FeeRuleBasis, FeeRuleType, WarehouseFeeRule, WarehouseFeeTier } from './entities/warehouse-fee-rule.entity';
 import { WarehouseFeeRuleRepository } from './warehouse-fee-rule.repository';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 
 interface ItemAttributes {
   arrivedAt: Date | null;
@@ -178,7 +179,11 @@ export class WarehouseFeeService {
       const total = alerts.reduce((sum, r) => sum + r.accruedAmount, 0);
       try {
         await this.inbox.notify({
-          recipients: { allBackoffice: true },
+          recipients: {
+            permissionKeys: [
+              FREIGHT_PERMS.warehouseFeeInvoices.getNotification,
+            ],
+          },
           audience: NotificationAudience.BACKOFFICE,
           type: NotificationType.BOOKING_STATUS,
           title: 'Warehouse fee accruals need attention',
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-inspection.controller.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-inspection.controller.ts
index cdf34cd66..551f840b3 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inspection.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inspection.controller.ts
@@ -23,9 +23,13 @@ import { WarehouseInspectionService } from './warehouse-inspection.service';
 // Baseline read: inspection reports are opened from inventory screens too —
 // either view permission grants reads; writes stack their own per route.
 @Controller()
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
 @BookingStaff([
   FREIGHT_PERMS.warehouseInspectionReports.view,
   FREIGHT_PERMS.warehouseInventory.view,
+  FREIGHT_PERMS.warehouseInspectionReports.create,
+  FREIGHT_PERMS.warehouseInspectionReports.update,
 ])
 export class WarehouseInspectionController {
   constructor(private readonly inspectionService: WarehouseInspectionService) {}
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts
index b78d6f6f9..459b5009e 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts
@@ -5,7 +5,7 @@ import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
 
 import { actorLabel } from './current-actor.util';
-import { BookingStaff, StaffReference } from '../../common/booking-guards';
+import { BookingStaff, MixedAudience } from '../../common/booking-guards';
 import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { BulkReceiveDto } from './dto/bulk-receive.dto';
 import { BulkInspectDto } from './dto/bulk-inspect.dto';
@@ -457,7 +457,7 @@ export class WarehouseInventoryController {
   }
 
   @Get(':id/handover-document')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: 'View import goods handover document PDF' })
   async handoverDocument(@Param('id', ParseUUIDPipe) id: string, @Res() res: Response) {
     const { filename, buffer } = await this.inventoryService.handoverDocument(id);
@@ -468,7 +468,7 @@ export class WarehouseInventoryController {
   }
 
   @Post('bookings/:bookingId/approve-delivery')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.deliver)
   @ApiOperation({ summary: "Approve delivery — customer records their full name (signature optional)" })
   approveDeliveryForBooking(
     @Param('bookingId', ParseUUIDPipe) bookingId: string,
@@ -484,14 +484,14 @@ export class WarehouseInventoryController {
   }
 
   @Get('bookings/:bookingId/handovers')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: 'Handover records for a booking (per-booking or per-truck)' })
   bookingHandovers(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.handoverService.list(bookingId);
   }
 
   @Post('handovers/:handoverId/sign')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.deliver)
   @ApiOperation({ summary: 'Customer signs one handover (EDR last-mile: one signature per truck)' })
   signHandover(
     @Param('handoverId', ParseUUIDPipe) handoverId: string,
@@ -507,14 +507,14 @@ export class WarehouseInventoryController {
   }
 
   @Post('bookings/:bookingId/request-handover-signature')
-  @StaffReference()
+  @BookingStaff(FREIGHT_PERMS.warehouseInventory.deliver)
   @ApiOperation({ summary: 'Ask the customer to sign the handover (creates one if none, then notifies)' })
   requestHandoverSignature(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.handoverService.requestSignature(bookingId);
   }
 
   @Get('bookings/:bookingId/grn-document')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: 'View GRN PDF for a booking (customer portal)' })
   async bookingGrnDocument(@Param('bookingId', ParseUUIDPipe) bookingId: string, @Res() res: Response) {
     const { filename, buffer } = await this.inventoryService.grnDocumentForBooking(bookingId);
@@ -525,7 +525,7 @@ export class WarehouseInventoryController {
   }
 
   @Get('bookings/:bookingId/release-document')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: 'View gate-clearance / release-order PDF for a booking (customer portal)' })
   async bookingReleaseDocument(@Param('bookingId', ParseUUIDPipe) bookingId: string, @Res() res: Response) {
     const { filename, buffer } = await this.inventoryService.releaseDocumentForBooking(bookingId);
@@ -536,7 +536,7 @@ export class WarehouseInventoryController {
   }
 
   @Get('bookings/:bookingId/handover-document')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: 'View import goods handover document PDF (resolved by booking; ?handoverId= for the per-truck variant)' })
   async bookingHandoverDocument(
     @Param('bookingId', ParseUUIDPipe) bookingId: string,
@@ -571,21 +571,21 @@ export class WarehouseInventoryController {
   }
 
   @Get('bookings/:bookingId/container-items')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: 'Per-container/bulk items of a booking with lifecycle stage + refs' })
   containerItems(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.inventoryService.containerItems(bookingId);
   }
 
   @Get('bookings/:bookingId/container-weights')
-  @StaffReference()
+  @BookingStaff(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: "A booking's containers + VGM cargo weight (tonnes) for exit weighing" })
   containerWeights(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.inventoryService.bookingContainerWeights(bookingId);
   }
 
   @Get('bookings/:bookingId/location')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseInventory.view)
   @ApiOperation({ summary: "Warehouse location of a booking's inventory (customer portal)" })
   bookingLocation(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
     return this.inventoryService.bookingLocation(bookingId);
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 1159c1151..2f204bd62 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
@@ -1425,6 +1425,9 @@ export class WarehouseInventoryService {
         WHERE b.deleted_at IS NULL
           AND b.payment_status = 'PAID'
           AND inv.id IS NULL
+          -- Direct truck-to-train cargo never comes to the warehouse, so never
+          -- offer it for receipt.
+          AND COALESCE(b.export_handover_mode, 'WAREHOUSE') <> 'DIRECT_TO_TRAIN'
         ORDER BY b.scheduled_date DESC NULLS LAST`,
     );
 
@@ -1643,6 +1646,12 @@ export class WarehouseInventoryService {
           [bookingId],
         );
 
+        // Export self-haul: this receive IS the truck's arrival — see
+        // markCustomerTruckArrived / receive()'s single-booking mirror.
+        if (dto.direction === 'EXPORT') {
+          await this.markCustomerTruckArrived(manager, bookingId, truckEntrance?.truckPlateNumber);
+        }
+
         await this.activityLog.record(
           {
             activityType: 'INVENTORY_RECEIVED',
@@ -1691,7 +1700,6 @@ export class WarehouseInventoryService {
   /** EXPORT inventory rows at a given status (route-derived direction), with booking detail. */
   private async exportInventoryByStatus(
     status: WarehouseInventoryStatus,
-    requireInspectionPassed = false,
   ): Promise<ReadyToLoadRow[]> {
     const rows: Array<
       ReadyToLoadRow & { originCountry: string | null; destinationCountry: string | null }
@@ -1720,7 +1728,6 @@ export class WarehouseInventoryService {
          LEFT JOIN freight.containers ct ON ct.id = inv.container_id
         WHERE inv.deleted_at IS NULL
           AND inv.status = $1
-          ${requireInspectionPassed ? `AND inv.inspection_status = 'PASSED'` : ''}
         ORDER BY inv.created_at DESC`,
       [status],
     );
@@ -1733,9 +1740,13 @@ export class WarehouseInventoryService {
       .map(({ originCountry: _oc, destinationCountry: _dc, ...rest }) => rest);
   }
 
-  /** EXPORT inventory that passed inspection and is waiting to be loaded (READY_FOR_LOADING). */
+  /**
+   * EXPORT inventory waiting to be loaded (READY_FOR_LOADING). Inspection state
+   * rides along on each row for the UI to show, but does not filter the queue —
+   * uninspected cargo must still be loadable.
+   */
   async readyToLoadExport(): Promise<ReadyToLoadRow[]> {
-    return this.exportInventoryByStatus('READY_FOR_LOADING', true);
+    return this.exportInventoryByStatus('READY_FOR_LOADING');
   }
 
   /** EXPORT inventory received at the facility and awaiting inspection. */
@@ -2886,6 +2897,13 @@ export class WarehouseInventoryService {
         );
       }
 
+      // Export self-haul: this receive IS the truck's arrival — stamp it on
+      // its own customer_truck_assignments row (mirror of import's arrival,
+      // see markCustomerTruckArrived).
+      if (dto.bookingId && bookingDirection === 'EXPORT') {
+        await this.markCustomerTruckArrived(manager, dto.bookingId, truckEntrance.truckPlateNumber);
+      }
+
       await this.activityLog.record(
         {
             activityType: 'INVENTORY_RECEIVED',
@@ -3117,9 +3135,8 @@ export class WarehouseInventoryService {
     if (!item.bookingId || !item.warehouseId || !item.yardId || !item.zoneId) {
       throw new BadRequestException('Inventory must have booking, warehouse, yard and zone before loading prep');
     }
-    if (item.inspectionStatus !== 'PASSED') {
-      throw new BadRequestException('Inventory must pass inspection before it can be marked ready for loading');
-    }
+    // Inspection is tracked, not enforced — uninspected cargo may still be
+    // marked ready and loaded so a train is never held for paperwork.
     return this.transition(id, 'READY_FOR_LOADING', {
       timestampField: 'readyForLoadingAt',
       activityType: 'READY_FOR_LOADING',
@@ -6008,6 +6025,33 @@ export class WarehouseInventoryService {
     };
   }
 
+  /**
+   * EXPORT self-haul mirror of the customer truck lifecycle IMPORT already has:
+   * import stamps a truck's arrival on the SEPARATE gate action that comes
+   * later (release()'s arrival branch, when the customer's truck shows up to
+   * COLLECT already-warehoused goods). Export has no such separate step — the
+   * truck delivering cargo TO the warehouse arrives and is received in the
+   * same act, so receive()/bulkReceive() themselves are the arrival event.
+   * Matched by plate (not assignmentId — neither receive endpoint carries
+   * one), same as release()'s departure-branch self-haul UPDATE.
+   */
+  private async markCustomerTruckArrived(
+    manager: EntityManager,
+    bookingId: string,
+    plateNumber: string | null | undefined,
+  ): Promise<void> {
+    const plate = plateNumber?.trim();
+    if (!plate) return;
+    await manager.query(
+      `UPDATE freight.customer_truck_assignments a
+          SET arrived_at = COALESCE(a.arrived_at, NOW()), updated_at = NOW()
+        WHERE a.booking_id = $1
+          AND UPPER(a.plate_number) = UPPER($2)
+          AND a.deleted_at IS NULL`,
+      [bookingId, plate],
+    );
+  }
+
   private async getBookingTruckEntranceSource(
     manager: EntityManager,
     bookingId: string,
@@ -6027,6 +6071,10 @@ export class WarehouseInventoryService {
     firstMileDriverPhone?: string | null;
     firstMileDriverLicenseNumber?: string | null;
     firstMileTruckType?: string | null;
+    customerTruckPlateNumber?: string | null;
+    customerTruckDriverName?: string | null;
+    customerTruckType?: string | null;
+    customerTruckContainerNumber?: string | null;
   }> {
     const [booking] = await manager.query(
       `SELECT b.reference AS "reference",
@@ -6046,7 +6094,24 @@ export class WarehouseInventoryService {
               ) AS "firstMileDriverName",
               driver.phone_number AS "firstMileDriverPhone",
               driver.license_number AS "firstMileDriverLicenseNumber",
-              v.vehicle_type AS "firstMileTruckType"
+              v.vehicle_type AS "firstMileTruckType",
+              -- Self-haul truck assigned via the portal — export delivering to
+              -- the warehouse or import collecting from it. Same pattern as
+              -- eligibleBookings/importQueueByStatuses: multi-truck self-haul
+              -- writes plates/drivers to customer_truck_assignments and leaves
+              -- the booking columns null, so read the assignments first and
+              -- keep the legacy column as the fallback for single-truck
+              -- bookings written before that table existed.
+              COALESCE((SELECT string_agg(DISTINCT cta.plate_number, ', ')
+                          FROM freight.customer_truck_assignments cta
+                         WHERE cta.booking_id = b.id AND cta.deleted_at IS NULL),
+                       b.customer_truck_plate_number) AS "customerTruckPlateNumber",
+              COALESCE((SELECT string_agg(DISTINCT cta.driver_name, ', ')
+                          FROM freight.customer_truck_assignments cta
+                         WHERE cta.booking_id = b.id AND cta.deleted_at IS NULL),
+                       b.customer_truck_driver_name) AS "customerTruckDriverName",
+              b.customer_truck_type AS "customerTruckType",
+              b.customer_truck_container_number AS "customerTruckContainerNumber"
          FROM freight.bookings b
          LEFT JOIN freight.companies company ON company.id = b.company_id
          ${primaryContactUserJoin('company')}
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.controller.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.controller.ts
index c2f5cec9c..323e5c2d8 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-invoice.controller.ts
@@ -5,7 +5,7 @@ import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
 
 import { actorLabel } from './current-actor.util';
-import { BookingStaff, StaffReference } from '../../common/booking-guards';
+import { BookingStaff, MixedAudience } from '../../common/booking-guards';
 import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { PayInvoiceDto as GatewayPayInvoiceDto } from '../billing/dto/pay-invoice.dto';
 import { GenerateInvoiceDto, PayInvoiceBodyDto } from './dto/invoice.dto';
@@ -43,7 +43,7 @@ export class WarehouseInvoiceController {
   }
 
   @Get('bookings/:id/warehouse-fee-invoices')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseFeeInvoices.view)
   @ApiOperation({ summary: 'List warehouse fee invoices for a booking' })
   listForBooking(@Param('id', ParseUUIDPipe) id: string) {
     return this.invoiceService.listForBooking(id);
@@ -71,14 +71,14 @@ export class WarehouseInvoiceController {
   }
 
   @Get('warehouse-fee-invoices/:id')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseFeeInvoices.view)
   @ApiOperation({ summary: 'Get a warehouse fee invoice with items + payment history' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.invoiceService.findById(id);
   }
 
   @Get('warehouse-fee-invoices/:id/document')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseFeeInvoices.view)
   @ApiOperation({ summary: 'Download sealed warehouse fee invoice PDF' })
   async document(@Param('id', ParseUUIDPipe) id: string, @Res() res: Response) {
     const { filename, buffer } = await this.invoiceService.document(id);
@@ -89,7 +89,7 @@ export class WarehouseInvoiceController {
   }
 
   @Get('warehouse-fee-invoices/:id/receipt')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseFeeInvoices.view)
   @ApiOperation({ summary: 'Download sealed warehouse fee payment receipt PDF' })
   async receipt(@Param('id', ParseUUIDPipe) id: string, @Res() res: Response) {
     const { filename, buffer } = await this.invoiceService.receipt(id);
@@ -114,7 +114,7 @@ export class WarehouseInvoiceController {
   }
 
   @Post('warehouse-fee-invoices/:id/pay-online')
-  @StaffReference()
+  @MixedAudience(FREIGHT_PERMS.warehouseFeeInvoices.pay)
   @ApiOperation({ summary: 'Initiate Telebirr/Waafi payment for a warehouse fee invoice' })
   payOnline(@Param('id', ParseUUIDPipe) id: string, @Body() dto: GatewayPayInvoiceDto) {
     return this.invoiceService.initiatePayment(id, dto);
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.controller.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.controller.ts
index 594fd7a6f..04cbacd28 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.controller.ts
@@ -12,7 +12,13 @@ import { WarehouseZonesService } from './warehouse-zones.service';
 // receive/move pickers) — either view permission grants reads; writes stack
 // their specific permission per route.
 @Controller('warehouse-zones')
-@BookingStaff([FREIGHT_PERMS.warehouseZones.view, FREIGHT_PERMS.warehouseInventory.view])
+// Class gate lists every key its routes use: Nest runs class AND method
+// guards, so a key missing here would deny before the route's own key runs.
+@BookingStaff([
+  FREIGHT_PERMS.warehouseZones.view,
+  FREIGHT_PERMS.warehouseInventory.view,
+  FREIGHT_PERMS.warehouseZones.update,
+])
 export class WarehouseZonesController {
   constructor(private readonly zonesService: WarehouseZonesService) {}
 
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouses.controller.ts b/apps/edr-freight-api/src/modules/warehouses/warehouses.controller.ts
index 3ee381a8c..f3d894dfc 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouses.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouses.controller.ts
@@ -14,13 +14,19 @@ import { WarehousesService } from './warehouses.service';
 @ApiTags('warehouses')
 @ApiBearerAuth()
 // Baseline read: warehouse reference data is consumed by inventory/dashboard
-// flows too, so any of the three view permissions grants reads. Writes stack
-// their specific create/update permission per route on top.
+// flows too, so any of the view permissions grants reads. Writes stack their
+// specific create/update permission per route on top — which means every key
+// used by a route below must also appear here, or the class guard denies
+// before the route's own key is ever consulted (Nest ANDs the two).
 @Controller('warehouses')
 @BookingStaff([
   FREIGHT_PERMS.warehouses.view,
   FREIGHT_PERMS.warehouseInventory.view,
   FREIGHT_PERMS.warehouseDashboard.view,
+  FREIGHT_PERMS.warehouses.create,
+  FREIGHT_PERMS.warehouses.update,
+  FREIGHT_PERMS.warehouseYards.view,
+  FREIGHT_PERMS.warehouseYards.create,
 ])
 export class WarehousesController {
   constructor(
diff --git a/apps/edr-freight-api/src/scripts/eims-login.ts b/apps/edr-freight-api/src/scripts/eims-login.ts
new file mode 100644
index 000000000..f9cc60d27
--- /dev/null
+++ b/apps/edr-freight-api/src/scripts/eims-login.ts
@@ -0,0 +1,40 @@
+import "dotenv/config";
+import axios from "axios";
+import { HttpService } from "@nestjs/axios";
+import { ConfigService } from "@nestjs/config";
+import eimsConfig, { EimsConfig } from "../config/eims.config";
+import { EimsAuthService } from "../modules/eims/eims-auth.service";
+import { EimsCredentialsProvider } from "../modules/eims/eims-credentials.provider";
+import { EimsSignerService } from "../modules/eims/eims-signer.service";
+
+/**
+ * Manual, developer-run live check of EIMS authentication.
+ *
+ * Run explicitly:  pnpm --filter @edr/freight-api eims:login
+ *
+ * Reads credentials from the local .env only. Never runs at boot, never runs in the test suite,
+ * and prints no token, secret, signature or certificate — only whether login succeeded.
+ */
+async function main(): Promise<void> {
+  const config = eimsConfig() as EimsConfig;
+  if (!config.enabled) {
+    throw new Error("EIMS_ENABLED is not true — set it in .env before running this check");
+  }
+
+  const configService = { get: () => config } as unknown as ConfigService;
+  const http = new HttpService(axios.create());
+  const credentials = new EimsCredentialsProvider(configService);
+  const auth = new EimsAuthService(http, configService, new EimsSignerService(credentials));
+
+  console.log(`POST ${config.baseUrl}/auth/login  (tin=${config.tin})`);
+  const token = await auth.getValidAccessToken();
+  console.log(`✔ login succeeded — access token received (${token.length} chars, not printed)`);
+
+  const cached = await auth.getValidAccessToken();
+  console.log(`✔ second call served from cache: ${cached === token}`);
+}
+
+main().catch((err: Error) => {
+  console.error(`✘ ${err.message}`);
+  process.exitCode = 1;
+});
diff --git a/apps/edr-freight-api/src/scripts/migrate.ts b/apps/edr-freight-api/src/scripts/migrate.ts
index ac8a97b28..266d015cd 100644
--- a/apps/edr-freight-api/src/scripts/migrate.ts
+++ b/apps/edr-freight-api/src/scripts/migrate.ts
@@ -9,7 +9,7 @@ import {
   buildIamMigrationDataSourceOptions,
   buildFreightMigrationDataSourceOptions,
   FREIGHT_MIGRATIONS,
-  IAM_MIGRATIONS,
+  // IAM_MIGRATIONS,
   LEGACY_MIGRATIONS,
 } from "../config/database.config";
 
@@ -109,7 +109,7 @@ async function adoptLegacyHistory(
 
   if (!legacyExists[0].present) return;
 
-  await createHistoryTable(dataSource, IAM_MIGRATIONS);
+  // await createHistoryTable(dataSource, IAM_MIGRATIONS);
   await createHistoryTable(dataSource, FREIGHT_MIGRATIONS);
 
   const adopt = async (
@@ -134,7 +134,7 @@ async function adoptLegacyHistory(
     );
   };
 
-  await adopt(IAM_MIGRATIONS, true);
+  // await adopt(IAM_MIGRATIONS, true);
   await adopt(FREIGHT_MIGRATIONS, false);
 }
 
@@ -158,7 +158,9 @@ export async function runAllMigrations(): Promise<void> {
       (migration) => migration.name ?? migration.constructor.name,
     );
     await adoptLegacyHistory(iam, iamMigrationNames);
-    await runMigrations("iam", iam);
+    // IAM migrations are owned by @tria-plc/iamapi-common's own CLI, not the
+    // freight deploy — do not apply them here.
+    // await runMigrations("iam", iam);
   } finally {
     await iam.destroy();
   }
diff --git a/apps/edr-freight-api/src/seed/edr-freight.seed.ts b/apps/edr-freight-api/src/seed/edr-freight.seed.ts
index 22f7fe5ef..d90fe7b80 100644
--- a/apps/edr-freight-api/src/seed/edr-freight.seed.ts
+++ b/apps/edr-freight-api/src/seed/edr-freight.seed.ts
@@ -1,6 +1,7 @@
 import {
   BOOKING_RULE_ENGINE_PERMISSIONS,
   BOOKING_RULE_ENGINE_PERMISSION_KEYS,
+  deriveReadPermissions,
   POSITION_PERMISSION_PRESETS,
   ROLE_PERMISSION_PRESETS,
 } from './freight-permissions.registry';
@@ -190,7 +191,7 @@ const POSITION_TYPE_PERMISSIONS = [
   },
 ] as const;
 
-export const EDR_FREIGHT_PERMISSIONS = [
+const EDR_FREIGHT_VIEWABLE_PERMISSIONS = [
   ...EMPLOYEE_REGISTRATION_PERMISSIONS,
   ...ROLE_ASSIGNMENT_PERMISSIONS,
   ...HIERARCHY_UNIT_PERMISSIONS,
@@ -200,6 +201,15 @@ export const EDR_FREIGHT_PERMISSIONS = [
   ...BOOKING_RULE_ENGINE_PERMISSIONS,
 ];
 
+export const EDR_FREIGHT_PERMISSIONS = [
+  ...EDR_FREIGHT_VIEWABLE_PERMISSIONS,
+  // API-read twin of every `:view` key above — grants the module's GET routes
+  // without putting it in the backoffice sidebar. Seeded so they can be
+  // assigned; no role or position preset below grants one, that stays
+  // hand-curated in iam.position_type_permissions.
+  ...deriveReadPermissions(EDR_FREIGHT_VIEWABLE_PERMISSIONS),
+];
+
 export { BOOKING_RULE_ENGINE_PERMISSION_KEYS } from './freight-permissions.registry';
 
 export const EDR_FREIGHT_ROLES: FreightSeedRole[] = [
diff --git a/apps/edr-freight-api/src/seed/freight-notification-permissions.seeder.ts b/apps/edr-freight-api/src/seed/freight-notification-permissions.seeder.ts
new file mode 100644
index 000000000..0bea4ad95
--- /dev/null
+++ b/apps/edr-freight-api/src/seed/freight-notification-permissions.seeder.ts
@@ -0,0 +1,103 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { Application, Permission } from '@tria-plc/iamapi-common';
+import { DataSource } from 'typeorm';
+
+import {
+  NOTIFICATION_PERMISSIONS,
+  NOTIFICATION_PERMISSION_ANCHORS,
+} from './freight-permissions.registry';
+
+const EDR_FREIGHT_APP_KEY = 'edr_freight_app';
+
+/**
+ * The three tables a permission grant can arrive on, with the column naming
+ * the grantee. These are compile-time constants — the only values interpolated
+ * into the SQL below.
+ */
+const CARRIERS = [
+  ['iam.position_permissions', 'position_id'],
+  ['iam.position_type_permissions', 'position_type_id'],
+  ['iam.role_permissions', 'role_id'],
+] as const;
+
+/**
+ * Backfills the `<module>:get_notification` keys.
+ *
+ * Those keys are new, so on deploy nobody holds them and every staff
+ * notification would resolve to zero recipients — silently, because
+ * `NotificationInboxService.notify` logs an empty resolve at debug level. This
+ * grants each new key to whoever already holds that desk's anchor key (the
+ * permission gating the page the notification links to), across all three
+ * carriers.
+ *
+ * Deliberately NOT gated behind SEED_EDR_ORG: that flag is off everywhere
+ * except e2e/integration, and this has to run wherever the notifications do.
+ * For the same reason it inserts the permission rows itself rather than
+ * trusting EdrOrgSeeder. Idempotent — safe on every boot, and safe to leave in
+ * place permanently.
+ */
+@Injectable()
+export class FreightNotificationPermissionsSeeder {
+  private readonly logger = new Logger(FreightNotificationPermissionsSeeder.name);
+
+  constructor(private readonly dataSource: DataSource) {}
+
+  async run(): Promise<void> {
+    const application = await this.dataSource
+      .getRepository(Application)
+      .findOne({ where: { key: EDR_FREIGHT_APP_KEY }, select: { id: true } });
+
+    if (!application?.id) {
+      this.logger.warn(
+        `Application '${EDR_FREIGHT_APP_KEY}' not found — notification permission backfill skipped`,
+      );
+      return;
+    }
+
+    // Ids are left to the column default and never sent: iam.permissions has
+    // two unique columns (PK id, UQ key) and ON CONFLICT can only target one,
+    // so a hand-minted id that some retired key already owns would slip past
+    // ON CONFLICT (key) and die on the PK. Same reasoning as EdrOrgSeeder.
+    await this.dataSource
+      .getRepository(Permission)
+      .createQueryBuilder()
+      .insert()
+      .values(
+        NOTIFICATION_PERMISSIONS.map((permission) => ({
+          key: permission.key,
+          name: { ...permission.name },
+          applicationId: application.id as string,
+        })),
+      )
+      .orIgnore()
+      .execute();
+
+    let granted = 0;
+    for (const [key, anchors] of Object.entries(
+      NOTIFICATION_PERMISSION_ANCHORS,
+    )) {
+      for (const [table, granteeColumn] of CARRIERS) {
+        const result: unknown = await this.dataSource.query(
+          `INSERT INTO ${table} (${granteeColumn}, permission_id)
+           SELECT DISTINCT g.${granteeColumn}, target.id
+             FROM ${table} g
+             JOIN iam.permissions anchor
+               ON anchor.id = g.permission_id AND anchor.key = ANY($1)
+             JOIN iam.permissions target ON target.key = $2
+            WHERE NOT EXISTS (
+              SELECT 1
+                FROM ${table} existing
+               WHERE existing.${granteeColumn} = g.${granteeColumn}
+                 AND existing.permission_id = target.id)`,
+          [anchors, key],
+        );
+        // node-postgres returns [rows, rowCount] for a bare INSERT.
+        granted += (Array.isArray(result) ? (result[1] as number) : 0) ?? 0;
+      }
+    }
+
+    this.logger.log(
+      `Ensured ${NOTIFICATION_PERMISSIONS.length} notification permissions, backfilled ${granted} grant(s)`,
+    );
+  }
+}
diff --git a/apps/edr-freight-api/src/seed/freight-permission-key-migration.seeder.ts b/apps/edr-freight-api/src/seed/freight-permission-key-migration.seeder.ts
index 0a0f86a64..bdc3f9139 100644
--- a/apps/edr-freight-api/src/seed/freight-permission-key-migration.seeder.ts
+++ b/apps/edr-freight-api/src/seed/freight-permission-key-migration.seeder.ts
@@ -1,5 +1,10 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { Permission } from '@tria-plc/iamapi-common';
+import {
+  Permission,
+  PositionPermission,
+  PositionTypePermission,
+  RolePermission,
+} from '@tria-plc/iamapi-common';
 import { DataSource } from 'typeorm';
 
 /** Renamed rule-engine resources: old key -> new key (same permission id). */
@@ -14,6 +19,22 @@ const PERMISSION_KEY_RENAMES: ReadonlyArray<{ from: string; to: string }> = [
   },
 ];
 
+/**
+ * Keys retired by the permission-system redesign (docs/permission-system/01):
+ * seeded but never enforced anywhere, and no matching feature exists. Grants
+ * referencing them are revoked before the permission row is deleted.
+ */
+const RETIRED_PERMISSION_KEYS: ReadonlyArray<string> = [
+  'edr_freight_app:payments:verify',
+  'edr_freight_app:payments:refund',
+  'edr_freight_app:invoices:create',
+  'edr_freight_app:invoices:cancel',
+  'edr_freight_app:fuel:approve',
+  'edr_freight_app:maintenance:complete',
+  'edr_freight_app:bookings:payment_pnr',
+  'edr_freight_app:bookings:payment_verify',
+];
+
 @Injectable()
 export class FreightPermissionKeyMigrationSeeder {
   private readonly logger = new Logger(FreightPermissionKeyMigrationSeeder.name);
@@ -44,5 +65,29 @@ export class FreightPermissionKeyMigrationSeeder {
       await permissionRepository.update({ id: existing.id }, { key: to });
       this.logger.log(`Renamed permission key ${from} -> ${to}`);
     }
+
+    for (const key of RETIRED_PERMISSION_KEYS) {
+      const existing = await permissionRepository.findOne({
+        where: { key },
+        select: { id: true },
+      });
+      if (!existing) {
+        continue;
+      }
+
+      // Revoke every grant first, then drop the permission row itself.
+      const permissionId = existing.id as string;
+      await this.dataSource
+        .getRepository(RolePermission)
+        .delete({ permissionId });
+      await this.dataSource
+        .getRepository(PositionPermission)
+        .delete({ permissionId });
+      await this.dataSource
+        .getRepository(PositionTypePermission)
+        .delete({ permissionId });
+      await permissionRepository.delete({ id: permissionId });
+      this.logger.log(`Retired permission key ${key}`);
+    }
   }
 }
diff --git a/apps/edr-freight-api/src/seed/freight-permissions.registry.spec.ts b/apps/edr-freight-api/src/seed/freight-permissions.registry.spec.ts
index caab85c3e..d134a7986 100644
--- a/apps/edr-freight-api/src/seed/freight-permissions.registry.spec.ts
+++ b/apps/edr-freight-api/src/seed/freight-permissions.registry.spec.ts
@@ -1,4 +1,9 @@
 import { EDR_FREIGHT_PERMISSIONS } from './edr-freight.seed';
+import {
+  NOTIFICATION_PERMISSIONS,
+  NOTIFICATION_PERMISSION_ANCHORS,
+  readTwinOf,
+} from './freight-permissions.registry';
 
 describe('EDR_FREIGHT_PERMISSIONS', () => {
   // The seeder inserts the whole catalog in one ON CONFLICT (key) DO UPDATE
@@ -10,4 +15,73 @@ describe('EDR_FREIGHT_PERMISSIONS', () => {
 
     expect(duplicates).toEqual([]);
   });
+
+  // The `:read` ids are derived rather than hand-written, so a collision
+  // would surface here instead of as a primary-key violation on a fresh
+  // database.
+  it('has no duplicate ids', () => {
+    const ids = EDR_FREIGHT_PERMISSIONS.map((permission) => permission.id);
+    const duplicates = [...new Set(ids.filter((id, i) => ids.indexOf(id) !== i))];
+
+    expect(duplicates).toEqual([]);
+  });
+
+  // `:read` grants a module's GET routes without putting it in the backoffice
+  // sidebar. Every `:view` needs its twin or that module has no way to be
+  // granted API-only access.
+  it('gives every :view key a :read twin', () => {
+    const keys = new Set(EDR_FREIGHT_PERMISSIONS.map((p) => p.key));
+    const missing = [...keys]
+      .filter((key) => key.endsWith(':view'))
+      .map((key) => readTwinOf(key))
+      .filter((twin): twin is string => twin !== null && !keys.has(twin));
+
+    expect(missing).toEqual([]);
+  });
+
+  it('mints every :read id in the v5 block', () => {
+    const reads = EDR_FREIGHT_PERMISSIONS.filter((p) => p.key.endsWith(':read'));
+
+    expect(reads.length).toBeGreaterThan(0);
+    // Version nibble 5 — the source `:view` ids are all v4, so the two sets
+    // cannot overlap however many keys are added.
+    for (const read of reads) {
+      expect(read.id).toMatch(
+        /^[0-9a-f]{8}-[0-9a-f]{4}-5[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/,
+      );
+    }
+  });
+});
+
+describe('NOTIFICATION_PERMISSION_ANCHORS', () => {
+  const catalog = new Set(EDR_FREIGHT_PERMISSIONS.map((p) => p.key));
+
+  // FreightNotificationPermissionsSeeder backfills each get_notification key
+  // onto whoever holds its anchor. A typo'd anchor matches no permission row,
+  // so the key is granted to nobody and every notification on that desk
+  // silently resolves to zero recipients — notify() logs that at debug level.
+  it('anchors every notification key on keys that exist', () => {
+    const missing = Object.values(NOTIFICATION_PERMISSION_ANCHORS)
+      .flat()
+      .filter((key) => !catalog.has(key));
+
+    expect(missing).toEqual([]);
+  });
+
+  it('seeds every notification key into the catalog', () => {
+    const missing = NOTIFICATION_PERMISSIONS.map((p) => p.key).filter(
+      (key) => !catalog.has(key),
+    );
+
+    expect(missing).toEqual([]);
+  });
+
+  it('gives every notification key an anchor to backfill from', () => {
+    const anchored = new Set(Object.keys(NOTIFICATION_PERMISSION_ANCHORS));
+    const unanchored = NOTIFICATION_PERMISSIONS.map((p) => p.key).filter(
+      (key) => !anchored.has(key),
+    );
+
+    expect(unanchored).toEqual([]);
+  });
 });
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 11cccd782..06511cb2b 100644
--- a/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
+++ b/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
@@ -1,4 +1,4 @@
-const EDR_FREIGHT_APP_KEY = 'edr_freight_app';
+const EDR_FREIGHT_APP_KEY = "edr_freight_app";
 
 export type FreightPermissionSeed = {
   id: string;
@@ -8,33 +8,39 @@ export type FreightPermissionSeed = {
 };
 
 export const RULE_ENGINE_RESOURCE_SLUGS = [
-  'cargo-types',
-  'container-types',
-  'wagon-types',
-  'service-types',
-  'yards',
-  'shipping-lines',
-  'weight-limit-rules',
-  'priority-configs',
-  'rates',
-  'approval-rules',
-  'yard-distances',
+  "cargo-types",
+  "container-types",
+  "wagon-types",
+  "service-types",
+  "yards",
+  "shipping-lines",
+  "weight-limit-rules",
+  "priority-configs",
+  "rates",
+  "approval-rules",
+  "yard-distances",
   // Keep new slugs at the END: ruleEngineCrudId derives ids from list index,
   // so a mid-list insert would shift ids already seeded for later slugs.
-  'truck-types',
-  'transit-agents',
+  "truck-types",
+  "transit-agents",
 ] as const;
 
-export type RuleEngineResourceSlug = (typeof RULE_ENGINE_RESOURCE_SLUGS)[number];
+export type RuleEngineResourceSlug =
+  (typeof RULE_ENGINE_RESOURCE_SLUGS)[number];
 
 const slugToResourceKey = (slug: RuleEngineResourceSlug): string =>
-  slug.replace(/-/g, '_');
+  slug.replace(/-/g, "_");
 
-const perm = (
-  id: string,
-  key: string,
-  en: string,
-): FreightPermissionSeed => ({
+const VIEW_KEY_SUFFIX = ":view";
+const READ_KEY_SUFFIX = ":read";
+
+/** The `:read` twin of a `:view` key, or null if `key` is not a view key. */
+export const readTwinOf = (key: string): string | null =>
+  key.endsWith(VIEW_KEY_SUFFIX)
+    ? `${key.slice(0, -VIEW_KEY_SUFFIX.length)}${READ_KEY_SUFFIX}`
+    : null;
+
+const perm = (id: string, key: string, en: string): FreightPermissionSeed => ({
   id,
   key,
   name: { am: en, en },
@@ -42,32 +48,135 @@ const perm = (
 });
 
 export const BOOKING_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('a1000001-0001-4000-8000-000000000001', 'edr_freight_app:bookings:view', 'View bookings'),
-  perm('a1000001-0001-4000-8000-000000000002', 'edr_freight_app:bookings:staff_accept', 'Accept booking intake'),
-  perm('a1000001-0001-4000-8000-000000000003', 'edr_freight_app:bookings:request_changes', 'Request booking changes'),
-  perm('a1000001-0001-4000-8000-000000000004', 'edr_freight_app:bookings:reject', 'Reject booking submission'),
-  perm('a1000001-0001-4000-8000-000000000005', 'edr_freight_app:bookings:approve_line_staff', 'Approve as line staff'),
-  perm('a1000001-0001-4000-8000-000000000006', 'edr_freight_app:bookings:approve_director', 'Approve as director'),
-  perm('a1000001-0001-4000-8000-000000000007', 'edr_freight_app:bookings:approve_ceo', 'Approve as CEO'),
-  perm('a1000001-0001-4000-8000-000000000008', 'edr_freight_app:bookings:reject_approval', 'Reject at approval step'),
-  perm('a1000001-0001-4000-8000-000000000009', 'edr_freight_app:bookings:generate_contract', 'Generate contract'),
-  perm('a1000001-0001-4000-8000-00000000000a', 'edr_freight_app:bookings:sign_staff', 'Staff contract signature'),
-  perm('a1000001-0001-4000-8000-00000000000b', 'edr_freight_app:bookings:payment_pnr', 'Generate PNR'),
-  perm('a1000001-0001-4000-8000-00000000000c', 'edr_freight_app:bookings:payment_verify', 'Verify payment'),
-  perm('a1000001-0001-4000-8000-00000000000d', 'edr_freight_app:bookings:operations', 'Booking operations'),
-  perm('a1000001-0001-4000-8000-00000000000e', 'edr_freight_app:bookings:cancel', 'Cancel booking'),
-  perm('a1000001-0001-4000-8000-000000000023', 'edr_freight_app:bookings:clearance_view', 'View customs-clearance queue'),
-  perm('a1000001-0001-4000-8000-000000000020', 'edr_freight_app:bookings:review_documents', 'Review clearance documents'),
-  perm('a1000001-0001-4000-8000-000000000021', 'edr_freight_app:bookings:upload_clearance_output', 'Upload customs output documents'),
-  perm('a1000001-0001-4000-8000-000000000022', 'edr_freight_app:bookings:finalize_clearance', 'Finalize document clearance'),
-  perm('a1000001-0001-4000-8000-00000000000f', 'edr_freight_app:train_scheduling:view', 'View train scheduling'),
-  perm('a1000001-0001-4000-8000-000000000011', 'edr_freight_app:fleet:view', 'View fleet'),
-  perm('a1000001-0001-4000-8000-000000000012', 'edr_freight_app:fleet:manage', 'Manage fleet'),
-  perm('a1000001-0001-4000-8000-000000000013', 'edr_freight_app:admin', 'Freight administration'),
-  perm('a1000001-0001-4000-8000-000000000024', 'edr_freight_app:bookings:create', 'Create booking'),
+  perm(
+    "a1000001-0001-4000-8000-000000000001",
+    "edr_freight_app:bookings:view",
+    "View bookings",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000002",
+    "edr_freight_app:bookings:staff_accept",
+    "Accept booking intake",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000003",
+    "edr_freight_app:bookings:request_changes",
+    "Request booking changes",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000004",
+    "edr_freight_app:bookings:reject",
+    "Reject booking submission",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000005",
+    "edr_freight_app:bookings:approve_line_staff",
+    "Approve as line staff",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000006",
+    "edr_freight_app:bookings:approve_director",
+    "Approve as director",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000007",
+    "edr_freight_app:bookings:approve_ceo",
+    "Approve as CEO",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000008",
+    "edr_freight_app:bookings:reject_approval",
+    "Reject at approval step",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000009",
+    "edr_freight_app:bookings:generate_contract",
+    "Generate contract",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-00000000000a",
+    "edr_freight_app:bookings:sign_staff",
+    "Staff contract signature",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-00000000000d",
+    "edr_freight_app:bookings:operations",
+    "Booking operations",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-00000000000e",
+    "edr_freight_app:bookings:cancel",
+    "Cancel booking",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000023",
+    "edr_freight_app:bookings:clearance_view",
+    "View customs-clearance queue",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000020",
+    "edr_freight_app:bookings:review_documents",
+    "Review clearance documents",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000021",
+    "edr_freight_app:bookings:upload_clearance_output",
+    "Upload customs output documents",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000022",
+    "edr_freight_app:bookings:finalize_clearance",
+    "Finalize document clearance",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-00000000000f",
+    "edr_freight_app:train_scheduling:view",
+    "View train scheduling",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000011",
+    "edr_freight_app:fleet:view",
+    "View fleet",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000012",
+    "edr_freight_app:fleet:manage",
+    "Manage fleet",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000013",
+    "edr_freight_app:admin",
+    "Freight administration",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000024",
+    "edr_freight_app:bookings:create",
+    "Create booking",
+  ),
   // Header alarm for the document-review deadline: its own key so only the
   // position types that actually decide operation requests are alerted.
-  perm('a1000001-0001-4000-8000-000000000025', 'edr_freight_app:bookings:doc_review_alert', 'See document-review deadline alarm'),
+  perm(
+    "a1000001-0001-4000-8000-000000000025",
+    "edr_freight_app:bookings:doc_review_alert",
+    "See document-review deadline alarm",
+  ),
+  // Partial wagon cancellation (paid bookings): staff-side keys. The customer
+  // portal needs none — customer actions are ownership-scoped on the API.
+  perm(
+    "a1000001-0001-4000-8000-000000000026",
+    "edr_freight_app:bookings:wagon_cancellation_view",
+    "View wagon cancellation history",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000027",
+    "edr_freight_app:bookings:wagon_cancellation_void",
+    "Void a pending wagon cancellation",
+  ),
+  perm(
+    "a1000001-0001-4000-8000-000000000028",
+    "edr_freight_app:bookings:wagon_cancellation_rebook",
+    "Rebook cancelled wagons for a customer",
+  ),
 ];
 
 /**
@@ -75,38 +184,130 @@ export const BOOKING_PERMISSIONS: FreightPermissionSeed[] = [
  * approval/sign/clearance permissions but scoped to the new contracts module.
  */
 export const CONTRACT_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('a3000001-0001-4000-8000-000000000001', 'edr_freight_app:contracts:view', 'View contracts'),
+  perm(
+    "a3000001-0001-4000-8000-000000000001",
+    "edr_freight_app:contracts:view",
+    "View contracts",
+  ),
   // Intake actions are split per freight type (bulk vs container) — fresh ids
   // because the seeder upserts ON CONFLICT (key); reusing the old ids with new
   // keys would PK-collide with the legacy staff_accept/request_changes/reject rows.
-  perm('a3000001-0001-4000-8000-000000000011', 'edr_freight_app:contracts:staff_accept:bulk', 'Accept bulk contract intake'),
-  perm('a3000001-0001-4000-8000-000000000012', 'edr_freight_app:contracts:staff_accept:container', 'Accept container contract intake'),
-  perm('a3000001-0001-4000-8000-000000000013', 'edr_freight_app:contracts:request_changes:bulk', 'Request bulk contract changes'),
-  perm('a3000001-0001-4000-8000-000000000014', 'edr_freight_app:contracts:request_changes:container', 'Request container contract changes'),
-  perm('a3000001-0001-4000-8000-000000000015', 'edr_freight_app:contracts:reject:bulk', 'Reject bulk contract'),
-  perm('a3000001-0001-4000-8000-000000000016', 'edr_freight_app:contracts:reject:container', 'Reject container contract'),
-  perm('a3000001-0001-4000-8000-000000000005', 'edr_freight_app:contracts:approve_line_staff', 'Approve contract as line staff'),
-  perm('a3000001-0001-4000-8000-000000000006', 'edr_freight_app:contracts:approve_director', 'Approve contract as director'),
-  perm('a3000001-0001-4000-8000-000000000007', 'edr_freight_app:contracts:approve_ceo', 'Approve contract as CEO'),
-  perm('a3000001-0001-4000-8000-000000000008', 'edr_freight_app:contracts:generate_contract', 'Generate contract document'),
+  perm(
+    "a3000001-0001-4000-8000-000000000011",
+    "edr_freight_app:contracts:staff_accept:bulk",
+    "Accept bulk contract intake",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000012",
+    "edr_freight_app:contracts:staff_accept:container",
+    "Accept container contract intake",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000013",
+    "edr_freight_app:contracts:request_changes:bulk",
+    "Request bulk contract changes",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000014",
+    "edr_freight_app:contracts:request_changes:container",
+    "Request container contract changes",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000015",
+    "edr_freight_app:contracts:reject:bulk",
+    "Reject bulk contract",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000016",
+    "edr_freight_app:contracts:reject:container",
+    "Reject container contract",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000005",
+    "edr_freight_app:contracts:approve_line_staff",
+    "Approve contract as line staff",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000006",
+    "edr_freight_app:contracts:approve_director",
+    "Approve contract as director",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000007",
+    "edr_freight_app:contracts:approve_ceo",
+    "Approve contract as CEO",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000008",
+    "edr_freight_app:contracts:generate_contract",
+    "Generate contract document",
+  ),
   // Staff counter-signature is split per freight type too — fresh ids for the
   // same reason as the intake keys above.
-  perm('a3000001-0001-4000-8000-000000000017', 'edr_freight_app:contracts:sign_staff:bulk', 'Staff contract signature: bulk'),
-  perm('a3000001-0001-4000-8000-000000000018', 'edr_freight_app:contracts:sign_staff:container', 'Staff contract signature: container'),
-  perm('a3000001-0001-4000-8000-00000000000a', 'edr_freight_app:contracts:clearance_review', 'Review pre-booking clearance docs'),
-  perm('a3000001-0001-4000-8000-00000000000b', 'edr_freight_app:contracts:finalize_clearance', 'Finalize pre-booking clearance'),
-  perm('a3000001-0001-4000-8000-00000000000c', 'edr_freight_app:contracts:create_booking', 'GL ET create booking under contract'),
-  perm('a3000001-0001-4000-8000-00000000000d', 'edr_freight_app:contracts:ops_clearance_review', 'Operations review of self-clearance docs (Path A)'),
-  perm('a3000001-0001-4000-8000-00000000000e', 'edr_freight_app:contracts:clearance_et_actions', 'GL Ethiopia phased clearance actions'),
-  perm('a3000001-0001-4000-8000-00000000000f', 'edr_freight_app:contracts:clearance_dj_actions', 'GL Djibouti phased clearance actions'),
-  perm('a3000001-0001-4000-8000-000000000010', 'edr_freight_app:contracts:clearance_duty_advise', 'Advise contract duty/tax'),
+  perm(
+    "a3000001-0001-4000-8000-000000000017",
+    "edr_freight_app:contracts:sign_staff:bulk",
+    "Staff contract signature: bulk",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000018",
+    "edr_freight_app:contracts:sign_staff:container",
+    "Staff contract signature: container",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-00000000000a",
+    "edr_freight_app:contracts:clearance_review",
+    "Review pre-booking clearance docs",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-00000000000b",
+    "edr_freight_app:contracts:finalize_clearance",
+    "Finalize pre-booking clearance",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-00000000000c",
+    "edr_freight_app:contracts:create_booking",
+    "GL ET create booking under contract",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-00000000000d",
+    "edr_freight_app:contracts:ops_clearance_review",
+    "Operations review of self-clearance docs (Path A)",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-00000000000e",
+    "edr_freight_app:contracts:clearance_et_actions",
+    "GL Ethiopia phased clearance actions",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-00000000000f",
+    "edr_freight_app:contracts:clearance_dj_actions",
+    "GL Djibouti phased clearance actions",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-000000000010",
+    "edr_freight_app:contracts:clearance_duty_advise",
+    "Advise contract duty/tax",
+  ),
   // Hazardous contracts get two extra approval steps ahead of the normal chain.
   // Each has its own permission so the two desks are genuinely separate people.
-  perm('a3000001-0001-4000-8000-000000000019', 'edr_freight_app:contracts:hazardous_approval_one', 'Hazardous approval — first review'),
-  perm('a3000001-0001-4000-8000-00000000001a', 'edr_freight_app:contracts:hazardous_approval_two', 'Hazardous approval — second review'),
+  perm(
+    "a3000001-0001-4000-8000-000000000019",
+    "edr_freight_app:contracts:hazardous_approval_one",
+    "Hazardous approval — first review",
+  ),
+  perm(
+    "a3000001-0001-4000-8000-00000000001a",
+    "edr_freight_app:contracts:hazardous_approval_two",
+    "Hazardous approval — second review",
+  ),
   // Freeze/unfreeze a signed contract. One key covers both directions — whoever
   // may suspend must be able to lift it again.
-  perm('a3000001-0001-4000-8000-00000000001b', 'edr_freight_app:contracts:suspend', 'Suspend / resume a signed contract'),
+  perm(
+    "a3000001-0001-4000-8000-00000000001b",
+    "edr_freight_app:contracts:suspend",
+    "Suspend / resume a signed contract",
+  ),
 ];
 
 // Historical ids. EdrOrgSeeder no longer sends them — it upserts on `key` and
@@ -116,25 +317,25 @@ export const CONTRACT_PERMISSIONS: FreightPermissionSeed[] = [
 // owned …001b, and reusing it for transit-agents crashed boot with a PK 23505
 // on every environment that still had the retired row.
 const RULE_ENGINE_VIEW_IDS: Record<RuleEngineResourceSlug, string> = {
-  'cargo-types': 'b2000001-0001-4000-8000-000000000001',
-  'container-types': 'b2000001-0001-4000-8000-000000000003',
-  'wagon-types': 'b2000001-0001-4000-8000-000000000015',
-  'truck-types': 'b2000001-0001-4000-8000-00000000001a',
-  'service-types': 'b2000001-0001-4000-8000-000000000005',
-  yards: 'b2000001-0001-4000-8000-000000000007',
-  'shipping-lines': 'b2000001-0001-4000-8000-000000000009',
-  'weight-limit-rules': 'b2000001-0001-4000-8000-00000000000b',
-  'priority-configs': 'b2000001-0001-4000-8000-00000000000f',
-  rates: 'b2000001-0001-4000-8000-000000000011',
-  'approval-rules': 'b2000001-0001-4000-8000-000000000013',
-  'yard-distances': 'b2000001-0001-4000-8000-000000000018',
-  'transit-agents': 'b2000003-0001-4000-8000-000000000001',
+  "cargo-types": "b2000001-0001-4000-8000-000000000001",
+  "container-types": "b2000001-0001-4000-8000-000000000003",
+  "wagon-types": "b2000001-0001-4000-8000-000000000015",
+  "truck-types": "b2000001-0001-4000-8000-00000000001a",
+  "service-types": "b2000001-0001-4000-8000-000000000005",
+  yards: "b2000001-0001-4000-8000-000000000007",
+  "shipping-lines": "b2000001-0001-4000-8000-000000000009",
+  "weight-limit-rules": "b2000001-0001-4000-8000-00000000000b",
+  "priority-configs": "b2000001-0001-4000-8000-00000000000f",
+  rates: "b2000001-0001-4000-8000-000000000011",
+  "approval-rules": "b2000001-0001-4000-8000-000000000013",
+  "yard-distances": "b2000001-0001-4000-8000-000000000018",
+  "transit-agents": "b2000003-0001-4000-8000-000000000001",
 };
 
 // CRUD replaces the retired coarse `:manage`. New ids live in a fresh block
 // (b2000002-…) so a stale `:manage` grant can never silently confer a CRUD
 // action — the migration re-grants create/update/delete explicitly.
-const RULE_ENGINE_CRUD_ACTIONS = ['create', 'update', 'delete'] as const;
+const RULE_ENGINE_CRUD_ACTIONS = ["create", "update", "delete"] as const;
 type RuleEngineCrudAction = (typeof RULE_ENGINE_CRUD_ACTIONS)[number];
 const ruleEngineCrudId = (
   slug: RuleEngineResourceSlug,
@@ -142,9 +343,9 @@ const ruleEngineCrudId = (
 ): string => {
   const n =
     RULE_ENGINE_RESOURCE_SLUGS.indexOf(slug) * 3 +
-    RULE_ENGINE_CRUD_ACTIONS.indexOf(action) +  
+    RULE_ENGINE_CRUD_ACTIONS.indexOf(action) +
     1; // 1..36
-  return `b2000002-0001-4000-8000-${n.toString(16).padStart(12, '0')}`;
+  return `b2000002-0001-4000-8000-${n.toString(16).padStart(12, "0")}`;
 };
 
 /**
@@ -152,34 +353,61 @@ const ruleEngineCrudId = (
  * propose a change; only `approve` lets someone put it into effect. Only listed
  * slugs get the permission.
  */
-const RULE_ENGINE_APPROVE_PERMISSION_IDS: Partial<Record<RuleEngineResourceSlug, string>> = {
-  rates: 'b2000001-0001-4000-8000-000000000017',
+const RULE_ENGINE_APPROVE_PERMISSION_IDS: Partial<
+  Record<RuleEngineResourceSlug, string>
+> = {
+  rates: "b2000001-0001-4000-8000-000000000017",
 };
 
-export type RuleEngineApprovableSlug = 'rates';
+export type RuleEngineApprovableSlug = "rates";
 
-export const RULE_ENGINE_PERMISSIONS: FreightPermissionSeed[] = RULE_ENGINE_RESOURCE_SLUGS.flatMap(
-  (slug) => {
+export const RULE_ENGINE_PERMISSIONS: FreightPermissionSeed[] =
+  RULE_ENGINE_RESOURCE_SLUGS.flatMap((slug) => {
     const resource = slugToResourceKey(slug);
     const approveId = RULE_ENGINE_APPROVE_PERMISSION_IDS[slug];
     return [
-      perm(RULE_ENGINE_VIEW_IDS[slug], `edr_freight_app:rule_engine:${resource}:view`, `View ${slug}`),
-      perm(ruleEngineCrudId(slug, 'create'), `edr_freight_app:rule_engine:${resource}:create`, `Create ${slug}`),
-      perm(ruleEngineCrudId(slug, 'update'), `edr_freight_app:rule_engine:${resource}:update`, `Update ${slug}`),
-      perm(ruleEngineCrudId(slug, 'delete'), `edr_freight_app:rule_engine:${resource}:delete`, `Delete ${slug}`),
+      perm(
+        RULE_ENGINE_VIEW_IDS[slug],
+        `edr_freight_app:rule_engine:${resource}:view`,
+        `View ${slug}`,
+      ),
+      perm(
+        ruleEngineCrudId(slug, "create"),
+        `edr_freight_app:rule_engine:${resource}:create`,
+        `Create ${slug}`,
+      ),
+      perm(
+        ruleEngineCrudId(slug, "update"),
+        `edr_freight_app:rule_engine:${resource}:update`,
+        `Update ${slug}`,
+      ),
+      perm(
+        ruleEngineCrudId(slug, "delete"),
+        `edr_freight_app:rule_engine:${resource}:delete`,
+        `Delete ${slug}`,
+      ),
       ...(approveId
-        ? [perm(approveId, `edr_freight_app:rule_engine:${resource}:approve`, `Approve ${slug} changes`)]
+        ? [
+          perm(
+            approveId,
+            `edr_freight_app:rule_engine:${resource}:approve`,
+            `Approve ${slug} changes`,
+          ),
+        ]
         : []),
     ];
-  },
-);
+  });
 
 /**
  * Container-allocation permission for the previously-unguarded
  * booking allocate-containers endpoint.
  */
 export const GAP_CONTROLLER_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('c1000001-0001-4000-8000-000000000001', 'edr_freight_app:allocation:manage', 'Allocate containers to vehicles'),
+  perm(
+    "c1000001-0001-4000-8000-000000000001",
+    "edr_freight_app:allocation:manage",
+    "Allocate containers to vehicles",
+  ),
 ];
 
 /**
@@ -190,200 +418,1030 @@ export const GAP_CONTROLLER_PERMISSIONS: FreightPermissionSeed[] = [
 
 // C. Customers
 export const CUSTOMER_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('d1a00001-0001-4000-8000-000000000001', 'edr_freight_app:customers:view', 'View customers'),
-  perm('d1a00001-0001-4000-8000-000000000002', 'edr_freight_app:customers:create', 'Create customer'),
-  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'),
+  perm(
+    "d1a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:customers:view",
+    "View customers",
+  ),
+  perm(
+    "d1a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:customers:create",
+    "Create customer",
+  ),
+  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
 export const FINANCE_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('d2a00001-0001-4000-8000-000000000001', 'edr_freight_app:payments:view', 'View payments'),
-  perm('d2a00001-0001-4000-8000-000000000002', 'edr_freight_app:payments:verify', 'Verify/settle payment'),
-  perm('d2a00001-0001-4000-8000-000000000003', 'edr_freight_app:payments:refund', 'Refund payment'),
-  perm('d2b00001-0001-4000-8000-000000000001', 'edr_freight_app:invoices:view', 'View invoices'),
-  perm('d2b00001-0001-4000-8000-000000000002', 'edr_freight_app:invoices:create', 'Generate invoice'),
-  perm('d2b00001-0001-4000-8000-000000000003', 'edr_freight_app:invoices:cancel', 'Cancel invoice'),
-  perm('d2b00001-0001-4000-8000-000000000004', 'edr_freight_app:invoices:export', 'Download invoice document'),
+  perm(
+    "d2a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:payments:view",
+    "View payments",
+  ),
+  perm(
+    "d2b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:invoices:view",
+    "View invoices",
+  ),
+  perm(
+    "d2b00001-0001-4000-8000-000000000004",
+    "edr_freight_app:invoices:export",
+    "Download invoice document",
+  ),
+  // Filing with the tax authority is its own grant: registration is irreversible at MoR, so it
+  // must not ride along with the right to download an invoice PDF.
+  perm(
+    "d2b00001-0001-4000-8000-000000000005",
+    "edr_freight_app:invoices:eims_register",
+    "Register invoice with MoR EIMS",
+  ),
+  // Separate from registering: resolving an unacknowledged submission clears the
+  // system-wide chain block and can record an IRN against an invoice, so it is a
+  // supervisor/admin action rather than an operational one.
+  perm(
+    "d2b00001-0001-4000-8000-000000000006",
+    "edr_freight_app:invoices:eims_resolve",
+    "Resolve a blocked MoR EIMS submission",
+  ),
+  // USD bookings are paid by bank transfer; Finance uploads the slip and settles
+  // the invoice. Moves money state, so it is its own grant, not part of view.
+  perm(
+    "d2b00001-0001-4000-8000-000000000007",
+    "edr_freight_app:invoices:confirm_offline",
+    "Confirm offline (bank transfer) invoice payment",
+  ),
 ];
 
 // E. First / last mile operations
 export const MILE_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('d3a00001-0001-4000-8000-000000000001', 'edr_freight_app:first_mile:view', 'View first-mile'),
-  perm('d3a00001-0001-4000-8000-000000000002', 'edr_freight_app:first_mile:accept', 'Accept first-mile request'),
-  perm('d3a00001-0001-4000-8000-000000000003', 'edr_freight_app:first_mile:create', 'Create first-mile'),
-  perm('d3a00001-0001-4000-8000-000000000004', 'edr_freight_app:first_mile:update', 'Update first-mile'),
-  perm('d3a00001-0001-4000-8000-000000000005', 'edr_freight_app:first_mile:delete', 'Delete first-mile'),
-  perm('d3a00001-0001-4000-8000-000000000006', 'edr_freight_app:first_mile:assign_vehicles', 'Assign first-mile vehicles'),
-  perm('d3a00001-0001-4000-8000-000000000007', 'edr_freight_app:first_mile:set_distances', 'Set first-mile distances'),
-  perm('d3a00001-0001-4000-8000-000000000008', 'edr_freight_app:first_mile:generate_invoice', 'Generate first-mile invoice'),
-  perm('d3b00001-0001-4000-8000-000000000001', 'edr_freight_app:last_mile:view', 'View last-mile'),
-  perm('d3b00001-0001-4000-8000-000000000002', 'edr_freight_app:last_mile:accept', 'Accept last-mile request'),
-  perm('d3b00001-0001-4000-8000-000000000003', 'edr_freight_app:last_mile:create', 'Create last-mile'),
-  perm('d3b00001-0001-4000-8000-000000000004', 'edr_freight_app:last_mile:update', 'Update last-mile'),
-  perm('d3b00001-0001-4000-8000-000000000005', 'edr_freight_app:last_mile:delete', 'Delete last-mile'),
-  perm('d3b00001-0001-4000-8000-000000000006', 'edr_freight_app:last_mile:assign_vehicles', 'Assign last-mile vehicles'),
-  perm('d3b00001-0001-4000-8000-000000000007', 'edr_freight_app:last_mile:set_distances', 'Set last-mile distances'),
-  perm('d3b00001-0001-4000-8000-000000000008', 'edr_freight_app:last_mile:generate_invoice', 'Generate last-mile invoice'),
-  perm('d3b00001-0001-4000-8000-000000000009', 'edr_freight_app:last_mile:request_view', 'View last-mile confirmation requests'),
-  perm('d3b00001-0001-4000-8000-00000000000a', 'edr_freight_app:last_mile:request_review', 'Review last-mile confirmation requests (T&M dept)'),
-  perm('d3b00001-0001-4000-8000-00000000000b', 'edr_freight_app:last_mile:request_approve', 'Approve/reject last-mile confirmation requests'),
+  perm(
+    "d3a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:first_mile:view",
+    "View first-mile",
+  ),
+  perm(
+    "d3a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:first_mile:accept",
+    "Accept first-mile request",
+  ),
+  perm(
+    "d3a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:first_mile:create",
+    "Create first-mile",
+  ),
+  perm(
+    "d3a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:first_mile:update",
+    "Update first-mile",
+  ),
+  perm(
+    "d3a00001-0001-4000-8000-000000000005",
+    "edr_freight_app:first_mile:delete",
+    "Delete first-mile",
+  ),
+  perm(
+    "d3a00001-0001-4000-8000-000000000006",
+    "edr_freight_app:first_mile:assign_vehicles",
+    "Assign first-mile vehicles",
+  ),
+  perm(
+    "d3a00001-0001-4000-8000-000000000007",
+    "edr_freight_app:first_mile:set_distances",
+    "Set first-mile distances",
+  ),
+  perm(
+    "d3a00001-0001-4000-8000-000000000008",
+    "edr_freight_app:first_mile:generate_invoice",
+    "Generate first-mile invoice",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:last_mile:view",
+    "View last-mile",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:last_mile:accept",
+    "Accept last-mile request",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000003",
+    "edr_freight_app:last_mile:create",
+    "Create last-mile",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000004",
+    "edr_freight_app:last_mile:update",
+    "Update last-mile",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000005",
+    "edr_freight_app:last_mile:delete",
+    "Delete last-mile",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000006",
+    "edr_freight_app:last_mile:assign_vehicles",
+    "Assign last-mile vehicles",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000007",
+    "edr_freight_app:last_mile:set_distances",
+    "Set last-mile distances",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000008",
+    "edr_freight_app:last_mile:generate_invoice",
+    "Generate last-mile invoice",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-000000000009",
+    "edr_freight_app:last_mile:request_view",
+    "View last-mile confirmation requests",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-00000000000a",
+    "edr_freight_app:last_mile:request_review",
+    "Review last-mile confirmation requests (T&M dept)",
+  ),
+  perm(
+    "d3b00001-0001-4000-8000-00000000000b",
+    "edr_freight_app:last_mile:request_approve",
+    "Approve/reject last-mile confirmation requests",
+  ),
 ];
 
 // F. Fleet — rail assets (splits the flat fleet:view/manage)
 export const FLEET_RAIL_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('e1a00001-0001-4000-8000-000000000001', 'edr_freight_app:locomotives:view', 'View locomotives'),
-  perm('e1a00001-0001-4000-8000-000000000002', 'edr_freight_app:locomotives:create', 'Create locomotive'),
-  perm('e1a00001-0001-4000-8000-000000000003', 'edr_freight_app:locomotives:update', 'Update locomotive'),
-  perm('e1a00001-0001-4000-8000-000000000004', 'edr_freight_app:locomotives:delete', 'Delete locomotive'),
-  perm('e1a00001-0001-4000-8000-000000000005', 'edr_freight_app:locomotives:hard_delete', 'Permanently delete locomotive'),
-  perm('e1b00001-0001-4000-8000-000000000001', 'edr_freight_app:wagons:view', 'View wagons'),
-  perm('e1b00001-0001-4000-8000-000000000002', 'edr_freight_app:wagons:create', 'Create wagon'),
-  perm('e1b00001-0001-4000-8000-000000000003', 'edr_freight_app:wagons:update', 'Update wagon'),
-  perm('e1b00001-0001-4000-8000-000000000004', 'edr_freight_app:wagons:delete', 'Delete wagon'),
-  perm('e1b00001-0001-4000-8000-000000000005', 'edr_freight_app:wagons:transfer_request', 'Request wagon transfer'),
-  perm('e1b00001-0001-4000-8000-000000000006', 'edr_freight_app:wagons:transfer_fulfill', 'Fulfil wagon transfer (OCC)'),
-  perm('e1b00001-0001-4000-8000-000000000007', 'edr_freight_app:wagons:transfer_history_all', "View all staff's transfer history"),
+  perm(
+    "e1a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:locomotives:view",
+    "View locomotives",
+  ),
+  perm(
+    "e1a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:locomotives:create",
+    "Create locomotive",
+  ),
+  perm(
+    "e1a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:locomotives:update",
+    "Update locomotive",
+  ),
+  perm(
+    "e1a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:locomotives:delete",
+    "Delete locomotive",
+  ),
+  perm(
+    "e1a00001-0001-4000-8000-000000000005",
+    "edr_freight_app:locomotives:hard_delete",
+    "Permanently delete locomotive",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:wagons:view",
+    "View wagons",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:wagons:create",
+    "Create wagon",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000003",
+    "edr_freight_app:wagons:update",
+    "Update wagon",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000004",
+    "edr_freight_app:wagons:delete",
+    "Delete wagon",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000005",
+    "edr_freight_app:wagons:transfer_request",
+    "Request wagon transfer",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000006",
+    "edr_freight_app:wagons:transfer_fulfill",
+    "Fulfil wagon transfer (OCC)",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000007",
+    "edr_freight_app:wagons:transfer_history_all",
+    "View all staff's transfer history",
+  ),
   // The transfer desk is its own screen, so it carries its own per-action keys —
   // seeing the queue, withdrawing a request and short-closing one are separate
   // grants from filing or fulfilling.
-  perm('e1b00001-0001-4000-8000-000000000008', 'edr_freight_app:wagons:transfer_view', 'View wagon transfer requests'),
-  perm('e1b00001-0001-4000-8000-000000000009', 'edr_freight_app:wagons:transfer_cancel', 'Withdraw a wagon transfer request'),
-  perm('e1b00001-0001-4000-8000-00000000000a', 'edr_freight_app:wagons:transfer_close_short', 'Close a transfer request short of the requested count'),
-  perm('e1b00001-0001-4000-8000-00000000000b', 'edr_freight_app:wagons:hard_delete', 'Permanently delete wagon'),
-  perm('e1c00001-0001-4000-8000-000000000001', 'edr_freight_app:trains:view', 'View trains'),
-  perm('e1c00001-0001-4000-8000-000000000002', 'edr_freight_app:trains:create', 'Create train'),
-  perm('e1c00001-0001-4000-8000-000000000003', 'edr_freight_app:trains:update', 'Update train'),
-  perm('e1c00001-0001-4000-8000-000000000004', 'edr_freight_app:trains:delete', 'Delete train'),
-  perm('e1c00001-0001-4000-8000-000000000005', 'edr_freight_app:trains:assign_wagons', 'Assign wagons to train'),
-  perm('e1d00001-0001-4000-8000-000000000001', 'edr_freight_app:routes:view', 'View routes'),
-  perm('e1d00001-0001-4000-8000-000000000002', 'edr_freight_app:routes:create', 'Create route'),
-  perm('e1d00001-0001-4000-8000-000000000003', 'edr_freight_app:routes:update', 'Update route'),
-  perm('e1d00001-0001-4000-8000-000000000004', 'edr_freight_app:routes:delete', 'Delete route'),
-  perm('e1d00001-0001-4000-8000-000000000005', 'edr_freight_app:routes:hard_delete', 'Permanently delete route'),
-  perm('e1e00001-0001-4000-8000-000000000001', 'edr_freight_app:containers:view', 'View containers'),
-  perm('e1e00001-0001-4000-8000-000000000002', 'edr_freight_app:containers:create', 'Create container'),
-  perm('e1e00001-0001-4000-8000-000000000003', 'edr_freight_app:containers:update', 'Update container'),
-  perm('e1e00001-0001-4000-8000-000000000004', 'edr_freight_app:containers:delete', 'Delete container'),
-  perm('e1f00001-0001-4000-8000-000000000001', 'edr_freight_app:cargoes:view', 'View cargoes'),
-  perm('e1f00001-0001-4000-8000-000000000002', 'edr_freight_app:cargoes:create', 'Create cargo'),
-  perm('e1f00001-0001-4000-8000-000000000003', 'edr_freight_app:cargoes:update', 'Update cargo'),
-  perm('e1f00001-0001-4000-8000-000000000004', 'edr_freight_app:cargoes:delete', 'Delete cargo'),
+  perm(
+    "e1b00001-0001-4000-8000-000000000008",
+    "edr_freight_app:wagons:transfer_view",
+    "View wagon transfer requests",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-000000000009",
+    "edr_freight_app:wagons:transfer_cancel",
+    "Withdraw a wagon transfer request",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-00000000000a",
+    "edr_freight_app:wagons:transfer_close_short",
+    "Close a transfer request short of the requested count",
+  ),
+  perm(
+    "e1b00001-0001-4000-8000-00000000000b",
+    "edr_freight_app:wagons:hard_delete",
+    "Permanently delete wagon",
+  ),
+  // Maintenance ⇄ availability flip on the wagons desk — its own key so
+  // operations/OCC can flip readiness without holding full wagon edit.
+  perm(
+    "e1b00001-0001-4000-8000-00000000000c",
+    "edr_freight_app:wagons:status_toggle",
+    "Flip wagon between maintenance and available",
+  ),
+  perm(
+    "e1c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:trains:view",
+    "View trains",
+  ),
+  perm(
+    "e1c00001-0001-4000-8000-000000000002",
+    "edr_freight_app:trains:create",
+    "Create train",
+  ),
+  perm(
+    "e1c00001-0001-4000-8000-000000000003",
+    "edr_freight_app:trains:update",
+    "Update train",
+  ),
+  perm(
+    "e1c00001-0001-4000-8000-000000000004",
+    "edr_freight_app:trains:delete",
+    "Delete train",
+  ),
+  perm(
+    "e1c00001-0001-4000-8000-000000000005",
+    "edr_freight_app:trains:assign_wagons",
+    "Assign wagons to train",
+  ),
+  perm(
+    "e1d00001-0001-4000-8000-000000000001",
+    "edr_freight_app:routes:view",
+    "View routes",
+  ),
+  perm(
+    "e1d00001-0001-4000-8000-000000000002",
+    "edr_freight_app:routes:create",
+    "Create route",
+  ),
+  perm(
+    "e1d00001-0001-4000-8000-000000000003",
+    "edr_freight_app:routes:update",
+    "Update route",
+  ),
+  perm(
+    "e1d00001-0001-4000-8000-000000000004",
+    "edr_freight_app:routes:delete",
+    "Delete route",
+  ),
+  perm(
+    "e1d00001-0001-4000-8000-000000000005",
+    "edr_freight_app:routes:hard_delete",
+    "Permanently delete route",
+  ),
+  perm(
+    "e1e00001-0001-4000-8000-000000000001",
+    "edr_freight_app:containers:view",
+    "View containers",
+  ),
+  perm(
+    "e1e00001-0001-4000-8000-000000000002",
+    "edr_freight_app:containers:create",
+    "Create container",
+  ),
+  perm(
+    "e1e00001-0001-4000-8000-000000000003",
+    "edr_freight_app:containers:update",
+    "Update container",
+  ),
+  perm(
+    "e1e00001-0001-4000-8000-000000000004",
+    "edr_freight_app:containers:delete",
+    "Delete container",
+  ),
+  perm(
+    "e1f00001-0001-4000-8000-000000000001",
+    "edr_freight_app:cargoes:view",
+    "View cargoes",
+  ),
+  perm(
+    "e1f00001-0001-4000-8000-000000000002",
+    "edr_freight_app:cargoes:create",
+    "Create cargo",
+  ),
+  perm(
+    "e1f00001-0001-4000-8000-000000000003",
+    "edr_freight_app:cargoes:update",
+    "Update cargo",
+  ),
+  perm(
+    "e1f00001-0001-4000-8000-000000000004",
+    "edr_freight_app:cargoes:delete",
+    "Delete cargo",
+  ),
   // NB: id prefixes must stay hex — 'e1g…' once crashed the boot seeder
   // (postgres: invalid input syntax for type uuid).
-  perm('e1900001-0001-4000-8000-000000000001', 'edr_freight_app:consignments:view', 'View consignments'),
-  perm('e1900001-0001-4000-8000-000000000002', 'edr_freight_app:consignments:create', 'Create consignment'),
+  perm(
+    "e1900001-0001-4000-8000-000000000001",
+    "edr_freight_app:consignments:view",
+    "View consignments",
+  ),
+  perm(
+    "e1900001-0001-4000-8000-000000000002",
+    "edr_freight_app:consignments:create",
+    "Create consignment",
+  ),
 ];
 
 // G. Fleet — road & telemetry
 export const FLEET_ROAD_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('e2a00001-0001-4000-8000-000000000001', 'edr_freight_app:vehicles:view', 'View vehicles'),
-  perm('e2a00001-0001-4000-8000-000000000002', 'edr_freight_app:vehicles:create', 'Create vehicle'),
-  perm('e2a00001-0001-4000-8000-000000000003', 'edr_freight_app:vehicles:update', 'Update vehicle'),
-  perm('e2a00001-0001-4000-8000-000000000004', 'edr_freight_app:vehicles:delete', 'Delete vehicle'),
-  perm('e2b00001-0001-4000-8000-000000000001', 'edr_freight_app:drivers:view', 'View drivers'),
-  perm('e2b00001-0001-4000-8000-000000000002', 'edr_freight_app:drivers:create', 'Create driver'),
-  perm('e2b00001-0001-4000-8000-000000000003', 'edr_freight_app:drivers:update', 'Update driver'),
-  perm('e2b00001-0001-4000-8000-000000000004', 'edr_freight_app:drivers:delete', 'Delete driver'),
-  perm('e2c00001-0001-4000-8000-000000000001', 'edr_freight_app:tracking:view', 'Track vehicles'),
-  perm('e2c00001-0001-4000-8000-000000000002', 'edr_freight_app:tracking:manage', 'Manage GPS trackers'),
-  perm('e2d00001-0001-4000-8000-000000000001', 'edr_freight_app:fuel:view', 'View fuel purchases'),
-  perm('e2d00001-0001-4000-8000-000000000002', 'edr_freight_app:fuel:create', 'Create fuel purchase'),
-  perm('e2d00001-0001-4000-8000-000000000003', 'edr_freight_app:fuel:update', 'Update fuel purchase'),
-  perm('e2d00001-0001-4000-8000-000000000004', 'edr_freight_app:fuel:delete', 'Delete fuel purchase'),
-  perm('e2d00001-0001-4000-8000-000000000005', 'edr_freight_app:fuel:approve', 'Approve fuel purchase'),
-  perm('e2e00001-0001-4000-8000-000000000001', 'edr_freight_app:maintenance:view', 'View maintenance'),
-  perm('e2e00001-0001-4000-8000-000000000002', 'edr_freight_app:maintenance:create', 'Create maintenance'),
-  perm('e2e00001-0001-4000-8000-000000000003', 'edr_freight_app:maintenance:update', 'Update maintenance'),
-  perm('e2e00001-0001-4000-8000-000000000004', 'edr_freight_app:maintenance:delete', 'Delete maintenance'),
-  perm('e2e00001-0001-4000-8000-000000000005', 'edr_freight_app:maintenance:complete', 'Complete maintenance'),
-  perm('e2f00001-0001-4000-8000-000000000001', 'edr_freight_app:fleet_reports:view', 'View fleet financial reports'),
-  perm('e2f00001-0001-4000-8000-000000000002', 'edr_freight_app:fleet_reports:export', 'Export fleet financial reports'),
-  perm('e2000001-0001-4000-8000-000000000001', 'edr_freight_app:fleet_dashboard:view', 'View fleet dashboard'),
+  perm(
+    "e2a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:vehicles:view",
+    "View vehicles",
+  ),
+  perm(
+    "e2a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:vehicles:create",
+    "Create vehicle",
+  ),
+  perm(
+    "e2a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:vehicles:update",
+    "Update vehicle",
+  ),
+  perm(
+    "e2a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:vehicles:delete",
+    "Delete vehicle",
+  ),
+  perm(
+    "e2b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:drivers:view",
+    "View drivers",
+  ),
+  perm(
+    "e2b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:drivers:create",
+    "Create driver",
+  ),
+  perm(
+    "e2b00001-0001-4000-8000-000000000003",
+    "edr_freight_app:drivers:update",
+    "Update driver",
+  ),
+  perm(
+    "e2b00001-0001-4000-8000-000000000004",
+    "edr_freight_app:drivers:delete",
+    "Delete driver",
+  ),
+  perm(
+    "e2c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:tracking:view",
+    "Track vehicles",
+  ),
+  perm(
+    "e2c00001-0001-4000-8000-000000000002",
+    "edr_freight_app:tracking:manage",
+    "Manage GPS trackers",
+  ),
+  perm(
+    "e2d00001-0001-4000-8000-000000000001",
+    "edr_freight_app:fuel:view",
+    "View fuel purchases",
+  ),
+  perm(
+    "e2d00001-0001-4000-8000-000000000002",
+    "edr_freight_app:fuel:create",
+    "Create fuel purchase",
+  ),
+  perm(
+    "e2d00001-0001-4000-8000-000000000003",
+    "edr_freight_app:fuel:update",
+    "Update fuel purchase",
+  ),
+  perm(
+    "e2d00001-0001-4000-8000-000000000004",
+    "edr_freight_app:fuel:delete",
+    "Delete fuel purchase",
+  ),
+  perm(
+    "e2e00001-0001-4000-8000-000000000001",
+    "edr_freight_app:maintenance:view",
+    "View maintenance",
+  ),
+  perm(
+    "e2e00001-0001-4000-8000-000000000002",
+    "edr_freight_app:maintenance:create",
+    "Create maintenance",
+  ),
+  perm(
+    "e2e00001-0001-4000-8000-000000000003",
+    "edr_freight_app:maintenance:update",
+    "Update maintenance",
+  ),
+  perm(
+    "e2e00001-0001-4000-8000-000000000004",
+    "edr_freight_app:maintenance:delete",
+    "Delete maintenance",
+  ),
+  perm(
+    "e2f00001-0001-4000-8000-000000000001",
+    "edr_freight_app:fleet_reports:view",
+    "View fleet financial reports",
+  ),
+  perm(
+    "e2f00001-0001-4000-8000-000000000002",
+    "edr_freight_app:fleet_reports:export",
+    "Export fleet financial reports",
+  ),
+  perm(
+    "e2000001-0001-4000-8000-000000000001",
+    "edr_freight_app:fleet_dashboard:view",
+    "View fleet dashboard",
+  ),
 ];
 
 // H. Warehouse management
 export const WAREHOUSE_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('f1000001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_dashboard:view', 'View warehouse dashboard'),
-  perm('f1a00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouses:view', 'View warehouses'),
-  perm('f1a00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouses:create', 'Create warehouse'),
-  perm('f1a00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouses:update', 'Update warehouse'),
-  perm('f1a00001-0001-4000-8000-000000000004', 'edr_freight_app:warehouses:delete', 'Delete warehouse'),
-  perm('f1b00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_yards:view', 'View warehouse yards'),
-  perm('f1b00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouse_yards:create', 'Create warehouse yard'),
-  perm('f1b00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouse_yards:update', 'Update warehouse yard'),
-  perm('f1b00001-0001-4000-8000-000000000004', 'edr_freight_app:warehouse_yards:delete', 'Delete warehouse yard'),
-  perm('f1c00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_zones:view', 'View warehouse zones'),
-  perm('f1c00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouse_zones:create', 'Create warehouse zone'),
-  perm('f1c00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouse_zones:update', 'Update warehouse zone'),
-  perm('f1d00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_allocation_rules:view', 'View allocation rules'),
-  perm('f1d00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouse_allocation_rules:create', 'Create allocation rule'),
-  perm('f1d00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouse_allocation_rules:update', 'Update allocation rule'),
-  perm('f1d00001-0001-4000-8000-000000000004', 'edr_freight_app:warehouse_allocation_rules:delete', 'Delete allocation rule'),
-  perm('f1e00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_fee_rules:view', 'View fee rules'),
-  perm('f1e00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouse_fee_rules:create', 'Create fee rule'),
-  perm('f1e00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouse_fee_rules:update', 'Update fee rule'),
-  perm('f1e00001-0001-4000-8000-000000000004', 'edr_freight_app:warehouse_fee_rules:delete', 'Delete fee rule'),
-  perm('f1f00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_inspection_reports:view', 'View inspection reports'),
-  perm('f1f00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouse_inspection_reports:create', 'Create inspection report'),
-  perm('f1f00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouse_inspection_reports:update', 'Update inspection report'),
+  perm(
+    "f1000001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_dashboard:view",
+    "View warehouse dashboard",
+  ),
+  perm(
+    "f1a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouses:view",
+    "View warehouses",
+  ),
+  perm(
+    "f1a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouses:create",
+    "Create warehouse",
+  ),
+  perm(
+    "f1a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouses:update",
+    "Update warehouse",
+  ),
+  perm(
+    "f1a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:warehouses:delete",
+    "Delete warehouse",
+  ),
+  perm(
+    "f1b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_yards:view",
+    "View warehouse yards",
+  ),
+  perm(
+    "f1b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouse_yards:create",
+    "Create warehouse yard",
+  ),
+  perm(
+    "f1b00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouse_yards:update",
+    "Update warehouse yard",
+  ),
+  perm(
+    "f1b00001-0001-4000-8000-000000000004",
+    "edr_freight_app:warehouse_yards:delete",
+    "Delete warehouse yard",
+  ),
+  perm(
+    "f1c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_zones:view",
+    "View warehouse zones",
+  ),
+  perm(
+    "f1c00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouse_zones:create",
+    "Create warehouse zone",
+  ),
+  perm(
+    "f1c00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouse_zones:update",
+    "Update warehouse zone",
+  ),
+  perm(
+    "f1d00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_allocation_rules:view",
+    "View allocation rules",
+  ),
+  perm(
+    "f1d00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouse_allocation_rules:create",
+    "Create allocation rule",
+  ),
+  perm(
+    "f1d00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouse_allocation_rules:update",
+    "Update allocation rule",
+  ),
+  perm(
+    "f1d00001-0001-4000-8000-000000000004",
+    "edr_freight_app:warehouse_allocation_rules:delete",
+    "Delete allocation rule",
+  ),
+  perm(
+    "f1e00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_fee_rules:view",
+    "View fee rules",
+  ),
+  perm(
+    "f1e00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouse_fee_rules:create",
+    "Create fee rule",
+  ),
+  perm(
+    "f1e00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouse_fee_rules:update",
+    "Update fee rule",
+  ),
+  perm(
+    "f1e00001-0001-4000-8000-000000000004",
+    "edr_freight_app:warehouse_fee_rules:delete",
+    "Delete fee rule",
+  ),
+  perm(
+    "f1f00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_inspection_reports:view",
+    "View inspection reports",
+  ),
+  perm(
+    "f1f00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouse_inspection_reports:create",
+    "Create inspection report",
+  ),
+  perm(
+    "f1f00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouse_inspection_reports:update",
+    "Update inspection report",
+  ),
 ];
 
 // I. Port & terminal — inventory movement + interchange + fee invoices
 export const PORT_TERMINAL_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('f2a00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_inventory:view', 'View terminal inventory'),
-  perm('f2a00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouse_inventory:receive', 'Receive inventory'),
-  perm('f2a00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouse_inventory:move', 'Move/store/reserve inventory'),
-  perm('f2a00001-0001-4000-8000-000000000004', 'edr_freight_app:warehouse_inventory:load', 'Load inventory'),
-  perm('f2a00001-0001-4000-8000-000000000005', 'edr_freight_app:warehouse_inventory:unload', 'Unload inventory'),
-  perm('f2a00001-0001-4000-8000-000000000006', 'edr_freight_app:warehouse_inventory:dispatch', 'Dispatch inventory'),
-  perm('f2a00001-0001-4000-8000-000000000007', 'edr_freight_app:warehouse_inventory:gate_pass', 'Gate-clearance inventory'),
-  perm('f2a00001-0001-4000-8000-000000000008', 'edr_freight_app:warehouse_inventory:release', 'Release inventory'),
-  perm('f2a00001-0001-4000-8000-000000000009', 'edr_freight_app:warehouse_inventory:deliver', 'Deliver inventory'),
-  perm('f2a00001-0001-4000-8000-00000000000a', 'edr_freight_app:warehouse_inventory:inspect', 'Inspect inventory'),
-  perm('f2b00001-0001-4000-8000-000000000001', 'edr_freight_app:interchange_documents:view', 'View interchange documents'),
-  perm('f2b00001-0001-4000-8000-000000000002', 'edr_freight_app:interchange_documents:generate', 'Generate interchange document'),
-  perm('f2b00001-0001-4000-8000-000000000003', 'edr_freight_app:interchange_documents:acknowledge', 'Acknowledge interchange document'),
-  perm('f2b00001-0001-4000-8000-000000000004', 'edr_freight_app:interchange_documents:dispute', 'Dispute interchange document'),
-  perm('f2b00001-0001-4000-8000-000000000005', 'edr_freight_app:interchange_documents:cancel', 'Cancel interchange document'),
-  perm('f2c00001-0001-4000-8000-000000000001', 'edr_freight_app:warehouse_fee_invoices:view', 'View warehouse fee invoices'),
-  perm('f2c00001-0001-4000-8000-000000000002', 'edr_freight_app:warehouse_fee_invoices:generate', 'Generate warehouse fee invoice'),
-  perm('f2c00001-0001-4000-8000-000000000003', 'edr_freight_app:warehouse_fee_invoices:cancel', 'Cancel warehouse fee invoice'),
-  perm('f2c00001-0001-4000-8000-000000000004', 'edr_freight_app:warehouse_fee_invoices:pay', 'Pay warehouse fee invoice'),
+  perm(
+    "f2a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_inventory:view",
+    "View terminal inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouse_inventory:receive",
+    "Receive inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouse_inventory:move",
+    "Move/store/reserve inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:warehouse_inventory:load",
+    "Load inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000005",
+    "edr_freight_app:warehouse_inventory:unload",
+    "Unload inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000006",
+    "edr_freight_app:warehouse_inventory:dispatch",
+    "Dispatch inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000007",
+    "edr_freight_app:warehouse_inventory:gate_pass",
+    "Gate-clearance inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000008",
+    "edr_freight_app:warehouse_inventory:release",
+    "Release inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-000000000009",
+    "edr_freight_app:warehouse_inventory:deliver",
+    "Deliver inventory",
+  ),
+  perm(
+    "f2a00001-0001-4000-8000-00000000000a",
+    "edr_freight_app:warehouse_inventory:inspect",
+    "Inspect inventory",
+  ),
+  perm(
+    "f2b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:interchange_documents:view",
+    "View interchange documents",
+  ),
+  perm(
+    "f2b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:interchange_documents:generate",
+    "Generate interchange document",
+  ),
+  perm(
+    "f2b00001-0001-4000-8000-000000000003",
+    "edr_freight_app:interchange_documents:acknowledge",
+    "Acknowledge interchange document",
+  ),
+  perm(
+    "f2b00001-0001-4000-8000-000000000004",
+    "edr_freight_app:interchange_documents:dispute",
+    "Dispute interchange document",
+  ),
+  perm(
+    "f2b00001-0001-4000-8000-000000000005",
+    "edr_freight_app:interchange_documents:cancel",
+    "Cancel interchange document",
+  ),
+  perm(
+    "f2c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:warehouse_fee_invoices:view",
+    "View warehouse fee invoices",
+  ),
+  perm(
+    "f2c00001-0001-4000-8000-000000000002",
+    "edr_freight_app:warehouse_fee_invoices:generate",
+    "Generate warehouse fee invoice",
+  ),
+  perm(
+    "f2c00001-0001-4000-8000-000000000003",
+    "edr_freight_app:warehouse_fee_invoices:cancel",
+    "Cancel warehouse fee invoice",
+  ),
+  perm(
+    "f2c00001-0001-4000-8000-000000000004",
+    "edr_freight_app:warehouse_fee_invoices:pay",
+    "Pay warehouse fee invoice",
+  ),
 ];
 
 // E'. Train-scheduling finer actions (augment existing view/manage)
 export const SCHEDULING_EXTRA_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('a2a00001-0001-4000-8000-000000000001', 'edr_freight_app:train_scheduling:create', 'Create train schedule'),
-  perm('a2a00001-0001-4000-8000-000000000002', 'edr_freight_app:train_scheduling:update', 'Update train schedule'),
-  perm('a2a00001-0001-4000-8000-000000000003', 'edr_freight_app:train_scheduling:cancel', 'Cancel train schedule'),
-  perm('a2a00001-0001-4000-8000-000000000004', 'edr_freight_app:train_scheduling:reschedule', 'Reschedule train'),
-  perm('a2a00001-0001-4000-8000-000000000005', 'edr_freight_app:train_scheduling:rules_manage', 'Manage global scheduling rules'),
+  perm(
+    "a2a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:train_scheduling:create",
+    "Create train schedule",
+  ),
+  perm(
+    "a2a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:train_scheduling:update",
+    "Update train schedule",
+  ),
+  perm(
+    "a2a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:train_scheduling:cancel",
+    "Cancel train schedule",
+  ),
+  perm(
+    "a2a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:train_scheduling:reschedule",
+    "Reschedule train",
+  ),
+  perm(
+    "a2a00001-0001-4000-8000-000000000005",
+    "edr_freight_app:train_scheduling:rules_manage",
+    "Manage global scheduling rules",
+  ),
 ];
 
 // L. Administration & settings (split from the coarse admin umbrella)
 export const CONFIG_SETTINGS_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('b4a00001-0001-4000-8000-000000000001', 'edr_freight_app:settings:file_upload:view', 'View file-upload settings'),
-  perm('b4a00001-0001-4000-8000-000000000002', 'edr_freight_app:settings:file_upload:manage', 'Manage file-upload settings'),
-  perm('b4b00001-0001-4000-8000-000000000001', 'edr_freight_app:settings:dropdown:view', 'View dropdown settings'),
-  perm('b4b00001-0001-4000-8000-000000000002', 'edr_freight_app:settings:dropdown:manage', 'Manage dropdown settings'),
-  perm('b4c00001-0001-4000-8000-000000000001', 'edr_freight_app:audit:view', 'View audit logs'),
+  perm(
+    "b4a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:settings:file_upload:view",
+    "View file-upload settings",
+  ),
+  perm(
+    "b4a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:settings:file_upload:manage",
+    "Manage file-upload settings",
+  ),
+  perm(
+    "b4b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:settings:dropdown:view",
+    "View dropdown settings",
+  ),
+  perm(
+    "b4b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:settings:dropdown:manage",
+    "Manage dropdown settings",
+  ),
+  perm(
+    "b4c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:audit:view",
+    "View audit logs",
+  ),
 ];
 
 // M. Staff / IAM admin — NEW keys only. The employee_registration / role_assignment
 // / hierarchy_* / position_types:view keys are seeded separately in edr-freight.seed.ts.
 export const STAFF_IAM_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('c2a00001-0001-4000-8000-000000000001', 'edr_freight_app:staff:roles:view', 'View roles'),
-  perm('c2a00001-0001-4000-8000-000000000002', 'edr_freight_app:staff:roles:create', 'Create role'),
-  perm('c2a00001-0001-4000-8000-000000000003', 'edr_freight_app:staff:roles:update', 'Update role'),
-  perm('c2a00001-0001-4000-8000-000000000004', 'edr_freight_app:staff:roles:delete', 'Delete role'),
-  perm('c2b00001-0001-4000-8000-000000000001', 'edr_freight_app:staff:permissions:view', 'View permission assignments'),
-  perm('c2b00001-0001-4000-8000-000000000002', 'edr_freight_app:staff:permissions:assign', 'Assign permissions'),
-  perm('c2c00001-0001-4000-8000-000000000001', 'edr_freight_app:position_types:create', 'Create position type'),
-  perm('c2c00001-0001-4000-8000-000000000002', 'edr_freight_app:position_types:update', 'Update position type'),
-  perm('c2c00001-0001-4000-8000-000000000003', 'edr_freight_app:position_types:delete', 'Delete position type'),
+  perm(
+    "c2a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:staff:roles:view",
+    "View roles",
+  ),
+  perm(
+    "c2a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:staff:roles:create",
+    "Create role",
+  ),
+  perm(
+    "c2a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:staff:roles:update",
+    "Update role",
+  ),
+  perm(
+    "c2a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:staff:roles:delete",
+    "Delete role",
+  ),
+  perm(
+    "c2b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:staff:permissions:view",
+    "View permission assignments",
+  ),
+  perm(
+    "c2b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:staff:permissions:assign",
+    "Assign permissions",
+  ),
+  perm(
+    "c2c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:position_types:create",
+    "Create position type",
+  ),
+  perm(
+    "c2c00001-0001-4000-8000-000000000002",
+    "edr_freight_app:position_types:update",
+    "Update position type",
+  ),
+  perm(
+    "c2c00001-0001-4000-8000-000000000003",
+    "edr_freight_app:position_types:delete",
+    "Delete position type",
+  ),
+];
+
+// O. Granular splits of previously-shared keys: money/irreversible actions that
+// used to ride on a broader permission (staff_accept, train_scheduling:update,
+// the admin umbrella) get their own grant so departments can hold them apart.
+export const GRANULAR_SPLIT_PERMISSIONS: FreightPermissionSeed[] = [
+  perm(
+    "a5a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:bookings:government_expedite",
+    "Expedite a government booking (bypass payment)",
+  ),
+  perm(
+    "a5b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:contracts:edit_document",
+    "Edit contract document articles",
+  ),
+  perm(
+    "a5b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:contracts:final_invoice_raise",
+    "Raise final invoice (GL DJ)",
+  ),
+  perm(
+    "a5b00001-0001-4000-8000-000000000003",
+    "edr_freight_app:contracts:final_invoice_confirm",
+    "Confirm final-invoice payment slip",
+  ),
+  perm(
+    "a5c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:train_scheduling:dispatch",
+    "Finalize / dispatch a train schedule",
+  ),
+  perm(
+    "a5c00001-0001-4000-8000-000000000002",
+    "edr_freight_app:train_scheduling:mark_paid",
+    "Mark a reserved booking paid (staff)",
+  ),
+  perm(
+    "a5c00001-0001-4000-8000-000000000003",
+    "edr_freight_app:train_scheduling:expire_booking",
+    "Expire a reserved booking",
+  ),
+  perm(
+    "b4d00001-0001-4000-8000-000000000001",
+    "edr_freight_app:settings:exchange_rate:view",
+    "View exchange-rate settings",
+  ),
+  perm(
+    "b4d00001-0001-4000-8000-000000000002",
+    "edr_freight_app:settings:exchange_rate:manage",
+    "Set the USD-ETB fallback rate",
+  ),
+  perm(
+    "b4e00001-0001-4000-8000-000000000001",
+    "edr_freight_app:settings:contract_templates:view",
+    "View contract templates",
+  ),
+  perm(
+    "b4e00001-0001-4000-8000-000000000002",
+    "edr_freight_app:settings:contract_templates:manage",
+    "Edit contract templates & articles",
+  ),
+  // Granular split of contract-template access. `view` opens the sidebar page;
+  // `read` is API-read-only for other pages that display template data.
+  perm(
+    "b4e00001-0001-4000-8000-000000000003",
+    "edr_freight_app:settings:contract_templates:create",
+    "Create bulk contract templates",
+  ),
+  perm(
+    "b4e00001-0001-4000-8000-000000000004",
+    "edr_freight_app:settings:contract_templates:update",
+    "Update contract templates & articles",
+  ),
+  perm(
+    "b4e00001-0001-4000-8000-000000000005",
+    "edr_freight_app:settings:contract_templates:delete",
+    "Delete bulk contract templates",
+  ),
+  perm(
+    "b4e00001-0001-4000-8000-000000000006",
+    "edr_freight_app:settings:contract_templates:read",
+    "Read contract template data (API only)",
+  ),
+  perm(
+    "b4f00001-0001-4000-8000-000000000001",
+    "edr_freight_app:settings:support_content:view",
+    "View portal help & legal content",
+  ),
+  perm(
+    "b4f00001-0001-4000-8000-000000000002",
+    "edr_freight_app:settings:support_content:manage",
+    "Edit portal help, FAQ & legal content",
+  ),
+];
+
+// N. Previously-ungated staff surfaces (support inbox, procurement, compliance,
+// facilities) plus keys for routes that only had auth-no-permission gating
+// (staff directory, trade access) and the dashboard/report reads the frontend
+// already gated on but were never seeded (overview:view / reports:view).
+export const AUDIENCE_GAP_PERMISSIONS: FreightPermissionSeed[] = [
+  perm(
+    "a4a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:support:agent_view",
+    "View support inbox (agent)",
+  ),
+  perm(
+    "a4a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:support:agent_send",
+    "Reply / start support threads (agent)",
+  ),
+  perm(
+    "a4b00001-0001-4000-8000-000000000001",
+    "edr_freight_app:procurement:view",
+    "View procurement & asset lifecycle",
+  ),
+  perm(
+    "a4b00001-0001-4000-8000-000000000002",
+    "edr_freight_app:procurement:vendor_manage",
+    "Manage vendors",
+  ),
+  perm(
+    "a4b00001-0001-4000-8000-000000000003",
+    "edr_freight_app:procurement:acquisition_manage",
+    "Manage asset acquisitions",
+  ),
+  perm(
+    "a4b00001-0001-4000-8000-000000000004",
+    "edr_freight_app:procurement:disposal_manage",
+    "Manage asset disposals",
+  ),
+  perm(
+    "a4c00001-0001-4000-8000-000000000001",
+    "edr_freight_app:compliance:view",
+    "View vehicle compliance",
+  ),
+  perm(
+    "a4c00001-0001-4000-8000-000000000002",
+    "edr_freight_app:compliance:manage",
+    "Manage vehicle compliance",
+  ),
+  perm(
+    "a4d00001-0001-4000-8000-000000000001",
+    "edr_freight_app:facilities:view",
+    "View facilities",
+  ),
+  perm(
+    "a4d00001-0001-4000-8000-000000000002",
+    "edr_freight_app:facilities:manage",
+    "Manage facilities",
+  ),
+  perm(
+    "a4e00001-0001-4000-8000-000000000001",
+    "edr_freight_app:staff:users:view",
+    "List staff users (pickers)",
+  ),
+  perm(
+    "a4e00001-0001-4000-8000-000000000002",
+    "edr_freight_app:trade_access:view",
+    "View trade-direction access",
+  ),
+  perm(
+    "a4e00001-0001-4000-8000-000000000003",
+    "edr_freight_app:trade_access:manage",
+    "Manage trade-direction access",
+  ),
+  perm(
+    "a4f00001-0001-4000-8000-000000000001",
+    "edr_freight_app:overview:view",
+    "View backoffice overview dashboard",
+  ),
+  perm(
+    "a4f00001-0001-4000-8000-000000000002",
+    "edr_freight_app:reports:view",
+    "Run backoffice reports",
+  ),
+];
+
+// O. Notification recipient selectors. NOT route guards — these are never
+// passed to FreightPermissionGuard/assertFreightPermission and never appear in
+// the frontend's RequirePermission. They exist so ops can tune who gets pinged
+// WITHOUT changing who can open the page. Before them every staff notification
+// used the `allBackoffice` selector, i.e. every current employee in every org.
+export const NOTIFICATION_PERMISSIONS: FreightPermissionSeed[] = [
+  perm(
+    "f3a00001-0001-4000-8000-000000000001",
+    "edr_freight_app:bookings:get_notification",
+    "Receive booking desk notifications",
+  ),
+  perm(
+    "f3a00001-0001-4000-8000-000000000002",
+    "edr_freight_app:bookings:clearance_get_notification",
+    "Receive booking clearance notifications",
+  ),
+  perm(
+    "f3a00001-0001-4000-8000-000000000003",
+    "edr_freight_app:contracts:get_notification",
+    "Receive contract desk notifications",
+  ),
+  perm(
+    "f3a00001-0001-4000-8000-000000000004",
+    "edr_freight_app:contracts:clearance_get_notification",
+    "Receive contract clearance notifications",
+  ),
+  perm(
+    "f3a00001-0001-4000-8000-000000000005",
+    "edr_freight_app:customers:get_notification",
+    "Receive customer desk notifications",
+  ),
+  perm(
+    "f3a00001-0001-4000-8000-000000000006",
+    "edr_freight_app:maintenance:get_notification",
+    "Receive maintenance due notifications",
+  ),
+  perm(
+    "f3a00001-0001-4000-8000-000000000007",
+    "edr_freight_app:rule_engine:get_notification",
+    "Receive rule-change approval notifications",
+  ),
+  perm(
+    "f3a00001-0001-4000-8000-000000000008",
+    "edr_freight_app:warehouse_fee_invoices:get_notification",
+    "Receive warehouse fee accrual notifications",
+  ),
 ];
 
 export const ADVANCED_BACKOFFICE_PERMISSIONS: FreightPermissionSeed[] = [
@@ -397,6 +1455,9 @@ export const ADVANCED_BACKOFFICE_PERMISSIONS: FreightPermissionSeed[] = [
   ...SCHEDULING_EXTRA_PERMISSIONS,
   ...CONFIG_SETTINGS_PERMISSIONS,
   ...STAFF_IAM_PERMISSIONS,
+  ...AUDIENCE_GAP_PERMISSIONS,
+  ...GRANULAR_SPLIT_PERMISSIONS,
+  ...NOTIFICATION_PERMISSIONS,
 ];
 
 export const BOOKING_RULE_ENGINE_PERMISSIONS = [
@@ -407,77 +1468,148 @@ export const BOOKING_RULE_ENGINE_PERMISSIONS = [
   ...ADVANCED_BACKOFFICE_PERMISSIONS,
 ];
 
-export const BOOKING_RULE_ENGINE_PERMISSION_KEYS = BOOKING_RULE_ENGINE_PERMISSIONS.map(
-  (p) => p.key,
+export const BOOKING_RULE_ENGINE_PERMISSION_KEYS =
+  BOOKING_RULE_ENGINE_PERMISSIONS.map((p) => p.key);
+
+/**
+ * Id for a derived `:read` key: the source `:view` id with its version nibble
+ * moved 4 → 5.
+ *
+ * Unique because the source ids are, and disjoint from every hand-written id
+ * because those are all v4-shaped. Nothing index-derived, so a new `:view`
+ * landing mid-list cannot shift ids already seeded — the trap the
+ * RULE_ENGINE_RESOURCE_SLUGS comment warns about.
+ *
+ * (`EdrOrgSeeder.ensurePermissions` deliberately never sends an id — the
+ * column default wins and `key` is the identity every consumer resolves by.
+ * These exist to satisfy the seed type and keep the array self-consistent.)
+ */
+const readPermissionId = (viewId: string): string =>
+  `${viewId.slice(0, 14)}5${viewId.slice(15)}`;
+
+/**
+ * API-read twin of every `:view` key.
+ *
+ * `:view` does three jobs at once — backoffice sidebar entry (App.tsx), route
+ * admission (RequirePermission), and API read. That bundling means a user who
+ * only needs another module's list endpoint for a form dropdown has to be
+ * granted the whole module, page and all. `<module>:read` unbundles it: the
+ * guard accepts it wherever the matching `:view` is required on a GET, and the
+ * frontend never looks at it, so the module stays out of the menu.
+ *
+ * Derived rather than hand-written so a new `:view` key gets its twin for
+ * free. Grants stay hand-curated in `iam.position_type_permissions` — nothing
+ * here hands a `:read` to anyone.
+ */
+export const deriveReadPermissions = (
+  seeds: readonly FreightPermissionSeed[],
+): FreightPermissionSeed[] =>
+  seeds
+    .filter((p) => p.key.endsWith(VIEW_KEY_SUFFIX))
+    .map((p) =>
+      perm(
+        readPermissionId(p.id),
+        readTwinOf(p.key) as string,
+        `Read ${p.name.en.replace(/^View /, "")} (API only)`,
+      ),
+    );
+
+/**
+ * Read twins of the freight-domain catalog, for `PERMISSIONS_CATALOG`. The
+ * IAM/hierarchy keys seeded alongside it live in `edr-freight.seed.ts` and get
+ * theirs there — each twin is derived from its own source row, so the two call
+ * sites agree on any key they share without coordination.
+ */
+export const FREIGHT_READ_PERMISSIONS = deriveReadPermissions(
+  BOOKING_RULE_ENGINE_PERMISSIONS,
 );
 
 export const FREIGHT_PERMS = {
   bookings: {
-    view: 'edr_freight_app:bookings:view',
-    create: 'edr_freight_app:bookings:create',
-    clearanceView: 'edr_freight_app:bookings:clearance_view',
-    staffAccept: 'edr_freight_app:bookings:staff_accept',
-    requestChanges: 'edr_freight_app:bookings:request_changes',
-    reject: 'edr_freight_app:bookings:reject',
-    approveLineStaff: 'edr_freight_app:bookings:approve_line_staff',
-    approveDirector: 'edr_freight_app:bookings:approve_director',
-    approveCeo: 'edr_freight_app:bookings:approve_ceo',
-    rejectApproval: 'edr_freight_app:bookings:reject_approval',
-    generateContract: 'edr_freight_app:bookings:generate_contract',
-    signStaff: 'edr_freight_app:bookings:sign_staff',
-    operations: 'edr_freight_app:bookings:operations',
-    cancel: 'edr_freight_app:bookings:cancel',
-    reviewDocuments: 'edr_freight_app:bookings:review_documents',
-    uploadClearanceOutput: 'edr_freight_app:bookings:upload_clearance_output',
-    finalizeClearance: 'edr_freight_app:bookings:finalize_clearance',
-    docReviewAlert: 'edr_freight_app:bookings:doc_review_alert',
+    view: "edr_freight_app:bookings:view",
+    create: "edr_freight_app:bookings:create",
+    clearanceView: "edr_freight_app:bookings:clearance_view",
+    staffAccept: "edr_freight_app:bookings:staff_accept",
+    requestChanges: "edr_freight_app:bookings:request_changes",
+    reject: "edr_freight_app:bookings:reject",
+    approveLineStaff: "edr_freight_app:bookings:approve_line_staff",
+    approveDirector: "edr_freight_app:bookings:approve_director",
+    approveCeo: "edr_freight_app:bookings:approve_ceo",
+    rejectApproval: "edr_freight_app:bookings:reject_approval",
+    generateContract: "edr_freight_app:bookings:generate_contract",
+    signStaff: "edr_freight_app:bookings:sign_staff",
+    operations: "edr_freight_app:bookings:operations",
+    cancel: "edr_freight_app:bookings:cancel",
+    reviewDocuments: "edr_freight_app:bookings:review_documents",
+    uploadClearanceOutput: "edr_freight_app:bookings:upload_clearance_output",
+    finalizeClearance: "edr_freight_app:bookings:finalize_clearance",
+    docReviewAlert: "edr_freight_app:bookings:doc_review_alert",
+    governmentExpedite: "edr_freight_app:bookings:government_expedite",
+    wagonCancellationView: "edr_freight_app:bookings:wagon_cancellation_view",
+    wagonCancellationVoid: "edr_freight_app:bookings:wagon_cancellation_void",
+    wagonCancellationRebook:
+      "edr_freight_app:bookings:wagon_cancellation_rebook",
+    // Notification selectors, not route guards — see NOTIFICATION_PERMISSIONS.
+    getNotification: "edr_freight_app:bookings:get_notification",
+    clearanceGetNotification:
+      "edr_freight_app:bookings:clearance_get_notification",
   },
   contracts: {
-    view: 'edr_freight_app:contracts:view',
+    view: "edr_freight_app:contracts:view",
     staffAccept: {
-      bulk: 'edr_freight_app:contracts:staff_accept:bulk',
-      container: 'edr_freight_app:contracts:staff_accept:container',
+      bulk: "edr_freight_app:contracts:staff_accept:bulk",
+      container: "edr_freight_app:contracts:staff_accept:container",
     },
     requestChanges: {
-      bulk: 'edr_freight_app:contracts:request_changes:bulk',
-      container: 'edr_freight_app:contracts:request_changes:container',
+      bulk: "edr_freight_app:contracts:request_changes:bulk",
+      container: "edr_freight_app:contracts:request_changes:container",
     },
     reject: {
-      bulk: 'edr_freight_app:contracts:reject:bulk',
-      container: 'edr_freight_app:contracts:reject:container',
+      bulk: "edr_freight_app:contracts:reject:bulk",
+      container: "edr_freight_app:contracts:reject:container",
     },
-    approveLineStaff: 'edr_freight_app:contracts:approve_line_staff',
-    approveDirector: 'edr_freight_app:contracts:approve_director',
-    approveCeo: 'edr_freight_app:contracts:approve_ceo',
-    hazardousApprovalOne: 'edr_freight_app:contracts:hazardous_approval_one',
-    hazardousApprovalTwo: 'edr_freight_app:contracts:hazardous_approval_two',
-    generateContract: 'edr_freight_app:contracts:generate_contract',
+    approveLineStaff: "edr_freight_app:contracts:approve_line_staff",
+    approveDirector: "edr_freight_app:contracts:approve_director",
+    approveCeo: "edr_freight_app:contracts:approve_ceo",
+    hazardousApprovalOne: "edr_freight_app:contracts:hazardous_approval_one",
+    hazardousApprovalTwo: "edr_freight_app:contracts:hazardous_approval_two",
+    generateContract: "edr_freight_app:contracts:generate_contract",
     signStaff: {
-      bulk: 'edr_freight_app:contracts:sign_staff:bulk',
-      container: 'edr_freight_app:contracts:sign_staff:container',
+      bulk: "edr_freight_app:contracts:sign_staff:bulk",
+      container: "edr_freight_app:contracts:sign_staff:container",
     },
-    clearanceReview: 'edr_freight_app:contracts:clearance_review',
-    finalizeClearance: 'edr_freight_app:contracts:finalize_clearance',
-    createBooking: 'edr_freight_app:contracts:create_booking',
-    opsClearanceReview: 'edr_freight_app:contracts:ops_clearance_review',
-    clearanceEtActions: 'edr_freight_app:contracts:clearance_et_actions',
-    clearanceDjActions: 'edr_freight_app:contracts:clearance_dj_actions',
-    clearanceDutyAdvise: 'edr_freight_app:contracts:clearance_duty_advise',
-    suspend: 'edr_freight_app:contracts:suspend',
+    clearanceReview: "edr_freight_app:contracts:clearance_review",
+    finalizeClearance: "edr_freight_app:contracts:finalize_clearance",
+    createBooking: "edr_freight_app:contracts:create_booking",
+    opsClearanceReview: "edr_freight_app:contracts:ops_clearance_review",
+    clearanceEtActions: "edr_freight_app:contracts:clearance_et_actions",
+    clearanceDjActions: "edr_freight_app:contracts:clearance_dj_actions",
+    clearanceDutyAdvise: "edr_freight_app:contracts:clearance_duty_advise",
+    suspend: "edr_freight_app:contracts:suspend",
+    editDocument: "edr_freight_app:contracts:edit_document",
+    finalInvoiceRaise: "edr_freight_app:contracts:final_invoice_raise",
+    finalInvoiceConfirm: "edr_freight_app:contracts:final_invoice_confirm",
+    // Notification selectors, not route guards — see NOTIFICATION_PERMISSIONS.
+    getNotification: "edr_freight_app:contracts:get_notification",
+    clearanceGetNotification:
+      "edr_freight_app:contracts:clearance_get_notification",
   },
   trainScheduling: {
-    view: 'edr_freight_app:train_scheduling:view',
-    create: 'edr_freight_app:train_scheduling:create',
-    update: 'edr_freight_app:train_scheduling:update',
-    cancel: 'edr_freight_app:train_scheduling:cancel',
-    reschedule: 'edr_freight_app:train_scheduling:reschedule',
-    rulesManage: 'edr_freight_app:train_scheduling:rules_manage',
+    view: "edr_freight_app:train_scheduling:view",
+    create: "edr_freight_app:train_scheduling:create",
+    update: "edr_freight_app:train_scheduling:update",
+    cancel: "edr_freight_app:train_scheduling:cancel",
+    reschedule: "edr_freight_app:train_scheduling:reschedule",
+    rulesManage: "edr_freight_app:train_scheduling:rules_manage",
+    dispatch: "edr_freight_app:train_scheduling:dispatch",
+    markPaid: "edr_freight_app:train_scheduling:mark_paid",
+    expireBooking: "edr_freight_app:train_scheduling:expire_booking",
   },
   fleet: {
-    view: 'edr_freight_app:fleet:view',
-    manage: 'edr_freight_app:fleet:manage',
+    view: "edr_freight_app:fleet:view",
+    manage: "edr_freight_app:fleet:manage",
   },
-  admin: 'edr_freight_app:admin',
+  admin: "edr_freight_app:admin",
   ruleEngine: {
     view: (slug: RuleEngineResourceSlug) =>
       `edr_freight_app:rule_engine:${slugToResourceKey(slug)}:view`,
@@ -489,291 +1621,382 @@ export const FREIGHT_PERMS = {
       `edr_freight_app:rule_engine:${slugToResourceKey(slug)}:delete`,
     approve: (slug: RuleEngineApprovableSlug) =>
       `edr_freight_app:rule_engine:${slugToResourceKey(slug)}:approve`,
+    // Notification selector, not a route guard — see NOTIFICATION_PERMISSIONS.
+    // One key for the whole rules desk: every preset grants the rule-engine
+    // view keys as a block, and both producers link to /dashboard/rules/*.
+    getNotification: "edr_freight_app:rule_engine:get_notification",
   },
   allocation: {
-    manage: 'edr_freight_app:allocation:manage',
+    manage: "edr_freight_app:allocation:manage",
   },
   customers: {
-    view: 'edr_freight_app:customers:view',
-    create: 'edr_freight_app:customers:create',
-    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',
+    view: "edr_freight_app:customers:view",
+    create: "edr_freight_app:customers:create",
+    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",
+    // Notification selector, not a route guard — see NOTIFICATION_PERMISSIONS.
+    getNotification: "edr_freight_app:customers:get_notification",
   },
   payments: {
-    view: 'edr_freight_app:payments:view',
-    verify: 'edr_freight_app:payments:verify',
-    refund: 'edr_freight_app:payments:refund',
+    view: "edr_freight_app:payments:view",
   },
   invoices: {
-    view: 'edr_freight_app:invoices:view',
-    create: 'edr_freight_app:invoices:create',
-    cancel: 'edr_freight_app:invoices:cancel',
-    export: 'edr_freight_app:invoices:export',
+    view: "edr_freight_app:invoices:view",
+    export: "edr_freight_app:invoices:export",
+    eimsRegister: "edr_freight_app:invoices:eims_register",
+    eimsResolve: "edr_freight_app:invoices:eims_resolve",
+    confirmOffline: "edr_freight_app:invoices:confirm_offline",
   },
   firstMile: {
-    view: 'edr_freight_app:first_mile:view',
-    accept: 'edr_freight_app:first_mile:accept',
-    create: 'edr_freight_app:first_mile:create',
-    update: 'edr_freight_app:first_mile:update',
-    delete: 'edr_freight_app:first_mile:delete',
-    assignVehicles: 'edr_freight_app:first_mile:assign_vehicles',
-    setDistances: 'edr_freight_app:first_mile:set_distances',
-    generateInvoice: 'edr_freight_app:first_mile:generate_invoice',
+    view: "edr_freight_app:first_mile:view",
+    accept: "edr_freight_app:first_mile:accept",
+    create: "edr_freight_app:first_mile:create",
+    update: "edr_freight_app:first_mile:update",
+    delete: "edr_freight_app:first_mile:delete",
+    assignVehicles: "edr_freight_app:first_mile:assign_vehicles",
+    setDistances: "edr_freight_app:first_mile:set_distances",
+    generateInvoice: "edr_freight_app:first_mile:generate_invoice",
   },
   lastMile: {
-    view: 'edr_freight_app:last_mile:view',
-    accept: 'edr_freight_app:last_mile:accept',
-    create: 'edr_freight_app:last_mile:create',
-    update: 'edr_freight_app:last_mile:update',
-    delete: 'edr_freight_app:last_mile:delete',
-    assignVehicles: 'edr_freight_app:last_mile:assign_vehicles',
-    setDistances: 'edr_freight_app:last_mile:set_distances',
-    generateInvoice: 'edr_freight_app:last_mile:generate_invoice',
+    view: "edr_freight_app:last_mile:view",
+    accept: "edr_freight_app:last_mile:accept",
+    create: "edr_freight_app:last_mile:create",
+    update: "edr_freight_app:last_mile:update",
+    delete: "edr_freight_app:last_mile:delete",
+    assignVehicles: "edr_freight_app:last_mile:assign_vehicles",
+    setDistances: "edr_freight_app:last_mile:set_distances",
+    generateInvoice: "edr_freight_app:last_mile:generate_invoice",
     // Pre-approval confirmation stage (Truck & Machinery department): view/review
     // a submitted request, approve/reject it.
-    requestView: 'edr_freight_app:last_mile:request_view',
-    requestReview: 'edr_freight_app:last_mile:request_review',
-    requestApprove: 'edr_freight_app:last_mile:request_approve',
+    requestView: "edr_freight_app:last_mile:request_view",
+    requestReview: "edr_freight_app:last_mile:request_review",
+    requestApprove: "edr_freight_app:last_mile:request_approve",
   },
   locomotives: {
-    view: 'edr_freight_app:locomotives:view',
-    create: 'edr_freight_app:locomotives:create',
-    update: 'edr_freight_app:locomotives:update',
-    delete: 'edr_freight_app:locomotives:delete',
+    view: "edr_freight_app:locomotives:view",
+    create: "edr_freight_app:locomotives:create",
+    update: "edr_freight_app:locomotives:update",
+    delete: "edr_freight_app:locomotives:delete",
     /**
      * Permanently purge the row — irreversible, and separate from `delete`
      * (which only decommissions) so it can be granted to far fewer people.
      */
-    hardDelete: 'edr_freight_app:locomotives:hard_delete',
+    hardDelete: "edr_freight_app:locomotives:hard_delete",
   },
   wagons: {
-    view: 'edr_freight_app:wagons:view',
-    create: 'edr_freight_app:wagons:create',
-    update: 'edr_freight_app:wagons:update',
-    delete: 'edr_freight_app:wagons:delete',
+    view: "edr_freight_app:wagons:view",
+    create: "edr_freight_app:wagons:create",
+    update: "edr_freight_app:wagons:update",
+    delete: "edr_freight_app:wagons:delete",
     /** Permanently purge the row — irreversible; see locomotives.hardDelete. */
-    hardDelete: 'edr_freight_app:wagons:hard_delete',
+    hardDelete: "edr_freight_app:wagons:hard_delete",
     // Requester creates a transfer request; OCC fulfils it (picks the wagons and
     // executes the move). Distinct keys so OCC can hold fulfil without request.
-    transferRequest: 'edr_freight_app:wagons:transfer_request',
-    transferFulfill: 'edr_freight_app:wagons:transfer_fulfill',
+    transferRequest: "edr_freight_app:wagons:transfer_request",
+    transferFulfill: "edr_freight_app:wagons:transfer_fulfill",
     /** Open the transfer-requests desk (list + detail). */
-    transferView: 'edr_freight_app:wagons:transfer_view',
+    transferView: "edr_freight_app:wagons:transfer_view",
     /** Withdraw a request that has not moved any wagon yet. */
-    transferCancel: 'edr_freight_app:wagons:transfer_cancel',
+    transferCancel: "edr_freight_app:wagons:transfer_cancel",
+    /** Maintenance ⇄ availability flip on the wagons desk (audited). */
+    statusToggle: "edr_freight_app:wagons:status_toggle",
     /** End a request short — anyone who can fulfil may also do this. */
-    transferCloseShort: 'edr_freight_app:wagons:transfer_close_short',
+    transferCloseShort: "edr_freight_app:wagons:transfer_close_short",
     // Admin: read every staffer's transfer history. Without it, a user only sees
     // their own (the /history endpoint uses the caller id, backend-enforced).
-    transferHistoryAll: 'edr_freight_app:wagons:transfer_history_all',
+    transferHistoryAll: "edr_freight_app:wagons:transfer_history_all",
   },
   trains: {
-    view: 'edr_freight_app:trains:view',
-    create: 'edr_freight_app:trains:create',
-    update: 'edr_freight_app:trains:update',
-    delete: 'edr_freight_app:trains:delete',
-    assignWagons: 'edr_freight_app:trains:assign_wagons',
+    view: "edr_freight_app:trains:view",
+    create: "edr_freight_app:trains:create",
+    update: "edr_freight_app:trains:update",
+    delete: "edr_freight_app:trains:delete",
+    assignWagons: "edr_freight_app:trains:assign_wagons",
   },
   routes: {
-    view: 'edr_freight_app:routes:view',
-    create: 'edr_freight_app:routes:create',
-    update: 'edr_freight_app:routes:update',
-    delete: 'edr_freight_app:routes:delete',
+    view: "edr_freight_app:routes:view",
+    create: "edr_freight_app:routes:create",
+    update: "edr_freight_app:routes:update",
+    delete: "edr_freight_app:routes:delete",
     /** Permanently purge the row — irreversible; see locomotives.hardDelete. */
-    hardDelete: 'edr_freight_app:routes:hard_delete',
+    hardDelete: "edr_freight_app:routes:hard_delete",
   },
   containers: {
-    view: 'edr_freight_app:containers:view',
-    create: 'edr_freight_app:containers:create',
-    update: 'edr_freight_app:containers:update',
-    delete: 'edr_freight_app:containers:delete',
+    view: "edr_freight_app:containers:view",
+    create: "edr_freight_app:containers:create",
+    update: "edr_freight_app:containers:update",
+    delete: "edr_freight_app:containers:delete",
   },
   cargoes: {
-    view: 'edr_freight_app:cargoes:view',
-    create: 'edr_freight_app:cargoes:create',
-    update: 'edr_freight_app:cargoes:update',
-    delete: 'edr_freight_app:cargoes:delete',
+    view: "edr_freight_app:cargoes:view",
+    create: "edr_freight_app:cargoes:create",
+    update: "edr_freight_app:cargoes:update",
+    delete: "edr_freight_app:cargoes:delete",
   },
   consignments: {
-    view: 'edr_freight_app:consignments:view',
-    create: 'edr_freight_app:consignments:create',
+    view: "edr_freight_app:consignments:view",
+    create: "edr_freight_app:consignments:create",
   },
   vehicles: {
-    view: 'edr_freight_app:vehicles:view',
-    create: 'edr_freight_app:vehicles:create',
-    update: 'edr_freight_app:vehicles:update',
-    delete: 'edr_freight_app:vehicles:delete',
+    view: "edr_freight_app:vehicles:view",
+    create: "edr_freight_app:vehicles:create",
+    update: "edr_freight_app:vehicles:update",
+    delete: "edr_freight_app:vehicles:delete",
   },
   drivers: {
-    view: 'edr_freight_app:drivers:view',
-    create: 'edr_freight_app:drivers:create',
-    update: 'edr_freight_app:drivers:update',
-    delete: 'edr_freight_app:drivers:delete',
+    view: "edr_freight_app:drivers:view",
+    create: "edr_freight_app:drivers:create",
+    update: "edr_freight_app:drivers:update",
+    delete: "edr_freight_app:drivers:delete",
   },
   tracking: {
-    view: 'edr_freight_app:tracking:view',
-    manage: 'edr_freight_app:tracking:manage',
+    view: "edr_freight_app:tracking:view",
+    manage: "edr_freight_app:tracking:manage",
   },
   fuel: {
-    view: 'edr_freight_app:fuel:view',
-    create: 'edr_freight_app:fuel:create',
-    update: 'edr_freight_app:fuel:update',
-    delete: 'edr_freight_app:fuel:delete',
-    approve: 'edr_freight_app:fuel:approve',
+    view: "edr_freight_app:fuel:view",
+    create: "edr_freight_app:fuel:create",
+    update: "edr_freight_app:fuel:update",
+    delete: "edr_freight_app:fuel:delete",
   },
   maintenance: {
-    view: 'edr_freight_app:maintenance:view',
-    create: 'edr_freight_app:maintenance:create',
-    update: 'edr_freight_app:maintenance:update',
-    delete: 'edr_freight_app:maintenance:delete',
-    complete: 'edr_freight_app:maintenance:complete',
+    view: "edr_freight_app:maintenance:view",
+    create: "edr_freight_app:maintenance:create",
+    update: "edr_freight_app:maintenance:update",
+    delete: "edr_freight_app:maintenance:delete",
+    // Notification selector, not a route guard — see NOTIFICATION_PERMISSIONS.
+    getNotification: "edr_freight_app:maintenance:get_notification",
   },
   fleetReports: {
-    view: 'edr_freight_app:fleet_reports:view',
-    export: 'edr_freight_app:fleet_reports:export',
+    view: "edr_freight_app:fleet_reports:view",
+    export: "edr_freight_app:fleet_reports:export",
   },
   fleetDashboard: {
-    view: 'edr_freight_app:fleet_dashboard:view',
+    view: "edr_freight_app:fleet_dashboard:view",
   },
   warehouseDashboard: {
-    view: 'edr_freight_app:warehouse_dashboard:view',
+    view: "edr_freight_app:warehouse_dashboard:view",
   },
   warehouses: {
-    view: 'edr_freight_app:warehouses:view',
-    create: 'edr_freight_app:warehouses:create',
-    update: 'edr_freight_app:warehouses:update',
-    delete: 'edr_freight_app:warehouses:delete',
+    view: "edr_freight_app:warehouses:view",
+    create: "edr_freight_app:warehouses:create",
+    update: "edr_freight_app:warehouses:update",
+    delete: "edr_freight_app:warehouses:delete",
   },
   warehouseYards: {
-    view: 'edr_freight_app:warehouse_yards:view',
-    create: 'edr_freight_app:warehouse_yards:create',
-    update: 'edr_freight_app:warehouse_yards:update',
-    delete: 'edr_freight_app:warehouse_yards:delete',
+    view: "edr_freight_app:warehouse_yards:view",
+    create: "edr_freight_app:warehouse_yards:create",
+    update: "edr_freight_app:warehouse_yards:update",
+    delete: "edr_freight_app:warehouse_yards:delete",
   },
   warehouseZones: {
-    view: 'edr_freight_app:warehouse_zones:view',
-    create: 'edr_freight_app:warehouse_zones:create',
-    update: 'edr_freight_app:warehouse_zones:update',
+    view: "edr_freight_app:warehouse_zones:view",
+    create: "edr_freight_app:warehouse_zones:create",
+    update: "edr_freight_app:warehouse_zones:update",
   },
   warehouseAllocationRules: {
-    view: 'edr_freight_app:warehouse_allocation_rules:view',
-    create: 'edr_freight_app:warehouse_allocation_rules:create',
-    update: 'edr_freight_app:warehouse_allocation_rules:update',
-    delete: 'edr_freight_app:warehouse_allocation_rules:delete',
+    view: "edr_freight_app:warehouse_allocation_rules:view",
+    create: "edr_freight_app:warehouse_allocation_rules:create",
+    update: "edr_freight_app:warehouse_allocation_rules:update",
+    delete: "edr_freight_app:warehouse_allocation_rules:delete",
   },
   warehouseFeeRules: {
-    view: 'edr_freight_app:warehouse_fee_rules:view',
-    create: 'edr_freight_app:warehouse_fee_rules:create',
-    update: 'edr_freight_app:warehouse_fee_rules:update',
-    delete: 'edr_freight_app:warehouse_fee_rules:delete',
+    view: "edr_freight_app:warehouse_fee_rules:view",
+    create: "edr_freight_app:warehouse_fee_rules:create",
+    update: "edr_freight_app:warehouse_fee_rules:update",
+    delete: "edr_freight_app:warehouse_fee_rules:delete",
   },
   warehouseInspectionReports: {
-    view: 'edr_freight_app:warehouse_inspection_reports:view',
-    create: 'edr_freight_app:warehouse_inspection_reports:create',
-    update: 'edr_freight_app:warehouse_inspection_reports:update',
+    view: "edr_freight_app:warehouse_inspection_reports:view",
+    create: "edr_freight_app:warehouse_inspection_reports:create",
+    update: "edr_freight_app:warehouse_inspection_reports:update",
   },
   warehouseInventory: {
-    view: 'edr_freight_app:warehouse_inventory:view',
-    receive: 'edr_freight_app:warehouse_inventory:receive',
-    move: 'edr_freight_app:warehouse_inventory:move',
-    load: 'edr_freight_app:warehouse_inventory:load',
-    unload: 'edr_freight_app:warehouse_inventory:unload',
-    dispatch: 'edr_freight_app:warehouse_inventory:dispatch',
-    gatePass: 'edr_freight_app:warehouse_inventory:gate_pass',
-    release: 'edr_freight_app:warehouse_inventory:release',
-    deliver: 'edr_freight_app:warehouse_inventory:deliver',
-    inspect: 'edr_freight_app:warehouse_inventory:inspect',
+    view: "edr_freight_app:warehouse_inventory:view",
+    receive: "edr_freight_app:warehouse_inventory:receive",
+    move: "edr_freight_app:warehouse_inventory:move",
+    load: "edr_freight_app:warehouse_inventory:load",
+    unload: "edr_freight_app:warehouse_inventory:unload",
+    dispatch: "edr_freight_app:warehouse_inventory:dispatch",
+    gatePass: "edr_freight_app:warehouse_inventory:gate_pass",
+    release: "edr_freight_app:warehouse_inventory:release",
+    deliver: "edr_freight_app:warehouse_inventory:deliver",
+    inspect: "edr_freight_app:warehouse_inventory:inspect",
   },
   interchangeDocuments: {
-    view: 'edr_freight_app:interchange_documents:view',
-    generate: 'edr_freight_app:interchange_documents:generate',
-    acknowledge: 'edr_freight_app:interchange_documents:acknowledge',
-    dispute: 'edr_freight_app:interchange_documents:dispute',
-    cancel: 'edr_freight_app:interchange_documents:cancel',
+    view: "edr_freight_app:interchange_documents:view",
+    generate: "edr_freight_app:interchange_documents:generate",
+    acknowledge: "edr_freight_app:interchange_documents:acknowledge",
+    dispute: "edr_freight_app:interchange_documents:dispute",
+    cancel: "edr_freight_app:interchange_documents:cancel",
   },
   warehouseFeeInvoices: {
-    view: 'edr_freight_app:warehouse_fee_invoices:view',
-    generate: 'edr_freight_app:warehouse_fee_invoices:generate',
-    cancel: 'edr_freight_app:warehouse_fee_invoices:cancel',
-    pay: 'edr_freight_app:warehouse_fee_invoices:pay',
+    view: "edr_freight_app:warehouse_fee_invoices:view",
+    generate: "edr_freight_app:warehouse_fee_invoices:generate",
+    cancel: "edr_freight_app:warehouse_fee_invoices:cancel",
+    pay: "edr_freight_app:warehouse_fee_invoices:pay",
+    // Notification selector, not a route guard — see NOTIFICATION_PERMISSIONS.
+    getNotification: "edr_freight_app:warehouse_fee_invoices:get_notification",
   },
   settings: {
     fileUpload: {
-      view: 'edr_freight_app:settings:file_upload:view',
-      manage: 'edr_freight_app:settings:file_upload:manage',
+      view: "edr_freight_app:settings:file_upload:view",
+      manage: "edr_freight_app:settings:file_upload:manage",
     },
     dropdown: {
-      view: 'edr_freight_app:settings:dropdown:view',
-      manage: 'edr_freight_app:settings:dropdown:manage',
+      view: "edr_freight_app:settings:dropdown:view",
+      manage: "edr_freight_app:settings:dropdown:manage",
+    },
+    exchangeRate: {
+      view: "edr_freight_app:settings:exchange_rate:view",
+      manage: "edr_freight_app:settings:exchange_rate:manage",
+    },
+    contractTemplates: {
+      view: "edr_freight_app:settings:contract_templates:view",
+      manage: "edr_freight_app:settings:contract_templates:manage",
+      create: "edr_freight_app:settings:contract_templates:create",
+      update: "edr_freight_app:settings:contract_templates:update",
+      delete: "edr_freight_app:settings:contract_templates:delete",
+      read: "edr_freight_app:settings:contract_templates:read",
+    },
+    // Portal-facing help/FAQ/legal copy, edited from Portal content.
+    supportContent: {
+      view: "edr_freight_app:settings:support_content:view",
+      manage: "edr_freight_app:settings:support_content:manage",
     },
   },
   audit: {
-    view: 'edr_freight_app:audit:view',
+    view: "edr_freight_app:audit:view",
+  },
+  support: {
+    agentView: "edr_freight_app:support:agent_view",
+    agentSend: "edr_freight_app:support:agent_send",
+  },
+  procurement: {
+    view: "edr_freight_app:procurement:view",
+    vendorManage: "edr_freight_app:procurement:vendor_manage",
+    acquisitionManage: "edr_freight_app:procurement:acquisition_manage",
+    disposalManage: "edr_freight_app:procurement:disposal_manage",
+  },
+  compliance: {
+    view: "edr_freight_app:compliance:view",
+    manage: "edr_freight_app:compliance:manage",
+  },
+  facilities: {
+    view: "edr_freight_app:facilities:view",
+    manage: "edr_freight_app:facilities:manage",
+  },
+  tradeAccess: {
+    view: "edr_freight_app:trade_access:view",
+    manage: "edr_freight_app:trade_access:manage",
+  },
+  overview: {
+    view: "edr_freight_app:overview:view",
+  },
+  reports: {
+    view: "edr_freight_app:reports:view",
   },
   staff: {
+    users: {
+      view: "edr_freight_app:staff:users:view",
+    },
     roles: {
-      view: 'edr_freight_app:staff:roles:view',
-      create: 'edr_freight_app:staff:roles:create',
-      update: 'edr_freight_app:staff:roles:update',
-      delete: 'edr_freight_app:staff:roles:delete',
+      view: "edr_freight_app:staff:roles:view",
+      create: "edr_freight_app:staff:roles:create",
+      update: "edr_freight_app:staff:roles:update",
+      delete: "edr_freight_app:staff:roles:delete",
     },
     permissions: {
-      view: 'edr_freight_app:staff:permissions:view',
-      assign: 'edr_freight_app:staff:permissions:assign',
+      view: "edr_freight_app:staff:permissions:view",
+      assign: "edr_freight_app:staff:permissions:assign",
     },
     // Seeded in edr-freight.seed.ts (EDR_FREIGHT_PERMISSIONS) — surfaced here for gating.
     employeeRegistration: {
-      view: 'edr_freight_app:employee_registration:view',
-      create: 'edr_freight_app:employee_registration:create',
-      update: 'edr_freight_app:employee_registration:update',
-      activate: 'edr_freight_app:employee_registration:activate',
-      deactivate: 'edr_freight_app:employee_registration:deactivate',
+      view: "edr_freight_app:employee_registration:view",
+      create: "edr_freight_app:employee_registration:create",
+      update: "edr_freight_app:employee_registration:update",
+      activate: "edr_freight_app:employee_registration:activate",
+      deactivate: "edr_freight_app:employee_registration:deactivate",
     },
     roleAssignment: {
-      view: 'edr_freight_app:role_assignment:view',
-      assign: 'edr_freight_app:role_assignment:assign',
-      replace: 'edr_freight_app:role_assignment:replace',
+      view: "edr_freight_app:role_assignment:view",
+      assign: "edr_freight_app:role_assignment:assign",
+      replace: "edr_freight_app:role_assignment:replace",
     },
     hierarchyUnits: {
-      view: 'edr_freight_app:hierarchy_units:view',
-      create: 'edr_freight_app:hierarchy_units:create',
-      update: 'edr_freight_app:hierarchy_units:update',
-      delete: 'edr_freight_app:hierarchy_units:delete',
+      view: "edr_freight_app:hierarchy_units:view",
+      create: "edr_freight_app:hierarchy_units:create",
+      update: "edr_freight_app:hierarchy_units:update",
+      delete: "edr_freight_app:hierarchy_units:delete",
     },
     hierarchyPositions: {
-      view: 'edr_freight_app:hierarchy_positions:view',
-      create: 'edr_freight_app:hierarchy_positions:create',
-      update: 'edr_freight_app:hierarchy_positions:update',
-      delete: 'edr_freight_app:hierarchy_positions:delete',
-      changeParent: 'edr_freight_app:hierarchy_positions:change_parent',
+      view: "edr_freight_app:hierarchy_positions:view",
+      create: "edr_freight_app:hierarchy_positions:create",
+      update: "edr_freight_app:hierarchy_positions:update",
+      delete: "edr_freight_app:hierarchy_positions:delete",
+      changeParent: "edr_freight_app:hierarchy_positions:change_parent",
     },
     hierarchyEmployeeAssignment: {
-      view: 'edr_freight_app:hierarchy_employee_assignment:view',
-      invite: 'edr_freight_app:hierarchy_employee_assignment:invite',
-      assign: 'edr_freight_app:hierarchy_employee_assignment:assign',
+      view: "edr_freight_app:hierarchy_employee_assignment:view",
+      invite: "edr_freight_app:hierarchy_employee_assignment:invite",
+      assign: "edr_freight_app:hierarchy_employee_assignment:assign",
     },
     positionTypes: {
-      view: 'edr_freight_app:position_types:view',
-      create: 'edr_freight_app:position_types:create',
-      update: 'edr_freight_app:position_types:update',
-      delete: 'edr_freight_app:position_types:delete',
+      view: "edr_freight_app:position_types:view",
+      create: "edr_freight_app:position_types:create",
+      update: "edr_freight_app:position_types:update",
+      delete: "edr_freight_app:position_types:delete",
     },
   },
 } as const;
 
+/**
+ * Backfill sources for the `<module>:get_notification` keys: a new key is
+ * granted to whoever already holds ANY of its anchors. The anchor is the key
+ * that gates the page the notification deep-links to — if you cannot open the
+ * page, you were never the intended recipient. The rule-engine desk has no page
+ * of its own, so it anchors on the keys that let you ACT on a filed change.
+ *
+ * Consumed only by FreightNotificationPermissionsSeeder. Keeping it here means
+ * the registry spec can assert every anchor still exists in the catalog — a
+ * typo'd anchor backfills nobody, silently.
+ */
+export const NOTIFICATION_PERMISSION_ANCHORS: Record<string, string[]> = {
+  [FREIGHT_PERMS.bookings.getNotification]: [FREIGHT_PERMS.bookings.view],
+  [FREIGHT_PERMS.bookings.clearanceGetNotification]: [
+    FREIGHT_PERMS.bookings.clearanceView,
+  ],
+  [FREIGHT_PERMS.contracts.getNotification]: [FREIGHT_PERMS.contracts.view],
+  [FREIGHT_PERMS.contracts.clearanceGetNotification]: [
+    FREIGHT_PERMS.contracts.clearanceReview,
+    FREIGHT_PERMS.contracts.clearanceEtActions,
+    FREIGHT_PERMS.contracts.clearanceDjActions,
+    FREIGHT_PERMS.contracts.opsClearanceReview,
+  ],
+  [FREIGHT_PERMS.customers.getNotification]: [FREIGHT_PERMS.customers.view],
+  [FREIGHT_PERMS.maintenance.getNotification]: [FREIGHT_PERMS.maintenance.view],
+  [FREIGHT_PERMS.ruleEngine.getNotification]: [
+    FREIGHT_PERMS.ruleEngine.approve("rates"),
+    FREIGHT_PERMS.ruleEngine.update("priority-configs"),
+  ],
+  [FREIGHT_PERMS.warehouseFeeInvoices.getNotification]: [
+    FREIGHT_PERMS.warehouseFeeInvoices.view,
+  ],
+};
+
 /** Both arms of a freight-type-split permission (for one-of route guards). */
-export const bothFreightTypes = (p: { bulk: string; container: string }): string[] => [
-  p.bulk,
-  p.container,
-];
+export const bothFreightTypes = (p: {
+  bulk: string;
+  container: string;
+}): string[] => [p.bulk, p.container];
 
 /** The arm of a freight-type-split permission matching a contract's freightType. */
 export const forFreightType = (
   p: { bulk: string; container: string },
   freightType: string,
-): string => (freightType === 'BULK' ? p.bulk : p.container);
+): string => (freightType === "BULK" ? p.bulk : p.container);
 
 const allRuleEngineViewKeys = () =>
   RULE_ENGINE_RESOURCE_SLUGS.map((s) => FREIGHT_PERMS.ruleEngine.view(s));
@@ -792,6 +2015,7 @@ const FLEET_GRANULAR_KEYS: string[] = [
   FREIGHT_PERMS.wagons.create,
   FREIGHT_PERMS.wagons.update,
   FREIGHT_PERMS.wagons.delete,
+  FREIGHT_PERMS.wagons.statusToggle,
   FREIGHT_PERMS.trains.view,
   FREIGHT_PERMS.trains.create,
   FREIGHT_PERMS.trains.update,
@@ -813,11 +2037,32 @@ const FLEET_GRANULAR_KEYS: string[] = [
   FREIGHT_PERMS.consignments.create,
 ];
 
+// Everyone who works the booking desk also opens the overview dashboard and
+// the canned reports — granted alongside bookings:view in every preset below.
+const STAFF_DASHBOARD_KEYS: string[] = [
+  FREIGHT_PERMS.overview.view,
+  FREIGHT_PERMS.reports.view,
+];
+
+// Notification desks — recipient selectors, not access. A preset gets a desk
+// key only where it actually works that queue, which is why the GL presets take
+// the clearance pair and nothing else: they hold no bookings:view and no intake
+// keys, so intake pings would only be noise they cannot act on.
+const BOOKING_DESK_NOTIFICATION_KEYS: string[] = [
+  FREIGHT_PERMS.bookings.getNotification,
+  FREIGHT_PERMS.contracts.getNotification,
+];
+const CLEARANCE_DESK_NOTIFICATION_KEYS: string[] = [
+  FREIGHT_PERMS.bookings.clearanceGetNotification,
+  FREIGHT_PERMS.contracts.clearanceGetNotification,
+];
+
 export const ROLE_PERMISSION_PRESETS = {
   // Marketing / line staff: drives a booking from intake through line-staff
   // approval and contract generation/signing — i.e. until the contract is ready
   // and signed. No director/CEO approval, no scheduling, no operations.
   lineStaff: [
+    ...STAFF_DASHBOARD_KEYS,
     FREIGHT_PERMS.bookings.view,
     FREIGHT_PERMS.bookings.staffAccept,
     FREIGHT_PERMS.bookings.requestChanges,
@@ -825,18 +2070,25 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.bookings.approveLineStaff,
     FREIGHT_PERMS.bookings.rejectApproval,
     FREIGHT_PERMS.bookings.cancel,
+    FREIGHT_PERMS.bookings.wagonCancellationView,
+    FREIGHT_PERMS.bookings.wagonCancellationVoid,
     FREIGHT_PERMS.contracts.view,
     ...bothFreightTypes(FREIGHT_PERMS.contracts.staffAccept),
     ...bothFreightTypes(FREIGHT_PERMS.contracts.requestChanges),
     ...bothFreightTypes(FREIGHT_PERMS.contracts.reject),
     FREIGHT_PERMS.contracts.approveLineStaff,
+    FREIGHT_PERMS.contracts.editDocument,
     ...allRuleEngineViewKeys(),
+    ...BOOKING_DESK_NOTIFICATION_KEYS,
+    FREIGHT_PERMS.ruleEngine.getNotification,
   ],
   // Operations Officer: train scheduling + wagon allocation + transit/complete
   // + fleet management (wagons, trains, locomotives, routes, containers, cargo).
   operationsOfficer: [
+    ...STAFF_DASHBOARD_KEYS,
     FREIGHT_PERMS.bookings.view,
     FREIGHT_PERMS.bookings.operations,
+    FREIGHT_PERMS.bookings.wagonCancellationView,
     // They are the ones who accept/reject operation requests, so they are the
     // ones the doc-review countdown is for.
     FREIGHT_PERMS.bookings.docReviewAlert,
@@ -846,6 +2098,9 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.trainScheduling.cancel,
     FREIGHT_PERMS.trainScheduling.reschedule,
     FREIGHT_PERMS.trainScheduling.rulesManage,
+    FREIGHT_PERMS.trainScheduling.dispatch,
+    FREIGHT_PERMS.trainScheduling.markPaid,
+    FREIGHT_PERMS.trainScheduling.expireBooking,
     FREIGHT_PERMS.fleet.view,
     FREIGHT_PERMS.fleet.manage,
     ...FLEET_GRANULAR_KEYS,
@@ -858,8 +2113,14 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.bookings.reviewDocuments,
     FREIGHT_PERMS.bookings.finalizeClearance,
     ...allRuleEngineViewKeys(),
+    ...BOOKING_DESK_NOTIFICATION_KEYS,
+    // They run Path A clearance review from the booking detail, so the booking
+    // clearance desk is theirs too — but not the contract one, which is GL's.
+    FREIGHT_PERMS.bookings.clearanceGetNotification,
+    FREIGHT_PERMS.ruleEngine.getNotification,
   ],
   director: [
+    ...STAFF_DASHBOARD_KEYS,
     FREIGHT_PERMS.bookings.view,
     FREIGHT_PERMS.bookings.approveDirector,
     FREIGHT_PERMS.bookings.rejectApproval,
@@ -868,16 +2129,30 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.contracts.approveDirector,
     FREIGHT_PERMS.contracts.generateContract,
     ...allRuleEngineViewKeys(),
+    ...BOOKING_DESK_NOTIFICATION_KEYS,
   ],
   ceo: [
+    ...STAFF_DASHBOARD_KEYS,
     FREIGHT_PERMS.bookings.view,
     FREIGHT_PERMS.bookings.approveCeo,
     FREIGHT_PERMS.bookings.rejectApproval,
     FREIGHT_PERMS.contracts.view,
     FREIGHT_PERMS.contracts.approveCeo,
     ...allRuleEngineViewKeys(),
+    ...BOOKING_DESK_NOTIFICATION_KEYS,
+  ],
+  finance: [
+    ...STAFF_DASHBOARD_KEYS,
+    FREIGHT_PERMS.bookings.view,
+    FREIGHT_PERMS.invoices.view,
+    FREIGHT_PERMS.invoices.export,
+    // Deliberately NOT granted here: invoices:eims_register and invoices:eims_resolve.
+    // Invoices are filed with MoR by the workflow, not by a person, so filing is not a
+    // Finance job function — the endpoints exist for controlled testing and exceptional
+    // operations, and are assigned to named admins rather than a role preset.
+    FREIGHT_PERMS.payments.view,
+    FREIGHT_PERMS.bookings.wagonCancellationView,
   ],
-  finance: [FREIGHT_PERMS.bookings.view],
   // Global Logistics: manages ONLY the customs-clearance queue. Scoped out of
   // the general booking-request list (no bookings:view) — instead a dedicated
   // clearance:view permission lists the clearance bookings. Reviews customer
@@ -894,25 +2169,31 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.contracts.createBooking,
     FREIGHT_PERMS.contracts.clearanceEtActions,
     FREIGHT_PERMS.contracts.clearanceDutyAdvise,
+    FREIGHT_PERMS.contracts.finalInvoiceConfirm,
     FREIGHT_PERMS.bookings.clearanceView,
     FREIGHT_PERMS.bookings.reviewDocuments,
     FREIGHT_PERMS.bookings.uploadClearanceOutput,
     FREIGHT_PERMS.bookings.finalizeClearance,
     FREIGHT_PERMS.bookings.operations,
+    ...CLEARANCE_DESK_NOTIFICATION_KEYS,
   ],
   // GL Djibouti (edr_gl_djibouti): DO/RO collection, gatepass, loading milestones,
   // damage reports. Read-only on the contract; no booking creation.
   glDjibouti: [
     FREIGHT_PERMS.contracts.view,
     FREIGHT_PERMS.contracts.clearanceDjActions,
+    FREIGHT_PERMS.contracts.finalInvoiceRaise,
+    FREIGHT_PERMS.contracts.finalInvoiceConfirm,
     FREIGHT_PERMS.bookings.clearanceView,
     FREIGHT_PERMS.bookings.uploadClearanceOutput,
     FREIGHT_PERMS.bookings.operations,
+    ...CLEARANCE_DESK_NOTIFICATION_KEYS,
   ],
   // Marketing handles intake through contract (same as line staff here) and,
   // for non-customs bookings, reviews/finalizes the customer's clearance
   // documents from the booking detail (customs bookings go to Global Logistics).
   marketing: [
+    ...STAFF_DASHBOARD_KEYS,
     FREIGHT_PERMS.bookings.view,
     FREIGHT_PERMS.bookings.staffAccept,
     FREIGHT_PERMS.bookings.requestChanges,
@@ -920,6 +2201,9 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.bookings.approveLineStaff,
     FREIGHT_PERMS.bookings.rejectApproval,
     FREIGHT_PERMS.bookings.cancel,
+    FREIGHT_PERMS.bookings.wagonCancellationView,
+    FREIGHT_PERMS.bookings.wagonCancellationVoid,
+    FREIGHT_PERMS.bookings.wagonCancellationRebook,
     FREIGHT_PERMS.bookings.generateContract,
     FREIGHT_PERMS.bookings.signStaff,
     FREIGHT_PERMS.bookings.reviewDocuments,
@@ -932,6 +2216,8 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.contracts.generateContract,
     ...bothFreightTypes(FREIGHT_PERMS.contracts.signStaff),
     FREIGHT_PERMS.contracts.suspend,
+    FREIGHT_PERMS.contracts.editDocument,
+    ...BOOKING_DESK_NOTIFICATION_KEYS,
   ],
   orgManager: [...BOOKING_RULE_ENGINE_PERMISSION_KEYS],
 } as const;
@@ -958,8 +2244,31 @@ export const POSITION_PERMISSION_PRESETS = {
     FREIGHT_PERMS.customers.view,
     FREIGHT_PERMS.customers.verify,
     FREIGHT_PERMS.customers.deactivate,
+    // …and therefore the profile-review pings company-notifier emits.
+    FREIGHT_PERMS.customers.getNotification,
+    // The chief also owns the customer-facing support inbox.
+    FREIGHT_PERMS.support.agentView,
+    FREIGHT_PERMS.support.agentSend,
+    // Senior commercial oversight: government expedite + the finance views.
+    FREIGHT_PERMS.bookings.governmentExpedite,
+    FREIGHT_PERMS.invoices.view,
+    FREIGHT_PERMS.invoices.export,
+    FREIGHT_PERMS.payments.view,
+  ]),
+  // Director additionally manages train scheduling + rail fleet (same block the
+  // operation officer/chief hold), on top of the approval-chain role preset.
+  director: dedupe([
+    ...ROLE_PERMISSION_PRESETS.director,
+    FREIGHT_PERMS.trainScheduling.view,
+    FREIGHT_PERMS.trainScheduling.create,
+    FREIGHT_PERMS.trainScheduling.update,
+    FREIGHT_PERMS.trainScheduling.cancel,
+    FREIGHT_PERMS.trainScheduling.reschedule,
+    FREIGHT_PERMS.trainScheduling.rulesManage,
+    FREIGHT_PERMS.fleet.view,
+    FREIGHT_PERMS.fleet.manage,
+    ...FLEET_GRANULAR_KEYS,
   ]),
-  director: dedupe([...ROLE_PERMISSION_PRESETS.director]),
   ceo: dedupe([...ROLE_PERMISSION_PRESETS.ceo]),
   ethiopianGl: dedupe([...ROLE_PERMISSION_PRESETS.glEthiopia]),
   djiboutiGl: dedupe([...ROLE_PERMISSION_PRESETS.glDjibouti]),
@@ -1009,6 +2318,10 @@ export const POSITION_PERMISSION_PRESETS = {
     ...Object.values(FREIGHT_PERMS.lastMile),
     FREIGHT_PERMS.trainScheduling.view,
     FREIGHT_PERMS.bookings.operations,
+    // Road-fleet back office: vendors, asset lifecycle, compliance, facilities.
+    ...Object.values(FREIGHT_PERMS.procurement),
+    ...Object.values(FREIGHT_PERMS.compliance),
+    ...Object.values(FREIGHT_PERMS.facilities),
   ]),
   // Truck & Machinery chief: reviews and approves/rejects last-mile
   // confirmation requests (the pre-approval gate ahead of vehicle assignment),
@@ -1024,9 +2337,12 @@ export const POSITION_PERMISSION_PRESETS = {
 } as const;
 
 /** Derive the module bucket from the resource segment of a permission key. */
-const moduleOf = (key: string): string => key.split(':')[1] ?? 'other';
+const moduleOf = (key: string): string => key.split(":")[1] ?? "other";
 
-export const PERMISSIONS_CATALOG = BOOKING_RULE_ENGINE_PERMISSIONS.map((p) => ({
+export const PERMISSIONS_CATALOG = [
+  ...BOOKING_RULE_ENGINE_PERMISSIONS,
+  ...FREIGHT_READ_PERMISSIONS,
+].map((p) => ({
   key: p.key,
   label: p.name.en,
   module: moduleOf(p.key),
diff --git a/apps/edr-freight-api/src/seed/support-content.seeder.ts b/apps/edr-freight-api/src/seed/support-content.seeder.ts
new file mode 100644
index 000000000..5ae5e57fe
--- /dev/null
+++ b/apps/edr-freight-api/src/seed/support-content.seeder.ts
@@ -0,0 +1,62 @@
+import { SUPPORT_CONTENT_DEFAULTS, SUPPORT_DOC_SLUGS } from "@edr/types";
+import { Injectable, Logger } from "@nestjs/common";
+import { DataSource } from "typeorm";
+
+import {
+  SupportDocument,
+  SupportDocumentVersion,
+} from "../modules/support-content/entities/support-document.entity";
+
+/**
+ * Puts the portal's shipped help/FAQ/legal copy into the database on first
+ * boot. Idempotent by emptiness, like the other reference-data seeders: once a
+ * row exists the content is admin-managed, so a redeploy must never clobber it.
+ *
+ * Each document is written together with its `version = 1` history row, which
+ * is what makes `max(version)` in the log always equal the live row — the
+ * invariant the version list and rollback both assume.
+ */
+@Injectable()
+export class SupportContentSeeder {
+  private readonly logger = new Logger(SupportContentSeeder.name);
+
+  constructor(private readonly dataSource: DataSource) {}
+
+  async run() {
+    const documents = this.dataSource.getRepository(SupportDocument);
+    const versions = this.dataSource.getRepository(SupportDocumentVersion);
+
+    const existing = await documents.count({ withDeleted: true });
+    if (existing > 0) {
+      this.logger.log(
+        `support_documents already has ${existing} rows — skipping seed`,
+      );
+      return;
+    }
+
+    for (const slug of SUPPORT_DOC_SLUGS) {
+      const document = await documents.save(
+        documents.create({
+          slug,
+          payload: SUPPORT_CONTENT_DEFAULTS[slug],
+          version: 1,
+          updatedById: null,
+        }),
+      );
+
+      await versions.save(
+        versions.create({
+          documentId: document.id,
+          version: 1,
+          payload: document.payload,
+          actorId: null,
+          note: "Initial content",
+        }),
+      );
+    }
+
+    this.logger.log(
+      `Seeded ${SUPPORT_DOC_SLUGS.length} portal content documents`,
+    );
+  }
+}
diff --git a/apps/edr-freight-web/backoffice/.env.example b/apps/edr-freight-web/backoffice/.env.example
index 454817139..36bdb80de 100644
--- a/apps/edr-freight-web/backoffice/.env.example
+++ b/apps/edr-freight-web/backoffice/.env.example
@@ -12,3 +12,9 @@ VITE_TOKEN_REFRESH_INTERVAL_MINUTES=10
 # observability stays off (the app works either way). Self-hosted instance.
 VITE_POSTHOG_KEY=phc_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 VITE_POSTHOG_HOST=https://posthog.example.com
+
+# Maps JavaScript API key (fleet TrackingPage). Required — the hardcoded
+# fallback in TrackingPage.tsx is expired (ExpiredKeyMapError), so without
+# this set the tracking map renders blank. Get a key from the Google Cloud
+# Console (Maps JavaScript API + Places API + Geocoding API enabled).
+VITE_GOOGLE_MAPS_API_KEY=
diff --git a/apps/edr-freight-web/backoffice/index.css b/apps/edr-freight-web/backoffice/index.css
index fa9eb3e3d..8e410f026 100644
--- a/apps/edr-freight-web/backoffice/index.css
+++ b/apps/edr-freight-web/backoffice/index.css
@@ -1,11 +1,13 @@
 @import "tailwindcss";
 @import "@edr/ui-common/theme.css" layer(theme);
 
-/* The app toggles dark mode by setting the `dark` class on <html> (see
-   main.tsx / FreightDashboardLayout). Without this, Tailwind v4 compiles
-   `dark:` utilities to `@media (prefers-color-scheme: dark)` and they follow
-   the OS setting instead of the in-app toggle. */
-@custom-variant dark (&:where(.dark, .dark *));
+/* The backoffice is light-only — there is no theme toggle and nothing sets the
+   `dark` class. This override is load-bearing: without it Tailwind v4 compiles
+   `dark:` utilities to `@media (prefers-color-scheme: dark)`, so every
+   leftover `dark:` class (the vendored IAM UI is full of them) would activate
+   on an OS-level dark setting. Binding the variant to a class that is never
+   rendered keeps those utilities inert no matter what the OS says. */
+@custom-variant dark (&:where(.edr-dark-disabled));
 
 /* Bridge the central Mantine theme into Tailwind. freightMantineTheme
    (createTheme) is the single source of truth; these just alias its generated
diff --git a/apps/edr-freight-web/backoffice/package.json b/apps/edr-freight-web/backoffice/package.json
index 68fdb2a8f..e0ef813e9 100644
--- a/apps/edr-freight-web/backoffice/package.json
+++ b/apps/edr-freight-web/backoffice/package.json
@@ -20,6 +20,7 @@
     "@mantine/core": "^9.3.0",
     "@mantine/dates": "^9.3.0",
     "@mantine/hooks": "^9.3.0",
+    "@mdxeditor/editor": "^4.2.0",
     "@posthog/react": "^1.10.3",
     "@radix-ui/react-accordion": "^1.2.13",
     "@radix-ui/react-alert-dialog": "^1.1.16",
@@ -93,6 +94,7 @@
     "react-icons": "^5.6.0",
     "react-image-crop": "^11.0.10",
     "react-intersection-observer": "^9.16.0",
+    "react-markdown": "^9.1.0",
     "react-pdf": "^10.4.1",
     "react-pdf-html": "^2.1.5",
     "react-quill-new": "^3.8.3",
diff --git a/apps/edr-freight-web/backoffice/src/App.tsx b/apps/edr-freight-web/backoffice/src/App.tsx
index 462414480..00d5e0ddb 100644
--- a/apps/edr-freight-web/backoffice/src/App.tsx
+++ b/apps/edr-freight-web/backoffice/src/App.tsx
@@ -1,35 +1,3 @@
-import {
-  ArrowLeftRight,
-  Boxes,
-  Building2,
-  BarChart3,
-  Container,
-  FileSignature,
-  FileText,
-  Hammer,
-  History,
-  LayoutDashboard,
-  LayoutGrid,
-  MapPin,
-  Network,
-  Package,
-  PackageCheck,
-  PackageOpen,
-  Paperclip,
-  Receipt,
-  ScrollText,
-  Send,
-  Settings,
-  ShieldCheck,
-  Ship,
-  SlidersHorizontal,
-  Train,
-  Truck,
-  Users,
-  Wallet,
-  LifeBuoy,
-  TrainFront,
-} from "lucide-react";
 import { useEffect } from "react";
 import {
   Navigate,
@@ -41,11 +9,7 @@ import {
   useParams,
 } from "react-router-dom";
 
-import {
-  FreightDashboardLayout,
-  type SidebarItem,
-  type SidebarSection,
-} from "@/components/layout";
+import { FreightDashboardLayout, type SidebarItem } from "@/components/layout";
 import { useAuth } from "./auth/useAuth";
 import LoadingScreen from "./components/LoadingScreen";
 import LoginPage from "./pages/auth/LoginPage";
@@ -54,6 +18,7 @@ import BookingContractPage from "./pages/bookings/BookingContractPage";
 import BookingRequestDetailPage from "./pages/bookings/BookingRequestDetailPage";
 import BookingRequestsPage from "./pages/bookings/BookingRequestsPage";
 import NewBookingPage from "./pages/bookings/NewBookingPage";
+import WagonCancellationsPage from "./pages/bookings/WagonCancellationsPage";
 import ContractRequestsPage from "./pages/contracts/ContractRequestsPage";
 import ContractRequestDetailPage from "./pages/contracts/ContractRequestDetailPage";
 import ContractViewPage from "./pages/contracts/ContractViewPage";
@@ -71,6 +36,7 @@ import CustomerDetailPage from "./pages/customers/CustomerDetailPage";
 import CustomersPage from "./pages/customers/CustomersPage";
 import InvoiceDetailPage from "./pages/invoices/InvoiceDetailPage";
 import InvoicesPage from "./pages/invoices/InvoicesPage";
+import UsdPaymentsPage from "./pages/invoices/UsdPaymentsPage";
 import MyProfilePage from "./pages/dashboard/MyProfilePage";
 import OverviewPage from "./pages/dashboard/OverviewPage";
 import ReportsHubPage from "./pages/reports/ReportsHubPage";
@@ -80,16 +46,13 @@ import PaymentsPage from "./pages/payments/PaymentsPage";
 import AuditLogsPage from "./pages/audit/AuditLogsPage";
 //import EmployeesPage from "./pages/dashboard/user-management/EmployeesPage";
 import { RequirePermission } from "./components/auth/RequirePermission";
-import {
-  FREIGHT_PERMS,
-  hasPermission as hasFreightPermission,
-  isDjiboutiGl,
-  isEthiopianGl,
-  isSuperAdmin,
-} from "./lib/permissions";
+import { FREIGHT_PERMS } from "./lib/permissions";
+import { NO_ACCESS_PATH, resolveLandingPath } from "./lib/landing";
+import NoAccessPage from "./pages/NoAccessPage";
 import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
 import DropdownSettingsPage from "./pages/dropdown_settings/DropdownSettingsPage";
 import ContractTemplatesPage from "./pages/contract_templates/ContractTemplatesPage";
+import PortalContentPage from "./pages/portal_content/PortalContentPage";
 import ContractTemplateEditorPage from "./pages/contract_templates/ContractTemplateEditorPage";
 import FleetResourcePage from "./pages/fleet/FleetResourcePage";
 import WagonTransfersPage from "./pages/wagons/WagonTransfersPage";
@@ -106,7 +69,6 @@ import CompliancePage from "./pages/fleet/CompliancePage";
 import IncidentsPage from "./pages/fleet/IncidentsPage";
 import WorkOrdersPage from "./pages/fleet/WorkOrdersPage";
 import ProcurementPage from "./pages/fleet/ProcurementPage";
-import { getCategorySidebarChildren } from "./pages/ruleEngine/config/resources";
 import RuleEngineLegacyRedirect from "./pages/ruleEngine/RuleEngineLegacyRedirect";
 import RuleEngineResourcePage from "./pages/ruleEngine/RuleEngineResourcePage";
 import CargoTypesPage from "./pages/ruleEngine/CargoTypesPage";
@@ -125,7 +87,6 @@ import TrainDetailPage from "./pages/trains/TrainDetailPage";
 import TrainBuilderDetailPage from "./pages/trainBuilder/TrainBuilderDetailPage";
 import TrainBuilderListPage from "./pages/trainBuilder/TrainBuilderListPage";
 import ArrivalQueuePage from "./pages/warehouses/ArrivalQueuePage";
-import EDRLastMileReturnsPage from "./pages/warehouses/EDRLastMileReturnsPage";
 import ContainerReturnsPage from "./pages/warehouses/ContainerReturnsPage";
 import DispatchQueuePage from "./pages/warehouses/DispatchQueuePage";
 import ExportDjiboutiUnloadingQueuePage from "./pages/warehouses/ExportDjiboutiUnloadingQueuePage";
@@ -149,607 +110,12 @@ import FaydaCallbackPage from "./pages/FaydaCallbackPage";
 import { UserManagementRoutes } from "./user-management/route";
 import SetPassword from "./shared/components/SetPassword";
 import SupportInboxPage from "./pages/support/SupportInboxPage";
-
-const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
-  {
-    title: "Main menu",
-    items: [
-      {
-        label: "Overview",
-        href: "/dashboard/overview",
-        icon: <LayoutDashboard />,
-        permission: FREIGHT_PERMS.overview.view,
-      },
-      {
-        label: "Reports",
-        href: "/dashboard/reports",
-        icon: <BarChart3 />,
-        permission: FREIGHT_PERMS.bookings.view,
-      },
-      {
-        label: "Customers",
-        href: "/dashboard/customers",
-        icon: <Building2 />,
-        permission: FREIGHT_PERMS.customers.view,
-      },
-      {
-        label: "Contracts",
-        href: "/dashboard/contract-requests",
-        icon: <FileSignature />,
-        permission: FREIGHT_PERMS.contracts.view,
-      },
-      {
-        label: "Bookings",
-        href: "/dashboard/booking-requests",
-        icon: <FileText />,
-        permission: FREIGHT_PERMS.bookings.view,
-      },
-      // Operations hub: per-shipment clearance-document review for services
-      // WITHOUT customs clearing (self-clearance) — bookings only.
-      {
-        label: "Clearance Documents",
-        href: "/dashboard/contracts/clearance-documents",
-        icon: <ShieldCheck />,
-        permission: FREIGHT_PERMS.contracts.opsClearanceReview,
-      },
-      {
-        label: "Payments",
-        href: "/dashboard/payments",
-        icon: <Wallet />,
-        permission: FREIGHT_PERMS.bookings.view,
-      },
-      {
-        label: "Invoices",
-        href: "/dashboard/invoices",
-        icon: <Receipt />,
-        permission: FREIGHT_PERMS.bookings.view,
-      },
-      {
-        label: "Support",
-        href: "/dashboard/support",
-        icon: <LifeBuoy />,
-        permission: FREIGHT_PERMS.support.view,
-      },
-      ...demoItems,
-    ],
-  },
-  {
-    // title: "Port & Terminal",
-    items: [
-      {
-        label: "Operations",
-        icon: <Settings />,
-        children: [
-          {
-            label: "Clearance",
-            href: "/dashboard/contracts/clearance",
-            icon: <ShieldCheck />,
-            permission: [
-              FREIGHT_PERMS.contracts.clearanceReview,
-              FREIGHT_PERMS.contracts.clearanceEtActions,
-            ],
-          },
-          // {
-          //   label: "Shipment Requests",
-          //   href: "/dashboard/shipment-requests",
-          //   icon: <Send />,
-          //   permission: FREIGHT_PERMS.contracts.createBooking,
-          // },
-          // Operations Path A queue: per-booking self-clearance review for
-          // GENERAL non-customs booking instances (and legacy self-clear bookings).
-          // {
-          //   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",
-            icon: <Ship />,
-            permission: FREIGHT_PERMS.contracts.clearanceDjActions,
-          },
-          {
-            label: "Train Schedules",
-            href: "/dashboard/operations/train-scheduling-v2",
-            icon: <Train />,
-            permission: FREIGHT_PERMS.trainScheduling.view,
-          },
-          {
-            label: "Batch Board",
-            href: "/dashboard/operations/batch-board",
-            icon: <LayoutGrid />,
-            permission: FREIGHT_PERMS.trainScheduling.view,
-          },
-          {
-            label: "First Mile",
-            href: "/dashboard/operations/first-mile",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.firstMile.view,
-          },
-          {
-            label: "Last Mile",
-            href: "/dashboard/operations/last-mile",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.lastMile.view,
-          },
-        ],
-      },
-      {
-        label: "Fleet Management",
-        icon: <Truck />,
-        children: [
-          {
-            label: "Fleet Dashboard",
-            href: "/dashboard/fleet-dashboard",
-            icon: <LayoutDashboard />,
-            permission: FREIGHT_PERMS.fleetDashboard.view,
-          },
-          {
-            label: "Routes",
-            href: "/dashboard/routes",
-            icon: <Network />,
-            permission: [FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view],
-          },
-          {
-            label: "Locomotives",
-            href: "/dashboard/locomotives",
-            icon: <Train />,
-            permission: [
-              FREIGHT_PERMS.locomotives.view,
-              FREIGHT_PERMS.fleet.view,
-            ],
-          },
-          {
-            label: "Train Builder",
-            href: "/dashboard/train-builder",
-            icon: <Hammer />,
-            permission: [FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view],
-          },
-
-          // {
-          //   label: "Wagon types",
-          //   href: "/dashboard/wagon-types",
-          //   icon: <Boxes />,
-          // },
-          {
-            label: "Wagons",
-            href: "/dashboard/wagons",
-            icon: <Truck />,
-            permission: [FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view],
-          },
-          {
-            label: "Wagon Transfers",
-            href: "/dashboard/wagon-transfers",
-            icon: <ArrowLeftRight />,
-            permission: [
-              FREIGHT_PERMS.wagons.transferView,
-              FREIGHT_PERMS.wagons.view,
-            ],
-          },
-          {
-            label: "Vehicles",
-            href: "/dashboard/vehicles",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.vehicles.view,
-          },
-          {
-            label: "Drivers",
-            href: "/dashboard/drivers",
-            icon: <Users />,
-            permission: FREIGHT_PERMS.drivers.view,
-          },
-          {
-            label: "Track Vehicles",
-            href: "/dashboard/tracking",
-            icon: <MapPin />,
-            permission: FREIGHT_PERMS.tracking.view,
-          },
-          {
-            label: "Fuel Purchases",
-            href: "/dashboard/fuel-purchases",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.fuel.view,
-          },
-          {
-            label: "Fuel Analytics",
-            href: "/dashboard/fuel-stats",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.fuel.view,
-          },
-          {
-            label: "Maintenance",
-            href: "/dashboard/maintenance",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.maintenance.view,
-          },
-          {
-            label: "Work Orders",
-            href: "/dashboard/work-orders",
-            icon: <SlidersHorizontal />,
-            permission: FREIGHT_PERMS.maintenance.view,
-          },
-          {
-            label: "Compliance & Alerts",
-            href: "/dashboard/compliance",
-            icon: <ShieldCheck />,
-            permission: FREIGHT_PERMS.fleet.view,
-          },
-          {
-            label: "Incidents",
-            href: "/dashboard/incidents",
-            icon: <FileText />,
-            permission: FREIGHT_PERMS.fleet.view,
-          },
-          {
-            label: "Procurement",
-            href: "/dashboard/procurement",
-            icon: <Package />,
-            permission: FREIGHT_PERMS.fleet.view,
-          },
-          {
-            label: "Financial Reports",
-            href: "/dashboard/financial-reports",
-            icon: <Wallet />,
-            permission: FREIGHT_PERMS.fleetReports.view,
-          },
-          // {
-          //   label: "Containers",
-          //   href: "/dashboard/containers",
-          //   icon: <Container />,
-          // },
-          // {
-          //   label: "Cargoes",
-          //   href: "/dashboard/cargoes",
-          //   icon: <Package />,
-          // },
-        ],
-      },
-      {
-        label: "Imports",
-        href: "/dashboard/import-warehouse",
-        icon: <PackageOpen />,
-        permission: FREIGHT_PERMS.warehouseInventory.view,
-        children: [
-          {
-            label: "Import Overview",
-            href: "/dashboard/import-warehouse",
-            icon: <PackageOpen />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Arrival Queue",
-            href: "/dashboard/arrival-queue",
-            icon: <PackageOpen />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Import Trucks",
-            href: "/dashboard/import-trucks",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "EDR Last Mile Returns",
-            href: "/dashboard/edr-last-mile-returns",
-            icon: <Container />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Container Returns",
-            href: "/dashboard/container-returns",
-            icon: <Container />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Terminal Inventory",
-            href: "/dashboard/warehouse-inventory?direction=IMPORT",
-            icon: <Package />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Inventory Inquiry",
-            href: "/dashboard/inventory-inquiry",
-            icon: <Boxes />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-        ],
-      },
-      {
-        label: "Exports",
-        href: "/dashboard/export-warehouse",
-        icon: <Truck />,
-        permission: FREIGHT_PERMS.warehouseInventory.view,
-        children: [
-          {
-            label: "Export Overview",
-            href: "/dashboard/export-warehouse",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Loading Queue",
-            href: "/dashboard/loading-queue",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Loaded Inventory",
-            href: "/dashboard/loaded-inventory",
-            icon: <PackageCheck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Dispatch Queue",
-            href: "/dashboard/dispatch-queue",
-            icon: <Send />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Djibouti Unloading",
-            href: "/dashboard/export-djibouti-unloading",
-            icon: <PackageOpen />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Interchange Documents",
-            href: "/dashboard/interchange-documents",
-            icon: <FileText />,
-            permission: FREIGHT_PERMS.interchangeDocuments.view,
-          },
-          {
-            label: "Terminal Inventory",
-            href: "/dashboard/warehouse-inventory?direction=EXPORT",
-            icon: <Package />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-        ],
-      },
-      {
-        label: "Intercity",
-        href: "/dashboard/intercity",
-        icon: <TrainFront />,
-        permission: FREIGHT_PERMS.trainScheduling.view,
-        children: [
-          {
-            label: "Intercity Cargo",
-            href: "/dashboard/intercity",
-            icon: <TrainFront />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-        ],
-      },
-      {
-        label: "Warehouse Management",
-        icon: <Container />,
-        children: [
-          {
-            label: "Warehouse Dashboard",
-            href: "/dashboard/warehouse-dashboard",
-            icon: <LayoutDashboard />,
-            permission: FREIGHT_PERMS.warehouseDashboard.view,
-          },
-          {
-            // Yard-wide, not per-direction: the gate sees import and export
-            // trucks at the same barrier.
-            label: "Trucks on Site",
-            href: "/dashboard/trucks-on-site",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Warehouses",
-            href: "/dashboard/warehouses",
-            icon: <Container />,
-            permission: FREIGHT_PERMS.warehouses.view,
-          },
-          {
-            label: "Allocation & Fees",
-            href: "/dashboard/warehouse-rules",
-            icon: <SlidersHorizontal />,
-            permission: [
-              FREIGHT_PERMS.warehouseAllocationRules.view,
-              FREIGHT_PERMS.warehouseFeeRules.view,
-            ],
-          },
-          {
-            label: "Fee Invoices",
-            href: "/dashboard/warehouse-fee-invoices",
-            icon: <Wallet />,
-            permission: FREIGHT_PERMS.warehouseFeeInvoices.view,
-          },
-        ],
-      },
-    ],
-  },
-  {
-    title: "Freight configuration",
-    mutedTitle: true,
-    items: [
-      {
-        label: "File settings",
-        href: "/dashboard/file-settings",
-        icon: <Paperclip />,
-        permission: FREIGHT_PERMS.admin,
-      },
-      {
-        label: "Dropdown settings",
-        href: "/dashboard/dropdown-settings",
-        icon: <Settings />,
-        permission: FREIGHT_PERMS.admin,
-      },
-      {
-        label: "Contract templates",
-        href: "/dashboard/contract-templates",
-        icon: <ScrollText />,
-        permission: FREIGHT_PERMS.admin,
-      },
-      {
-        label: "Audit logs",
-        href: "/dashboard/audit-logs",
-        icon: <History />,
-        permission: FREIGHT_PERMS.audit.view,
-      },
-      {
-        label: "Configuration",
-        href: "/dashboard/configuration",
-        icon: <Boxes />,
-        children: [
-          ...getCategorySidebarChildren("configuration"),
-          {
-            label: "Train scheduling rules",
-            href: "/dashboard/configuration/train-scheduling-rules",
-            permission: FREIGHT_PERMS.trainScheduling.rulesManage,
-          },
-          {
-            label: "Trade access",
-            href: "/dashboard/configuration/trade-access",
-            permission: FREIGHT_PERMS.admin,
-          },
-          {
-            label: "Exchange rate",
-            href: "/dashboard/configuration/exchange-rate",
-            permission: FREIGHT_PERMS.admin,
-          },
-        ],
-      },
-      {
-        label: "Rules",
-        href: "/dashboard/rules",
-        icon: <SlidersHorizontal />,
-        children: getCategorySidebarChildren("rules"),
-      },
-
-      {
-        label: "Staff",
-        href: "/user-management",
-        icon: <Users />,
-        permission: [
-          FREIGHT_PERMS.admin,
-          FREIGHT_PERMS.staff.roles.view,
-          FREIGHT_PERMS.staff.employeeRegistration.view,
-          FREIGHT_PERMS.staff.roleAssignment.view,
-        ],
-      },
-    ],
-  },
-];
-
-/** Hrefs of the two document-clearance menu items (stable identifiers). */
-const ET_CLEARANCE_HREF = "/dashboard/contracts/clearance";
-const DJ_CLEARANCE_HREF = "/dashboard/gl-djibouti/clearance";
-
-// Routes a GL officer may reach beyond their clearance hub. Path B booking is
-// part of their job (create/rebook under a cleared contract, then view that
-// booking's clearance), but those routes live outside the clearance prefix —
-// without this allowlist the single-prefix lock bounces them out of their own
-// workflow. Matched against location.pathname (no query string).
-const GL_WORKFLOW_PATH_PATTERNS: RegExp[] = [
-  /^\/dashboard\/contracts\/[^/]+\/create-booking(\/|$)/,
-  /^\/dashboard\/bookings\/[^/]+\/clearance(\/|$)/,
-];
-
-const isEtClearanceItem = (item: SidebarItem): boolean =>
-  item.href === ET_CLEARANCE_HREF;
-const isDjClearanceItem = (item: SidebarItem): boolean =>
-  item.href === DJ_CLEARANCE_HREF;
-const isClearanceItem = (item: SidebarItem): boolean =>
-  isEtClearanceItem(item) || isDjClearanceItem(item);
-
-/**
- * Keep only items the user is permitted to see; drop now-empty sections.
- *
- * Position-scoped visibility (super_admin sees everything):
- * - Super Admin → sees all items (all permissions pass, all tabs visible)
- * - Ethiopian GL  → sees ONLY the ET document-clearance page.
- * - Djibouti GL   → sees ONLY the DJ clearance page.
- * - Everyone else → sees everything they have permission for, EXCEPT the two
- *   clearance pages (those are GL-only).
- */
-const filterSidebarByPermission = (
-  sections: SidebarSection[],
-  user: ReturnType<typeof useAuth>["user"],
-): SidebarSection[] => {
-  // Superadmin sees every section and item — no permission filtering.
-  if (isSuperAdmin(user)) return sections;
-
-  const etGl = isEthiopianGl(user);
-  const djGl = isDjiboutiGl(user);
-
-  const permissionAllowed = (item: SidebarItem): boolean => {
-    if (!item.permission) return true;
-    const keys = Array.isArray(item.permission)
-      ? item.permission
-      : [item.permission];
-    return keys.some((key) => hasFreightPermission(user, key));
-  };
-
-  // Recursive: children are filtered first; a group (item with children) stays
-  // only while it still has visible children — so parents without their own
-  // permission key never leak a whole subtree the user cannot open.
-  const filterItems = (items: SidebarItem[]): SidebarItem[] =>
-    items
-      .map((item) =>
-        item.children
-          ? { ...item, children: filterItems(item.children) }
-          : item,
-      )
-      .filter((item) => {
-        if (etGl || djGl) {
-          // GL positions are locked to their single clearance page (parents
-          // survive only as the path to that page).
-          const isTarget = etGl ? isEtClearanceItem : isDjClearanceItem;
-          return isTarget(item) || (item.children?.length ?? 0) > 0;
-        }
-        // Everyone else: hide the GL-only clearance pages entirely.
-        if (isClearanceItem(item)) return false;
-        if (!permissionAllowed(item)) return false;
-        if (item.children) return item.children.length > 0;
-        return true;
-      });
-
-  return sections
-    .map((section) => ({
-      ...section,
-      items: filterItems(section.items),
-    }))
-    .filter((section) => section.items.length > 0);
-};
-
-const APP_TITLE = "EDR Freight Backoffice";
-
-/** Flatten sidebar sections (incl. nested children) into {href, label} pairs. */
-const flattenSidebarItems = (
-  sections: SidebarSection[],
-): { href: string; label: string }[] =>
-  sections.flatMap((section) =>
-    section.items.flatMap((item) => [
-      ...(item.href ? [{ href: item.href, label: item.label }] : []),
-      ...(item.children ?? [])
-        .filter((child): child is SidebarItem & { href: string } =>
-          Boolean(child.href),
-        )
-        .map((child) => ({ href: child.href, label: child.label })),
-    ]),
-  );
-
-/** Find the sidebar label whose href matches (exactly or as a prefix of) the current path. */
-const findActiveSidebarLabel = (
-  pathname: string,
-  sections: SidebarSection[],
-): string | undefined => {
-  const path = pathname.toLowerCase();
-  const candidates = flattenSidebarItems(sections)
-    .map(({ href, label }) => ({
-      label,
-      href: href.split("?")[0].toLowerCase(),
-    }))
-    .sort((a, b) => b.href.length - a.href.length);
-
-  return candidates.find(
-    ({ href }) => path === href || path.startsWith(`${href}/`),
-  )?.label;
-};
+import {
+  APP_TITLE,
+  buildSidebarSections,
+  filterSidebarByPermission,
+  findActiveSidebarLabel,
+} from "@/components/layout/sidebar-sections";
 
 const DashboardShell = () => {
   const navigate = useNavigate();
@@ -764,18 +130,6 @@ const DashboardShell = () => {
   );
   const displayName = user?.name?.en || user?.username || user?.email || "User";
 
-  // GL positions are locked to their single clearance page: if they navigate
-  // (or deep-link) anywhere else, send them back to their clearance hub.
-  // Super admin is exempt. Allow the clearance path + its detail sub-routes.
-  const superAdmin = isSuperAdmin(user);
-  const glClearanceHome = !superAdmin
-    ? isEthiopianGl(user)
-      ? ET_CLEARANCE_HREF
-      : isDjiboutiGl(user)
-        ? DJ_CLEARANCE_HREF
-        : null
-    : null;
-
   useEffect(() => {
     const activeLabel = findActiveSidebarLabel(
       location.pathname,
@@ -784,23 +138,11 @@ const DashboardShell = () => {
     document.title = activeLabel ? `${activeLabel} | ${APP_TITLE}` : APP_TITLE;
   }, [location.pathname, sidebarSections]);
 
-  if (
-    glClearanceHome &&
-    !location.pathname.startsWith(glClearanceHome) &&
-    !GL_WORKFLOW_PATH_PATTERNS.some((re) => re.test(location.pathname))
-  ) {
-    return <Navigate to={glClearanceHome} replace />;
-  }
-
   return (
     <FreightDashboardLayout
       sidebarSections={sidebarSections}
-      // GL Ethiopia / GL Djibouti are locked to a single clearance page — no
-      // sidebar (or mobile burger) at all; the page renders full width.
-      hideSidebar={Boolean(glClearanceHome)}
       activeHref={location.pathname}
       onNavigate={navigate}
-      enableThemeToggle
       userName={displayName}
       userEmail={user?.email}
       onLogout={logout}
@@ -830,38 +172,44 @@ const App = () => {
     );
   }
 
+  const landingPath = resolveLandingPath(user);
+
   return (
     <Routes>
       {UserManagementRoutes()}
       {/* <Route path="/um/*" element={<UserManagementHostPage />} /> */}
       <Route path="/health" element={<HealthCheck />} />
       <Route path="/fayda/callback" element={<FaydaCallbackPage />} />
-      <Route path="/" element={<Navigate to="/dashboard/overview" replace />} />
-      <Route
-        path="/dashboard"
-        element={<Navigate to="/dashboard/overview" replace />}
-      />
+      <Route path={NO_ACCESS_PATH} element={<NoAccessPage />} />
+      {/* Landing is per-user: /dashboard/overview is gated on overview:view, so
+          a fixed target strands anyone without that key on a blank page. */}
+      <Route path="/" element={<Navigate to={landingPath} replace />} />
+      <Route path="/dashboard" element={<Navigate to={landingPath} replace />} />
       <Route path="/dashboard" element={<DashboardShell />}>
-        <Route path="overview" element={<OverviewPage />} />
-        <Route path="reports" element={<ReportsHubPage />} />
-        <Route path="reports/:reportKey" element={<ReportPage />} />
+        <Route path="overview" element={<RequirePermission permission={FREIGHT_PERMS.overview.view}><OverviewPage /></RequirePermission>} />
+        <Route path="reports" element={<RequirePermission permission={FREIGHT_PERMS.reports.view}><ReportsHubPage /></RequirePermission>} />
+        <Route path="reports/:reportKey" element={<RequirePermission permission={FREIGHT_PERMS.reports.view}><ReportPage /></RequirePermission>} />
         {/* Dev/testing page for the mock AI booking assistant. */}
         <Route
           path="ai-booking-mock-test"
-          element={<AiBookingMockTestPage />}
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+              <AiBookingMockTestPage />
+            </RequirePermission>
+          }
         />
         <Route path="profile" element={<MyProfilePage />} />
 
-        <Route path="booking-requests" element={<BookingRequestsPage />} />
+        <Route path="booking-requests" element={<RequirePermission permission={FREIGHT_PERMS.bookings.view}><BookingRequestsPage /></RequirePermission>} />
         <Route
           path="payments"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+            <RequirePermission permission={FREIGHT_PERMS.payments.view}>
               <PaymentsPage />
             </RequirePermission>
           }
         />
-        <Route path="support" element={<SupportInboxPage />} />
+        <Route path="support" element={<RequirePermission permission={FREIGHT_PERMS.support.agentView}><SupportInboxPage /></RequirePermission>} />
         <Route
           path="customers"
           element={
@@ -881,27 +229,53 @@ const App = () => {
         <Route
           path="invoices"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+            <RequirePermission permission={FREIGHT_PERMS.invoices.view}>
               <InvoicesPage />
             </RequirePermission>
           }
         />
+        <Route
+          path="usd-payments"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.invoices.view}>
+              <UsdPaymentsPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="invoices/:id"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+            <RequirePermission permission={FREIGHT_PERMS.invoices.view}>
               <InvoiceDetailPage />
             </RequirePermission>
           }
         />
-        <Route path="booking-requests/new" element={<NewBookingPage />} />
+        <Route path="booking-requests/new" element={<RequirePermission permission={FREIGHT_PERMS.bookings.view}><NewBookingPage /></RequirePermission>} />
+        <Route
+          path="wagon-cancellations"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.bookings.wagonCancellationView}
+            >
+              <WagonCancellationsPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="booking-requests/:id"
-          element={<BookingRequestDetailPage />}
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+              <BookingRequestDetailPage />
+            </RequirePermission>
+          }
         />
         <Route
           path="booking-requests/:id/contract"
-          element={<BookingContractPage />}
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+              <BookingContractPage />
+            </RequirePermission>
+          }
         />
         {/* Legacy booking-based clearance URLs → the contract clearance hub. */}
         <Route
@@ -1089,44 +463,25 @@ const App = () => {
           path="bookings/:id/milestones"
           element={<BookingMilestonesRedirect />}
         />
-        <Route path="warehouses" element={<WarehouseListPage />} />
-        <Route path="warehouses/:id" element={<WarehouseDetailPage />} />
-        <Route
-          path="warehouse-inventory"
-          element={<WarehouseInventoryPage />}
-        />
-        <Route path="import-warehouse" element={<ImportWarehouseFlowPage />} />
-        <Route path="export-warehouse" element={<ExportWarehouseFlowPage />} />
-        <Route path="arrival-queue" element={<ArrivalQueuePage />} />
-        <Route path="loading-queue" element={<LoadingQueuePage />} />
-        <Route path="intercity" element={<IntercityPage />} />
-        <Route path="trucks-on-site" element={<TrucksOnSitePage />} />
-        <Route path="import-trucks" element={<ImportTrucksPage />} />
-        <Route
-          path="edr-last-mile-returns"
-          element={<EDRLastMileReturnsPage />}
-        />
-        <Route path="container-returns" element={<ContainerReturnsPage />} />
-        <Route path="loaded-inventory" element={<LoadedInventoryPage />} />
-        <Route path="dispatch-queue" element={<DispatchQueuePage />} />
-        <Route
-          path="export-djibouti-unloading"
-          element={<ExportDjiboutiUnloadingQueuePage />}
-        />
-        <Route
-          path="interchange-documents"
-          element={<InterchangeDocumentsPage />}
-        />
-        <Route path="inventory-inquiry" element={<InventoryInquiryPage />} />
-        <Route path="warehouse-rules" element={<WarehouseRulesPage />} />
-        <Route
-          path="warehouse-fee-invoices"
-          element={<WarehouseInvoicesPage />}
-        />
-        <Route
-          path="warehouse-dashboard"
-          element={<WarehouseDashboardPage />}
-        />
+        <Route path="warehouses" element={<RequirePermission permission={FREIGHT_PERMS.warehouses.view}><WarehouseListPage /></RequirePermission>} />
+        <Route path="warehouses/:id" element={<RequirePermission permission={FREIGHT_PERMS.warehouses.view}><WarehouseDetailPage /></RequirePermission>} />
+        <Route path="warehouse-inventory" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><WarehouseInventoryPage /></RequirePermission>} />
+        <Route path="import-warehouse" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ImportWarehouseFlowPage /></RequirePermission>} />
+        <Route path="export-warehouse" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ExportWarehouseFlowPage /></RequirePermission>} />
+        <Route path="arrival-queue" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ArrivalQueuePage /></RequirePermission>} />
+        <Route path="loading-queue" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><LoadingQueuePage /></RequirePermission>} />
+        <Route path="intercity" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><IntercityPage /></RequirePermission>} />
+        <Route path="trucks-on-site" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><TrucksOnSitePage /></RequirePermission>} />
+        <Route path="import-trucks" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ImportTrucksPage /></RequirePermission>} />
+        <Route path="container-returns" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ContainerReturnsPage /></RequirePermission>} />
+        <Route path="loaded-inventory" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><LoadedInventoryPage /></RequirePermission>} />
+        <Route path="dispatch-queue" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><DispatchQueuePage /></RequirePermission>} />
+        <Route path="export-djibouti-unloading" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ExportDjiboutiUnloadingQueuePage /></RequirePermission>} />
+        <Route path="interchange-documents" element={<RequirePermission permission={FREIGHT_PERMS.interchangeDocuments.view}><InterchangeDocumentsPage /></RequirePermission>} />
+        <Route path="inventory-inquiry" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><InventoryInquiryPage /></RequirePermission>} />
+        <Route path="warehouse-rules" element={<RequirePermission permission={[FREIGHT_PERMS.warehouseAllocationRules.view, FREIGHT_PERMS.warehouseFeeRules.view]}><WarehouseRulesPage /></RequirePermission>} />
+        <Route path="warehouse-fee-invoices" element={<RequirePermission permission={FREIGHT_PERMS.warehouseFeeInvoices.view}><WarehouseInvoicesPage /></RequirePermission>} />
+        <Route path="warehouse-dashboard" element={<RequirePermission permission={FREIGHT_PERMS.warehouseDashboard.view}><WarehouseDashboardPage /></RequirePermission>} />
 
         <Route
           path="operations/train-scheduling"
@@ -1193,9 +548,7 @@ const App = () => {
         <Route
           path="routes"
           element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.routes.view}>
               <RoutesPage />
             </RequirePermission>
           }
@@ -1203,12 +556,7 @@ const App = () => {
         <Route
           path="locomotives"
           element={
-            <RequirePermission
-              permission={[
-                FREIGHT_PERMS.locomotives.view,
-                FREIGHT_PERMS.fleet.view,
-              ]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.locomotives.view}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1216,9 +564,7 @@ const App = () => {
         <Route
           path="trains"
           element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.trains.view}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1226,9 +572,7 @@ const App = () => {
         <Route
           path="trains/:id"
           element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.trains.view}>
               <TrainDetailPage />
             </RequirePermission>
           }
@@ -1236,9 +580,7 @@ const App = () => {
         <Route
           path="train-builder"
           element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.trains.view}>
               <TrainBuilderListPage />
             </RequirePermission>
           }
@@ -1246,9 +588,7 @@ const App = () => {
         <Route
           path="train-builder/:id"
           element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.trains.view}>
               <TrainBuilderDetailPage />
             </RequirePermission>
           }
@@ -1256,9 +596,7 @@ const App = () => {
         <Route
           path="wagons"
           element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.wagons.view}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1279,12 +617,7 @@ const App = () => {
         <Route
           path="containers"
           element={
-            <RequirePermission
-              permission={[
-                FREIGHT_PERMS.containers.view,
-                FREIGHT_PERMS.fleet.view,
-              ]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.containers.view}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1292,12 +625,7 @@ const App = () => {
         <Route
           path="cargoes"
           element={
-            <RequirePermission
-              permission={[
-                FREIGHT_PERMS.cargoes.view,
-                FREIGHT_PERMS.fleet.view,
-              ]}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.cargoes.view}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1334,62 +662,6 @@ const App = () => {
             </RequirePermission>
           }
         />
-        <Route
-          path="operations/train-scheduling"
-          element={
-            <Navigate to="/dashboard/operations/train-scheduling-v2" replace />
-          }
-        />
-        <Route
-          path="operations/batch-board"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-              <BatchBoardPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="operations/batch-board/:scheduleId"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-              <BatchScheduleDetailPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="operations/train-scheduling-v2"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-              <TrainScheduleV2ListPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="operations/train-scheduling-v2/:scheduleId"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-              <TrainScheduleV2DetailPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="operations/train-scheduling-v2/:scheduleId/track"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.trainScheduling.view}>
-              <TrainScheduleTrackPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="routes"
-          element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}
-            >
-              <RoutesPage />
-            </RequirePermission>
-          }
-        />
         <Route
           path="fuel-purchases"
           element={
@@ -1441,7 +713,7 @@ const App = () => {
         <Route
           path="compliance"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={FREIGHT_PERMS.compliance.view}>
               <CompliancePage />
             </RequirePermission>
           }
@@ -1465,113 +737,11 @@ const App = () => {
         <Route
           path="procurement"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={FREIGHT_PERMS.procurement.view}>
               <ProcurementPage />
             </RequirePermission>
           }
         />
-        <Route
-          path="locomotives"
-          element={
-            <RequirePermission
-              permission={[
-                FREIGHT_PERMS.locomotives.view,
-                FREIGHT_PERMS.fleet.view,
-              ]}
-            >
-              <FleetResourcePage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="trains"
-          element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
-              <FleetResourcePage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="trains/:id"
-          element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
-              <TrainDetailPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="train-builder"
-          element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
-              <TrainBuilderListPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="train-builder/:id"
-          element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}
-            >
-              <TrainBuilderDetailPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="wagons"
-          element={
-            <RequirePermission
-              permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}
-            >
-              <FleetResourcePage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="wagon-transfers"
-          element={
-            <RequirePermission
-              permission={[
-                FREIGHT_PERMS.wagons.transferView,
-                FREIGHT_PERMS.wagons.view,
-              ]}
-            >
-              <WagonTransfersPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="containers"
-          element={
-            <RequirePermission
-              permission={[
-                FREIGHT_PERMS.containers.view,
-                FREIGHT_PERMS.fleet.view,
-              ]}
-            >
-              <FleetResourcePage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="cargoes"
-          element={
-            <RequirePermission
-              permission={[
-                FREIGHT_PERMS.cargoes.view,
-                FREIGHT_PERMS.fleet.view,
-              ]}
-            >
-              <FleetResourcePage />
-            </RequirePermission>
-          }
-        />
 
         {/* Legacy embedded user management routes */}
         {/* <Route path="user-management" element={<UserManagementPage />} />
@@ -1590,7 +760,7 @@ const App = () => {
         <Route
           path="file-settings"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.admin}>
+            <RequirePermission permission={FREIGHT_PERMS.settings.fileUpload.view}>
               <FileUploadSettingsPage />
             </RequirePermission>
           }
@@ -1598,7 +768,7 @@ const App = () => {
         <Route
           path="dropdown-settings"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.admin}>
+            <RequirePermission permission={FREIGHT_PERMS.settings.dropdown.view}>
               <DropdownSettingsPage />
             </RequirePermission>
           }
@@ -1614,7 +784,9 @@ const App = () => {
         <Route
           path="contract-templates"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.admin}>
+            <RequirePermission
+              permission={FREIGHT_PERMS.settings.contractTemplates.view}
+            >
               <ContractTemplatesPage />
             </RequirePermission>
           }
@@ -1622,11 +794,26 @@ const App = () => {
         <Route
           path="contract-templates/:code"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.admin}>
+            <RequirePermission
+              permission={FREIGHT_PERMS.settings.contractTemplates.view}
+            >
               <ContractTemplateEditorPage />
             </RequirePermission>
           }
         />
+        <Route
+          path="portal-content"
+          element={
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.settings.supportContent.view,
+                FREIGHT_PERMS.settings.supportContent.manage,
+              ]}
+            >
+              <PortalContentPage />
+            </RequirePermission>
+          }
+        />
 
         <Route
           path="configuration"
@@ -1645,7 +832,7 @@ const App = () => {
         <Route
           path="configuration/trade-access"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.admin}>
+            <RequirePermission permission={FREIGHT_PERMS.tradeAccess.view}>
               <TradeAccessPage />
             </RequirePermission>
           }
@@ -1653,7 +840,7 @@ const App = () => {
         <Route
           path="configuration/exchange-rate"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.admin}>
+            <RequirePermission permission={FREIGHT_PERMS.settings.exchangeRate.view}>
               <div className="p-4">
                 <ExchangeRateSettingsCard />
               </div>
@@ -1698,7 +885,9 @@ const App = () => {
         <Route path="org-structure/*" element={<Navigate to="/um" replace />} />
       </Route>
 
-      <Route path="*" element={<Navigate to="/dashboard/overview" replace />} />
+      {/* Post-login landing: the browser is still on /auth, which matches
+          nothing here, so this is what actually decides where users start. */}
+      <Route path="*" element={<Navigate to={landingPath} replace />} />
     </Routes>
   );
 };
@@ -1719,3 +908,4 @@ function LegacyGlEthiopiaClearanceRedirect() {
 }
 
 export default App;
+
diff --git a/apps/edr-freight-web/backoffice/src/auth/types.ts b/apps/edr-freight-web/backoffice/src/auth/types.ts
index a361c2abc..44fa4e595 100644
--- a/apps/edr-freight-web/backoffice/src/auth/types.ts
+++ b/apps/edr-freight-web/backoffice/src/auth/types.ts
@@ -23,7 +23,13 @@ interface AuthEmployeePosition {
   permissions?: AuthPermission[];
   /** Some IAM payloads nest the position record instead of flattening its key. */
   position?: { id?: string; key?: string; name?: LocaleText };
-  positionType?: { id?: string; key?: string; name?: LocaleText } | null;
+  positionType?: {
+    id?: string;
+    key?: string;
+    name?: LocaleText;
+    /** Grants held by the TYPE — where admin-created positions keep theirs. */
+    permissions?: AuthPermission[];
+  } | null;
 }
 
 interface AuthEmployeeRecord {
diff --git a/apps/edr-freight-web/backoffice/src/components/auth/RequirePermission.tsx b/apps/edr-freight-web/backoffice/src/components/auth/RequirePermission.tsx
index 4e35fc712..c67a4da69 100644
--- a/apps/edr-freight-web/backoffice/src/components/auth/RequirePermission.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/auth/RequirePermission.tsx
@@ -1,30 +1,42 @@
 import type { ReactNode } from "react";
-import { Navigate } from "react-router-dom";
+import { Navigate, useLocation } from "react-router-dom";
 
 import { useAuth } from "@/auth/useAuth";
+import { resolveLandingPath } from "@/lib/landing";
 import { hasPermission } from "@/lib/permissions";
+import NoAccessPage from "@/pages/NoAccessPage";
 
 interface RequirePermissionProps {
   /** Permission key(s); access is granted if the user has ANY of them. */
   permission: string | string[];
-  /** Where to send users who lack the permission. */
+  /** Where to send users who lack the permission. Defaults to their landing page. */
   redirectTo?: string;
   children: ReactNode;
 }
 
 /**
  * Page-level guard: renders children only when the current user holds one of
- * the given permissions, otherwise redirects (default: overview).
+ * the given permissions, otherwise redirects to a page they can actually reach.
+ *
+ * The fallback must not be a fixed path. It used to be `/dashboard/overview`,
+ * which is itself gated on `overview:view` — a user without that key was sent
+ * to the page that had just rejected them, and React Router rendered a blank
+ * frame instead of navigating.
  */
 export function RequirePermission({
   permission,
-  redirectTo = "/dashboard/overview",
+  redirectTo,
   children,
 }: RequirePermissionProps) {
   const { user } = useAuth();
+  const location = useLocation();
   const keys = Array.isArray(permission) ? permission : [permission];
   const allowed = keys.some((key) => hasPermission(user, key));
 
-  if (!allowed) return <Navigate to={redirectTo} replace />;
-  return <>{children}</>;
+  if (allowed) return <>{children}</>;
+
+  const target = redirectTo ?? resolveLandingPath(user);
+  // Belt and braces: never navigate to the page we are already on.
+  if (target === location.pathname) return <NoAccessPage />;
+  return <Navigate to={target} replace />;
 }
diff --git a/apps/edr-freight-web/backoffice/src/components/bookings/BookingPricingSummary.tsx b/apps/edr-freight-web/backoffice/src/components/bookings/BookingPricingSummary.tsx
index 6c5dd9b07..814fb9a95 100644
--- a/apps/edr-freight-web/backoffice/src/components/bookings/BookingPricingSummary.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/bookings/BookingPricingSummary.tsx
@@ -19,7 +19,10 @@ export function BookingPricingSummary({ booking }: { booking: BookingDetail }) {
   const lineItems = booking.pricingBreakdown?.lineItems ?? [];
 
   const fmt = (n: number) =>
-    `${booking.paymentCurrency} ${n.toLocaleString(undefined, { minimumFractionDigits: 2 })}`;
+    `${booking.paymentCurrency} ${n.toLocaleString(undefined, {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2,
+    })}`;
 
   return (
     <SectionCard icon={Banknote} title="Pricing & payment">
@@ -74,7 +77,11 @@ export function BookingPricingSummary({ booking }: { booking: BookingDetail }) {
                     {li.description}
                   </Text>
                   <Text size="sm" fw={600} style={{ fontVariantNumeric: "tabular-nums" }}>
-                    {Number(li.amount).toLocaleString()} {li.currency}
+                    {Number(li.amount).toLocaleString(undefined, {
+                      minimumFractionDigits: 2,
+                      maximumFractionDigits: 2,
+                    })}{" "}
+                    {li.currency}
                   </Text>
                 </Group>
               ))}
diff --git a/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingFactsCard.tsx b/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingFactsCard.tsx
index 15e81bd42..f9f8d1414 100644
--- a/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingFactsCard.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingFactsCard.tsx
@@ -1,6 +1,6 @@
 import type { LucideIcon } from "lucide-react";
 import type { ReactNode } from "react";
-import { Hash, Package, Ship, Weight, Clock } from "lucide-react";
+import { Hash, Package, Ship, Weight, Clock, TrainFront } from "lucide-react";
 import { Group, Stack, Text, Divider } from "@mantine/core";
 
 import { cargoTonsAndItems } from "@/utils/cargoWeight";
@@ -50,6 +50,21 @@ export function BookingFactsCard({ booking }: BookingFactsCardProps) {
     },
     { icon: Clock, label: "Last Updated", value: formatDate(booking.updatedAt) },
   ];
+  // Allocated train facts — only once the booking rides a schedule.
+  if (booking.trainSchedule?.trainNumber || booking.trainSchedule?.reference) {
+    facts.splice(1, 0, {
+      icon: TrainFront,
+      label: "Allocated Train",
+      value: [
+        booking.trainSchedule.trainNumber
+          ? `Train ${booking.trainSchedule.trainNumber}`
+          : null,
+        booking.trainSchedule.reference ?? null,
+      ]
+        .filter(Boolean)
+        .join(" · "),
+    });
+  }
 
   return (
     <SectionCard icon={Hash} title="Booking Details" accent="cyan">
diff --git a/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingTrucksPanel.tsx b/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingTrucksPanel.tsx
index 4427367cb..65c9719ed 100644
--- a/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingTrucksPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/bookings/detail/BookingTrucksPanel.tsx
@@ -11,7 +11,10 @@ import { SectionCard } from "./SectionCard";
 import { MetricTile } from "./MetricTile";
 
 const money = (amount: number, currency: string) =>
-  `${Number(amount).toLocaleString()} ${currency === "ETB" ? "Birr (ETB)" : currency}`;
+  `${Number(amount).toLocaleString(undefined, {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+  })} ${currency === "ETB" ? "Birr (ETB)" : currency}`;
 
 /**
  * Cargo costs (booking-level totals) plus the same truck-import block the
diff --git a/apps/edr-freight-web/backoffice/src/components/bookings/detail/booking-detail.styles.ts b/apps/edr-freight-web/backoffice/src/components/bookings/detail/booking-detail.styles.ts
index d3d3e3bc1..c32ab38b2 100644
--- a/apps/edr-freight-web/backoffice/src/components/bookings/detail/booking-detail.styles.ts
+++ b/apps/edr-freight-web/backoffice/src/components/bookings/detail/booking-detail.styles.ts
@@ -144,4 +144,10 @@ export interface BookingDetailView {
   bookingContainers?: BookingContainerView[];
   reviewNotes?: BookingReviewNoteView[];
   files?: BookingFileView[];
+  /** The allocated train, present once the booking is placed on a schedule. */
+  trainSchedule?: {
+    trainNumber: string | null;
+    reference: string | null;
+    scheduledDepartureDate: string | null;
+  } | null;
 }
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/BookingChangesRequestedAlert.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/BookingChangesRequestedAlert.tsx
index 16b1ab602..f3b56a464 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/BookingChangesRequestedAlert.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/BookingChangesRequestedAlert.tsx
@@ -1,6 +1,6 @@
 import { Alert, Button, Group, Paper, Stack, Text } from "@mantine/core";
 import { DateInput } from "@mantine/dates";
-import { AlertTriangle, Send } from "lucide-react";
+import { AlertTriangle, Pencil, Send } from "lucide-react";
 import { useState } from "react";
 import { Link } from "react-router-dom";
 import toast from "react-hot-toast";
@@ -16,6 +16,9 @@ export interface BookingChangesRequestedAlertProps {
   scheduledDate?: string | null;
   /** GL Ethiopia owns customs bookings, so only they get the resubmit control. */
   canResubmit: boolean;
+  /** Completion-form route for editing the cargo before resubmitting —
+   *  rendered only for resubmit-capable users when provided. */
+  editHref?: string;
   onResubmitted?: () => void;
 }
 
@@ -33,6 +36,7 @@ export function BookingChangesRequestedAlert({
   note,
   scheduledDate,
   canResubmit,
+  editHref,
   onResubmitted,
 }: BookingChangesRequestedAlertProps) {
   const [day, setDay] = useState<Date | null>(
@@ -122,6 +126,18 @@ export function BookingChangesRequestedAlert({
             >
               Resubmit to Operations
             </Button>
+            {editHref ? (
+              <Button
+                component={Link}
+                to={editHref}
+                variant="default"
+                radius="md"
+                size="sm"
+                leftSection={<Pencil size={15} />}
+              >
+                Edit cargo & resubmit
+              </Button>
+            ) : null}
           </Group>
         ) : null}
       </Stack>
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/ClearanceOpsTabs.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/ClearanceOpsTabs.tsx
index 610fb7e3d..a61646d6f 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/ClearanceOpsTabs.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/ClearanceOpsTabs.tsx
@@ -68,6 +68,8 @@ export function ClearanceOpsTabs({
     Boolean(exchangeEntityId) &&
     (hasPermission(user, FREIGHT_PERMS.contracts.clearanceEtActions) ||
       hasPermission(user, FREIGHT_PERMS.contracts.clearanceDjActions));
+  // Risk assignment + incident reporting hit bookings:operations endpoints.
+  const canOps = hasPermission(user, FREIGHT_PERMS.bookings.operations);
   const hasTabs = (showOpsTabs && hasOps) || showDocuments || showExchange;
 
   if (!hasTabs) {
@@ -98,12 +100,12 @@ export function ClearanceOpsTabs({
             Document exchange
           </Tabs.Tab>
         ) : null}
-        {showOpsTabs && riskMs ? (
+        {showOpsTabs && canOps && riskMs ? (
           <Tabs.Tab value="risk" leftSection={<ShieldAlert size={14} />}>
             Risk assignment
           </Tabs.Tab>
         ) : null}
-        {showOpsTabs && bookingId ? (
+        {showOpsTabs && canOps && bookingId ? (
           <Tabs.Tab value="incidents" leftSection={<AlertTriangle size={14} />}>
             Incidents
           </Tabs.Tab>
@@ -129,7 +131,7 @@ export function ClearanceOpsTabs({
         </Tabs.Panel>
       ) : null}
 
-      {showOpsTabs && riskMs && bookingId ? (
+      {showOpsTabs && canOps && riskMs && bookingId ? (
         <Tabs.Panel value="risk">
           <SectionCard icon={ShieldAlert} title="Customs risk" accent="edr-green">
             <AssignRiskCard bookingId={bookingId} milestone={riskMs} />
@@ -137,7 +139,7 @@ export function ClearanceOpsTabs({
         </Tabs.Panel>
       ) : null}
 
-      {showOpsTabs && bookingId ? (
+      {showOpsTabs && canOps && bookingId ? (
         <Tabs.Panel value="incidents">
           <SectionCard icon={AlertTriangle} title="Incident reports" accent="edr-green">
             <Stack gap="sm">
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/ContractClearanceReviewSection.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/ContractClearanceReviewSection.tsx
index c773933ea..5e2ca9e83 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/ContractClearanceReviewSection.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/ContractClearanceReviewSection.tsx
@@ -41,6 +41,8 @@ import {
   fetchViewableFile,
 } from "@/services/files.service";
 import { useContractClearanceMutations } from "@/hooks/contracts/useContracts";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { useFileViewer } from "@/hooks/useFileViewer";
 
 export interface ContractClearanceReviewSectionProps {
@@ -123,6 +125,21 @@ export function ContractClearanceReviewSection({
   } | null>(null);
   const { view, viewer } = useFileViewer();
 
+  // Mirror the API guards: Path A (self-clearance) actions need
+  // ops_clearance_review; Path B (customs) review needs clearance_review or
+  // the ET phased key. Without the matching key every action would 403 — show
+  // the audit view instead of dead buttons.
+  const { user } = useAuth();
+  const canReviewHere = selfClear
+    ? hasPermission(user, FREIGHT_PERMS.contracts.opsClearanceReview)
+    : hasPermission(user, FREIGHT_PERMS.contracts.clearanceReview) ||
+      hasPermission(user, FREIGHT_PERMS.contracts.clearanceEtActions);
+  // Finalize has its own API key on the customs path (contracts:finalize_clearance).
+  const canFinalizeHere = selfClear
+    ? hasPermission(user, FREIGHT_PERMS.contracts.opsClearanceReview)
+    : hasPermission(user, FREIGHT_PERMS.contracts.finalizeClearance);
+  readOnly = readOnly || !canReviewHere;
+
   const reviewerTeam = selfClear ? "Operations" : "Global Logistics";
 
   const { data: clearance, isLoading } = useQuery({
@@ -484,7 +501,7 @@ export function ContractClearanceReviewSection({
               color="edr-green"
               radius="md"
               leftSection={<CheckCircle2 size={16} />}
-              disabled={!clearance.allApproved}
+              disabled={!clearance.allApproved || !canFinalizeHere}
               loading={finalizeClearance.isPending}
               onClick={() =>
                 finalizeClearance.mutate(undefined, {
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/ExportClearanceStepper.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/ExportClearanceStepper.tsx
index 61f8251c9..f665f388b 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/ExportClearanceStepper.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/ExportClearanceStepper.tsx
@@ -225,7 +225,13 @@ export function ExportClearanceStepper({
 
           <Stepper.Step
             label="Request transit assignee"
-            description="Ask GL Djibouti to name the officer handling this shipment"
+            // Description is the only part of a passed step that stays visible,
+            // so it carries the assigned officer's name for GL Ethiopia.
+            description={
+              clearance.transitAssignee?.name
+                ? `Transit assignee: ${clearance.transitAssignee.name}`
+                : "Ask GL Djibouti to name the officer handling this shipment"
+            }
             icon={
               clearance.transitAssignee?.name ? (
                 <CheckCircle2 size={14} />
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 52f7ee40d..67e84a09f 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
@@ -276,9 +276,8 @@ export default function GlCreateBookingForm() {
   const [trainScheduleId, setTrainScheduleId] = useState("");
   const [contractRouteId, setContractRouteId] = useState<string | null>(null);
   const [notes, setNotes] = useState("");
-  // The customer states the billing currency on their shipment request — GL
-  // books in it. Intercity is always ETB (the API enforces this too).
-  const [paymentCurrency, setPaymentCurrency] = useState<"USD" | "ETB">("USD");
+  // ponytail: ETB-only for now — widen back to "USD" | "ETB" when multi-currency billing returns.
+  const [paymentCurrency, setPaymentCurrency] = useState<"USD" | "ETB">("ETB");
   // What the containers carry — captured per booking (moved off the contract).
   const [cargoDescription, setCargoDescription] = useState("");
   const [containerLines, setContainerLines] = useState<ContainerLineDraft[]>([]);
@@ -349,6 +348,9 @@ export default function GlCreateBookingForm() {
   // Intercity shipments ride a passing import/export train staff pick at
   // finalize time — no shipment day is chosen and no window gate applies.
   const isIntercity = contract?.tradeDirection === "DOMESTIC";
+  // USD billing is offered on import traffic only — export and domestic
+  // shipments are always invoiced in ETB.
+  const isImport = contract?.tradeDirection === "IMPORT";
 
   // ONE_TIME split-remainder mode: a previous booking on this contract was
   // split on train capacity, so the capacity endpoint reports the outstanding
@@ -449,9 +451,6 @@ export default function GlCreateBookingForm() {
     }
     if (bookingRequest.contractRouteId)
       setContractRouteId(bookingRequest.contractRouteId);
-    if (bookingRequest.paymentCurrency === "USD" || bookingRequest.paymentCurrency === "ETB") {
-      setPaymentCurrency(bookingRequest.paymentCurrency);
-    }
     if (bookingRequest.notes) setNotes(bookingRequest.notes);
   }, [bookingRequest, prefilled]);
 
@@ -961,7 +960,7 @@ export default function GlCreateBookingForm() {
   // modal falls back to the contract unit-rate estimate while it loads.
   const validateShipmentMutation = useMutation({
     mutationFn: (dto: Freight.CreateBookingUnderContractDto) =>
-      contractsService.validateShipment(id ?? "", dto),
+      contractsService.validateShipment(id ?? "", dto, completeBookingId),
   });
   const validation = validateShipmentMutation.data ?? null;
 
@@ -1761,16 +1760,15 @@ export default function GlCreateBookingForm() {
               Billing currency
             </Text>
             <Text size="xs" c="dimmed" mb={8}>
-              {isIntercity
-                ? "Intercity shipments are invoiced in ETB."
-                : bookingRequest?.paymentCurrency
-                  ? "Requested by the customer on their shipment request."
-                  : "The contract is quoted in USD — pick the currency this shipment is invoiced in."}
+              {isImport
+                ? "Import shipments may be invoiced in ETB or USD. USD is paid by bank transfer, not online."
+                : "Shipments are invoiced in ETB."}
             </Text>
             <CurrencySelector
               value={isIntercity ? "ETB" : paymentCurrency}
               onChange={setPaymentCurrency}
               disabled={isIntercity}
+              allowUsd={isImport}
             />
           </Box>
 
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/GlUpcomingWindowsSection.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/GlUpcomingWindowsSection.tsx
index ba9e01402..df1a66330 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/GlUpcomingWindowsSection.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/GlUpcomingWindowsSection.tsx
@@ -39,6 +39,8 @@ interface WindowRow {
   windowClosesAt: string | null;
   docReviewEndsAt: string | null;
   paymentPhaseEndsAt: string | null;
+  /** End of the payment drain tail — pending payments may settle until then. */
+  paymentDrainEndsAt?: string | null;
   bookingWindowStatus: string;
   bookingCycleNo: number;
   departureDate: string;
@@ -94,16 +96,29 @@ const COUNTDOWN_TEXT: Partial<
   PRE_WINDOW: { label: "Opens in", expiredText: "Opening now…" },
   OPEN: { label: "Closes in", expiredText: "Review starting…" },
   DOC_REVIEW: { label: "Doc review ends in", expiredText: "Payment starting…" },
-  PAYMENT: { label: "Payment ends in", expiredText: "Closing…" },
+  PAYMENT: { label: "Payment ends in", expiredText: "Finalizing…" },
 };
 
-function phaseCountdown(
-  w: WindowRow,
-): { label: string; deadline: string; expiredText: string } | null {
+function phaseCountdown(w: WindowRow): {
+  label: string;
+  deadline: string;
+  expiredText: string;
+  graceDeadline?: string | null;
+  graceLabel?: string;
+} | null {
   const state = bookingWindowUiState(w);
   const text = COUNTDOWN_TEXT[state.kind];
   if (!state.countdownTo || !text) return null;
-  return { ...text, deadline: state.countdownTo };
+  // Once the pay deadline lapses, pending payments still settle during the
+  // drain tail — count it down as "processing" instead of a stale "closing".
+  const grace =
+    state.kind === "PAYMENT" && w.paymentDrainEndsAt
+      ? {
+          graceDeadline: w.paymentDrainEndsAt,
+          graceLabel: "Processing payments — closes in",
+        }
+      : undefined;
+  return { ...text, deadline: state.countdownTo, ...grace };
 }
 
 /** Badge label + Mantine color per UI state — same state the countdown uses. */
@@ -225,6 +240,8 @@ function WindowCard({ w }: { w: WindowRow }) {
               deadline={cd.deadline}
               label={cd.label}
               expiredText={cd.expiredText}
+              graceDeadline={cd.graceDeadline}
+              graceLabel={cd.graceLabel}
               size="xs"
             />
           </Box>
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 88074735b..926637db2 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx
@@ -357,7 +357,14 @@ export function PhasedClearanceActionPanel({
 
             <Stepper.Step
               label="Request transit assignee"
-              description="Ask GL Djibouti to name the officer handling this shipment"
+              // Once the flow moves past this step its content collapses — the
+              // description is the only slot that stays visible, so it carries
+              // the assigned officer's name for GL Ethiopia.
+              description={
+                clearance.transitAssignee?.name
+                  ? `Transit assignee: ${clearance.transitAssignee.name}`
+                  : "Ask GL Djibouti to name the officer handling this shipment"
+              }
               icon={
                 clearance.transitAssignee?.name ? (
                   <CheckCircle2 size={14} />
diff --git a/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx b/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx
index 196161f92..d86e0079c 100644
--- a/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx
@@ -32,8 +32,6 @@ import { formatDate, humanize } from "./format";
 /** Friendly labels for the proposed-change snapshot keys (UpdateProfileDto). */
 export const FIELD_LABELS: Record<string, string> = {
   companyName: "Company name",
-  companyEmail: "Company email",
-  companyPhone: "Company phone",
   companyLocation: "Location",
   companyAddress: "Address",
   tin: "TIN",
@@ -73,8 +71,6 @@ export function currentValue(company: Company, key: string): string {
   const attrs = (company.attributes ?? {}) as Record<string, unknown>;
   const map: Record<string, unknown> = {
     companyName: c.name,
-    companyEmail: c.email,
-    companyPhone: c.phone,
     companyLocation: c.country,
     companyAddress: c.address,
     tin: c.tin,
@@ -118,7 +114,8 @@ function FaydaIdentityDiff({
   if (!subject) return null;
   const current =
     subject === "owner" ? company.identity?.owner : company.identity?.poa;
-  const read = (key: string) => snapshot[`${subject}${key}`] as string | undefined;
+  const read = (key: string) =>
+    snapshot[`${subject}${key}`] as string | undefined;
   const verifiedAt = read("FaydaVerifiedAt");
   const fields: { label: string; from?: string | null; to?: string }[] = [
     { label: "Name", from: current?.name, to: read("Name") },
@@ -131,7 +128,9 @@ function FaydaIdentityDiff({
     <Stack gap={8}>
       <Group gap={8}>
         <Text size="sm" fw={600} c="edr-text">
-          {subject === "owner" ? "Owner re-verification" : "PoA re-verification"}
+          {subject === "owner"
+            ? "Owner re-verification"
+            : "PoA re-verification"}
         </Text>
         {verifiedAt && (
           <Text size="xs" c="dimmed">
@@ -283,8 +282,8 @@ export function ChangeRequestReview({ company }: { company: Company }) {
                 icon={<AlertTriangle size={16} />}
               >
                 Changes were requested on an earlier round of this same
-                submission: <strong>{pending.note}</strong> — check whether
-                this resubmission actually addresses it before approving.
+                submission: <strong>{pending.note}</strong> — check whether this
+                resubmission actually addresses it before approving.
               </Alert>
             )}
 
@@ -297,8 +296,8 @@ export function ChangeRequestReview({ company }: { company: Company }) {
                     from={currentValue(company, key)}
                     to={
                       pending.snapshot[key] === null ||
-                      pending.snapshot[key] === undefined ||
-                      pending.snapshot[key] === ""
+                        pending.snapshot[key] === undefined ||
+                        pending.snapshot[key] === ""
                         ? "—"
                         : String(pending.snapshot[key])
                     }
@@ -312,7 +311,10 @@ export function ChangeRequestReview({ company }: { company: Company }) {
             ) : null}
 
             {faydaIdentitySnapshot && (
-              <FaydaIdentityDiff company={company} snapshot={faydaIdentitySnapshot} />
+              <FaydaIdentityDiff
+                company={company}
+                snapshot={faydaIdentitySnapshot}
+              />
             )}
 
             {documentChanges.length > 0 && (
@@ -373,9 +375,10 @@ export function ChangeRequestReview({ company }: { company: Company }) {
                       type="button"
                       size="sm"
                       onClick={() =>
-                        void fetchViewableFile(fileId, `Document ${i + 1}`).then(
-                          view,
-                        )
+                        void fetchViewableFile(
+                          fileId,
+                          `Document ${i + 1}`,
+                        ).then(view)
                       }
                     >
                       Document {i + 1}
@@ -446,7 +449,10 @@ export function ChangeRequestReview({ company }: { company: Company }) {
                   variant="light"
                   color="yellow"
                   onClick={() => {
-                    setActionTarget({ id: pending.id, kind: "request-changes" });
+                    setActionTarget({
+                      id: pending.id,
+                      kind: "request-changes",
+                    });
                     setNote("");
                   }}
                 >
@@ -525,7 +531,11 @@ export function ChangeRequestReview({ company }: { company: Company }) {
 }
 
 /** Compact "N changes pending" pill for the customer list/detail header. */
-export function ChangeRequestPendingBadge({ companyId }: { companyId: string }) {
+export function ChangeRequestPendingBadge({
+  companyId,
+}: {
+  companyId: string;
+}) {
   const query = useQuery(
     api.customers.changeRequests.queryOptions({ input: { id: companyId } }),
   );
diff --git a/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx b/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx
index 046493b0f..edcc4a517 100644
--- a/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx
@@ -16,6 +16,7 @@ import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { api } from "@/services/api";
 
 import type {
+  CompanyNationality,
   CompanyProfile,
   CompanyStatus,
   CompanyType,
@@ -88,6 +89,31 @@ export function CompanyTypeBadge({ type }: { type: CompanyType }) {
   );
 }
 
+const NATIONALITY_COLOR: Record<CompanyNationality, string> = {
+  ethiopian: "edr-green",
+  foreign: "blue",
+};
+
+export function CompanyNationalityBadge({
+  nationality,
+}: {
+  nationality?: CompanyNationality | null;
+}) {
+  if (!nationality) return null;
+  return (
+    <Badge
+      color={NATIONALITY_COLOR[nationality] ?? "gray"}
+      variant="light"
+      size="sm"
+      radius="md"
+      fw={600}
+      style={badgeStyle}
+    >
+      {humanize(nationality)}
+    </Badge>
+  );
+}
+
 /**
  * Profile chips for a company row: one chip per role (Importer / Exporter / …)
  * carrying its reference code. Caps at three (a company has at most three
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 1ccd29f41..81f25fcb2 100644
--- a/apps/edr-freight-web/backoffice/src/components/customers/index.ts
+++ b/apps/edr-freight-web/backoffice/src/components/customers/index.ts
@@ -1,5 +1,6 @@
 export {
   BookingStatusBadge,
+  CompanyNationalityBadge,
   CompanyStatusBadge,
   CompanyTypeBadge,
   InvoiceStatusBadge,
diff --git a/apps/edr-freight-web/backoffice/src/components/invoices/EimsFilingCard.tsx b/apps/edr-freight-web/backoffice/src/components/invoices/EimsFilingCard.tsx
new file mode 100644
index 000000000..ba507513c
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/components/invoices/EimsFilingCard.tsx
@@ -0,0 +1,158 @@
+import { Alert, Badge, Button, Card, Group, SimpleGrid, Stack, Text } from "@mantine/core";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { AlertTriangle, RefreshCw, Send, ShieldCheck } from "lucide-react";
+
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+import { api } from "@/services/api";
+import type { EimsInvoiceStatus } from "@/types/eims";
+import { useToast } from "@/hooks/use-toast";
+
+const STATUS_COLOR: Record<EimsInvoiceStatus, string> = {
+  NOT_SUBMITTED: "gray",
+  SUBMITTING: "yellow",
+  REGISTERED: "edr-green",
+  FAILED: "red",
+  UNKNOWN: "orange",
+};
+
+const STATUS_LABEL: Record<EimsInvoiceStatus, string> = {
+  NOT_SUBMITTED: "Not filed",
+  SUBMITTING: "Filing…",
+  REGISTERED: "Filed",
+  FAILED: "Rejected",
+  UNKNOWN: "Unacknowledged",
+};
+
+function Field({ label, value }: { label: string; value?: string | number | null }) {
+  return (
+    <Stack gap={2}>
+      <Text size="xs" fw={600} c="edr-muted" tt="uppercase">
+        {label}
+      </Text>
+      <Text size="sm" c="edr-text" style={{ wordBreak: "break-all" }}>
+        {value === null || value === undefined || value === "" ? "—" : value}
+      </Text>
+    </Stack>
+  );
+}
+
+/**
+ * MoR EIMS filing state for one invoice, with the manual actions.
+ *
+ * Filing normally happens on the API's cron sweep, not here — these controls exist for controlled
+ * testing and for the exceptional cases the sweep deliberately refuses: a rejected invoice that
+ * needs re-filing, and an unacknowledged one that has blocked all further filing.
+ */
+export function EimsFilingCard({ invoiceId }: { invoiceId: string }) {
+  const { user } = useAuth();
+  const { toast } = useToast();
+  const canFile = hasPermission(user, FREIGHT_PERMS.invoices.eimsRegister);
+
+  const { data: eims, isLoading } = useQuery(
+    api.invoices.eimsStatus.queryOptions({ input: { id: invoiceId }, enabled: Boolean(invoiceId) }),
+  );
+
+  const register = useMutation(
+    api.invoices.eimsRegister.mutationOptions({
+      onSuccess: (result) =>
+        toast({
+          title: result.eimsIrn ? "Filed with MoR" : "Filing finished",
+          description: result.eimsIrn ? `IRN ${result.eimsIrn}` : `Status ${result.eimsStatus}`,
+        }),
+    }),
+  );
+
+  const verify = useMutation(
+    api.invoices.eimsVerify.mutationOptions({
+      onSuccess: (result) =>
+        toast({
+          title: "MoR confirmed the filing",
+          description: `Document ${result.body?.DocumentDetails?.DocumentNumber ?? "—"}`,
+        }),
+    }),
+  );
+
+  if (isLoading || !eims) return null;
+
+  const status = eims.eimsStatus;
+  const busy = register.isPending || verify.isPending;
+
+  return (
+    <Card>
+      <Stack gap="lg">
+        <Group justify="space-between">
+          <Text fw={600} c="edr-text">
+            MoR e-invoicing
+          </Text>
+          <Badge color={STATUS_COLOR[status] ?? "gray"} variant="light" size="sm" radius="md" fw={600}>
+            {STATUS_LABEL[status] ?? status}
+          </Badge>
+        </Group>
+
+        <SimpleGrid cols={{ base: 1, sm: 2, lg: 4 }} spacing="lg">
+          <Field label="IRN" value={eims.eimsIrn} />
+          <Field label="Invoice counter" value={eims.eimsInvoiceCounter} />
+          <Field
+            label="Submitted"
+            value={eims.eimsSubmittedAt ? new Date(eims.eimsSubmittedAt).toLocaleString() : null}
+          />
+          <Field label="Acknowledged" value={eims.eimsAckDate} />
+        </SimpleGrid>
+
+        {status === "UNKNOWN" && (
+          <Alert color="orange" icon={<AlertTriangle size={16} />} title="All filing is blocked">
+            This invoice was sent but never acknowledged, so its IRN is unknown and no further
+            invoice can be filed. Confirm its status with MoR, then have a supervisor record the IRN
+            or discard the attempt.
+          </Alert>
+        )}
+
+        {eims.eimsLastError && (
+          <Alert
+            color={status === "FAILED" ? "red" : "orange"}
+            icon={<AlertTriangle size={16} />}
+            title={`MoR reported: ${eims.eimsLastError.kind}`}
+          >
+            {eims.eimsLastError.message}
+          </Alert>
+        )}
+
+        {canFile && (
+          <Group gap="sm">
+            {/* UNKNOWN is never re-filed from here: resubmitting risks a duplicate registration. */}
+            {status !== "REGISTERED" && status !== "UNKNOWN" && (
+              <Button
+                size="xs"
+                variant="light"
+                radius="md"
+                loading={register.isPending}
+                disabled={busy}
+                leftSection={status === "FAILED" ? <RefreshCw size={14} /> : <Send size={14} />}
+                onClick={() => register.mutate({ id: invoiceId })}
+              >
+                {status === "FAILED" ? "File again" : "File with MoR"}
+              </Button>
+            )}
+
+            {eims.eimsIrn && (
+              <Button
+                size="xs"
+                variant="light"
+                radius="md"
+                loading={verify.isPending}
+                disabled={busy}
+                leftSection={<ShieldCheck size={14} />}
+                onClick={() => verify.mutate({ id: invoiceId })}
+              >
+                Verify with MoR
+              </Button>
+            )}
+          </Group>
+        )}
+      </Stack>
+    </Card>
+  );
+}
+
+export default EimsFilingCard;
diff --git a/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardHeader.tsx b/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardHeader.tsx
index 2ca73f10a..0144db306 100644
--- a/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardHeader.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardHeader.tsx
@@ -15,9 +15,7 @@ import {
   FileSignature,
   Languages,
   LogOut,
-  Moon,
   Search,
-  Sun,
   User,
 } from "lucide-react";
 import { type ReactNode } from "react";
@@ -31,13 +29,10 @@ import type { PageMeta } from "./types";
 export interface FreightDashboardHeaderProps {
   pageMeta: PageMeta;
   headerRight?: ReactNode;
-  enableThemeToggle?: boolean;
   userName?: string;
   userEmail?: string;
   userInitials?: string;
   onLogout?: () => void;
-  theme: "light" | "dark";
-  onToggleTheme: () => void;
   mobileOpened: boolean;
   onToggleMobile: () => void;
   /** Hide the mobile burger when the shell has no sidebar to open. */
@@ -51,13 +46,10 @@ const ISLAND =
 
 const FreightDashboardHeader = ({
   headerRight,
-  enableThemeToggle = false,
   userName = "User",
   userEmail,
   userInitials,
   onLogout,
-  theme,
-  onToggleTheme,
   mobileOpened,
   onToggleMobile,
   hideSidebarBurger = false,
@@ -129,26 +121,6 @@ const FreightDashboardHeader = ({
 
           <NotificationBellContainer />
 
-          {enableThemeToggle && (
-            <Tooltip
-              label={theme === "dark" ? "Light mode" : "Dark mode"}
-              withArrow
-              openDelay={300}
-            >
-              <UnstyledButton
-                className={ISLAND}
-                onClick={onToggleTheme}
-                aria-label="Toggle theme"
-              >
-                {theme === "dark" ? (
-                  <Sun size={17} strokeWidth={1.8} />
-                ) : (
-                  <Moon size={17} strokeWidth={1.8} />
-                )}
-              </UnstyledButton>
-            </Tooltip>
-          )}
-
           {/* Avatar pill */}
           <Menu width={240} position="bottom-end" withinPortal shadow="md" offset={8} radius="md">
             <Menu.Target>
diff --git a/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardLayout.tsx b/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardLayout.tsx
index f3772cd76..7e6f1c523 100644
--- a/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardLayout.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/layout/FreightDashboardLayout.tsx
@@ -1,26 +1,15 @@
 import { AppShell, Box } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
-import { type ReactNode, useEffect, useState } from "react";
+import { type ReactNode } from "react";
 
 import FreightDashboardHeader from "./FreightDashboardHeader";
 import FreightSidebar from "./FreightSidebar";
 import { getPageMeta } from "./route-meta";
 import type { SidebarSection } from "./types";
 
-type Theme = "light" | "dark";
-const THEME_STORAGE_KEY = "edr-theme";
 const HEADER_HEIGHT = 64;
 const NAVBAR_WIDTH = 280;
 
-function getInitialTheme(): Theme {
-  if (typeof window === "undefined") return "light";
-  const stored = window.localStorage.getItem(THEME_STORAGE_KEY);
-  if (stored === "dark" || stored === "light") return stored;
-  return window.matchMedia?.("(prefers-color-scheme: dark)").matches
-    ? "dark"
-    : "light";
-}
-
 export interface FreightDashboardLayoutProps {
   sidebarSections: SidebarSection[];
   /** Render the shell with no navbar at all (used by GL clearance-only users). */
@@ -28,7 +17,6 @@ export interface FreightDashboardLayoutProps {
   activeHref?: string;
   onNavigate?: (href: string) => void;
   headerRight?: ReactNode;
-  enableThemeToggle?: boolean;
   userName?: string;
   userEmail?: string;
   userInitials?: string;
@@ -42,7 +30,6 @@ const FreightDashboardLayout = ({
   activeHref = "",
   onNavigate,
   headerRight,
-  enableThemeToggle = false,
   userName,
   userEmail,
   userInitials,
@@ -53,20 +40,6 @@ const FreightDashboardLayout = ({
   const [mobileOpened, { toggle: toggleMobile, close: closeMobile }] =
     useDisclosure(false);
 
-  const [theme, setTheme] = useState<Theme>(() =>
-    enableThemeToggle ? getInitialTheme() : "light",
-  );
-
-  useEffect(() => {
-    if (!enableThemeToggle) return;
-    const root = document.documentElement;
-    root.classList.toggle("dark", theme === "dark");
-    window.localStorage.setItem(THEME_STORAGE_KEY, theme);
-  }, [theme, enableThemeToggle]);
-
-  const toggleTheme = () =>
-    setTheme((current) => (current === "dark" ? "light" : "dark"));
-
   const navigate = (href: string) => {
     closeMobile();
     onNavigate?.(href);
@@ -93,13 +66,10 @@ const FreightDashboardLayout = ({
       <FreightDashboardHeader
         pageMeta={pageMeta}
         headerRight={headerRight}
-        enableThemeToggle={enableThemeToggle}
         userName={userName}
         userEmail={userEmail}
         userInitials={userInitials}
         onLogout={onLogout}
-        theme={theme}
-        onToggleTheme={toggleTheme}
         mobileOpened={mobileOpened}
         onToggleMobile={toggleMobile}
         hideSidebarBurger={hideSidebar}
diff --git a/apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx b/apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx
new file mode 100644
index 000000000..cfbc50528
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx
@@ -0,0 +1,673 @@
+import {
+  ArrowLeftRight,
+  BookOpen,
+  Boxes,
+  Building2,
+  BarChart3,
+  Container,
+  FileSignature,
+  FileText,
+  Hammer,
+  History,
+  Landmark,
+  LayoutDashboard,
+  LayoutGrid,
+  MapPin,
+  Network,
+  Package,
+  PackageCheck,
+  PackageOpen,
+  Paperclip,
+  Receipt,
+  ScrollText,
+  Send,
+  Settings,
+  ShieldCheck,
+  Ship,
+  SlidersHorizontal,
+  Train,
+  Truck,
+  Users,
+  Wallet,
+  LifeBuoy,
+  TrainFront,
+  XCircle,
+} from "lucide-react";
+
+import type { AuthUser } from "@/auth/types";
+
+import type { SidebarItem, SidebarSection } from "./types";
+import {
+  FREIGHT_PERMS,
+  hasPermission as hasFreightPermission,
+  isDjiboutiGl,
+  isEthiopianGl,
+  isSuperAdmin,
+} from "@/lib/permissions";
+import { getCategorySidebarChildren } from "@/pages/ruleEngine/config/resources";
+
+/**
+ * Backoffice sidebar model: the nav tree, its permission filter, and the
+ * flatten/lookup helpers. Lives outside App.tsx so `lib/landing.ts` can resolve
+ * a user's first reachable route without importing the route tree (App.tsx
+ * imports RequirePermission, which imports landing — that would cycle).
+ */
+export const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
+  {
+    title: "Main menu",
+    items: [
+      {
+        label: "Overview",
+        href: "/dashboard/overview",
+        icon: <LayoutDashboard />,
+        permission: FREIGHT_PERMS.overview.view,
+      },
+      {
+        label: "Reports",
+        href: "/dashboard/reports",
+        icon: <BarChart3 />,
+        permission: FREIGHT_PERMS.reports.view,
+      },
+      {
+        label: "Customers",
+        href: "/dashboard/customers",
+        icon: <Building2 />,
+        permission: FREIGHT_PERMS.customers.view,
+      },
+      {
+        label: "Contracts",
+        href: "/dashboard/contract-requests",
+        icon: <FileSignature />,
+        permission: FREIGHT_PERMS.contracts.view,
+      },
+      {
+        label: "Bookings",
+        href: "/dashboard/booking-requests",
+        icon: <FileText />,
+        permission: FREIGHT_PERMS.bookings.view,
+      },
+      {
+        label: "Wagon cancellations",
+        href: "/dashboard/wagon-cancellations",
+        icon: <XCircle />,
+        permission: FREIGHT_PERMS.bookings.wagonCancellationView,
+      },
+      // Operations hub: per-shipment clearance-document review for services
+      // WITHOUT customs clearing (self-clearance) — bookings only.
+      {
+        label: "Clearance Documents",
+        href: "/dashboard/contracts/clearance-documents",
+        icon: <ShieldCheck />,
+        permission: FREIGHT_PERMS.contracts.opsClearanceReview,
+      },
+      {
+        label: "Payments",
+        href: "/dashboard/payments",
+        icon: <Wallet />,
+        permission: FREIGHT_PERMS.payments.view,
+      },
+      {
+        label: "Invoices",
+        href: "/dashboard/invoices",
+        icon: <Receipt />,
+        permission: FREIGHT_PERMS.invoices.view,
+      },
+      {
+        label: "USD Payments",
+        href: "/dashboard/usd-payments",
+        icon: <Landmark />,
+        permission: FREIGHT_PERMS.invoices.view,
+      },
+      {
+        label: "Support",
+        href: "/dashboard/support",
+        icon: <LifeBuoy />,
+        permission: FREIGHT_PERMS.support.agentView,
+      },
+      ...demoItems,
+    ],
+  },
+  {
+    // title: "Port & Terminal",
+    items: [
+      {
+        label: "Operations",
+        icon: <Settings />,
+        children: [
+          {
+            label: "Clearance",
+            href: "/dashboard/contracts/clearance",
+            icon: <ShieldCheck />,
+            permission: [
+              FREIGHT_PERMS.contracts.clearanceReview,
+              FREIGHT_PERMS.contracts.clearanceEtActions,
+            ],
+          },
+          // {
+          //   label: "Shipment Requests",
+          //   href: "/dashboard/shipment-requests",
+          //   icon: <Send />,
+          //   permission: FREIGHT_PERMS.contracts.createBooking,
+          // },
+          // Operations Path A queue: per-booking self-clearance review for
+          // GENERAL non-customs booking instances (and legacy self-clear bookings).
+          // {
+          //   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",
+            icon: <Ship />,
+            permission: FREIGHT_PERMS.contracts.clearanceDjActions,
+          },
+          {
+            label: "Train Schedules",
+            href: "/dashboard/operations/train-scheduling-v2",
+            icon: <Train />,
+            permission: FREIGHT_PERMS.trainScheduling.view,
+          },
+          {
+            label: "Batch Board",
+            href: "/dashboard/operations/batch-board",
+            icon: <LayoutGrid />,
+            permission: FREIGHT_PERMS.trainScheduling.view,
+          },
+          {
+            label: "First Mile",
+            href: "/dashboard/operations/first-mile",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.firstMile.view,
+          },
+          {
+            label: "Last Mile",
+            href: "/dashboard/operations/last-mile",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.lastMile.view,
+          },
+        ],
+      },
+      {
+        label: "Fleet Management",
+        icon: <Truck />,
+        children: [
+          {
+            label: "Fleet Dashboard",
+            href: "/dashboard/fleet-dashboard",
+            icon: <LayoutDashboard />,
+            permission: FREIGHT_PERMS.fleetDashboard.view,
+          },
+          {
+            label: "Routes",
+            href: "/dashboard/routes",
+            icon: <Network />,
+            permission: FREIGHT_PERMS.routes.view,
+          },
+          {
+            label: "Locomotives",
+            href: "/dashboard/locomotives",
+            icon: <Train />,
+            permission: FREIGHT_PERMS.locomotives.view,
+          },
+          {
+            label: "Train Builder",
+            href: "/dashboard/train-builder",
+            icon: <Hammer />,
+            permission: FREIGHT_PERMS.trains.view,
+          },
+
+          // {
+          //   label: "Wagon types",
+          //   href: "/dashboard/wagon-types",
+          //   icon: <Boxes />,
+          // },
+          {
+            label: "Wagons",
+            href: "/dashboard/wagons",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.wagons.view,
+          },
+          {
+            label: "Wagon Transfers",
+            href: "/dashboard/wagon-transfers",
+            icon: <ArrowLeftRight />,
+            permission: [
+              FREIGHT_PERMS.wagons.transferView,
+              FREIGHT_PERMS.wagons.view,
+            ],
+          },
+          {
+            label: "Vehicles",
+            href: "/dashboard/vehicles",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.vehicles.view,
+          },
+          {
+            label: "Drivers",
+            href: "/dashboard/drivers",
+            icon: <Users />,
+            permission: FREIGHT_PERMS.drivers.view,
+          },
+          {
+            label: "Track Vehicles",
+            href: "/dashboard/tracking",
+            icon: <MapPin />,
+            permission: FREIGHT_PERMS.tracking.view,
+          },
+          {
+            label: "Fuel Purchases",
+            href: "/dashboard/fuel-purchases",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.fuel.view,
+          },
+          {
+            label: "Fuel Analytics",
+            href: "/dashboard/fuel-stats",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.fuel.view,
+          },
+          {
+            label: "Maintenance",
+            href: "/dashboard/maintenance",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.maintenance.view,
+          },
+          {
+            label: "Work Orders",
+            href: "/dashboard/work-orders",
+            icon: <SlidersHorizontal />,
+            permission: FREIGHT_PERMS.maintenance.view,
+          },
+          {
+            label: "Compliance & Alerts",
+            href: "/dashboard/compliance",
+            icon: <ShieldCheck />,
+            permission: FREIGHT_PERMS.compliance.view,
+          },
+          {
+            label: "Incidents",
+            href: "/dashboard/incidents",
+            icon: <FileText />,
+            // No dedicated backend key exists for incidents yet. Not part of
+            // the fleet.view/admin fallback cleanup — removing fleet.view
+            // here with nothing to replace it would lock the page to
+            // super-admin only, so it stays as the sole (if coarse) gate.
+            permission: FREIGHT_PERMS.fleet.view,
+          },
+          {
+            label: "Procurement",
+            href: "/dashboard/procurement",
+            icon: <Package />,
+            permission: FREIGHT_PERMS.procurement.view,
+          },
+          {
+            label: "Financial Reports",
+            href: "/dashboard/financial-reports",
+            icon: <Wallet />,
+            permission: FREIGHT_PERMS.fleetReports.view,
+          },
+          // {
+          //   label: "Containers",
+          //   href: "/dashboard/containers",
+          //   icon: <Container />,
+          // },
+          // {
+          //   label: "Cargoes",
+          //   href: "/dashboard/cargoes",
+          //   icon: <Package />,
+          // },
+        ],
+      },
+      {
+        label: "Imports",
+        href: "/dashboard/import-warehouse",
+        icon: <PackageOpen />,
+        permission: FREIGHT_PERMS.warehouseInventory.view,
+        children: [
+          {
+            label: "Import Overview",
+            href: "/dashboard/import-warehouse",
+            icon: <PackageOpen />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Arrival Queue",
+            href: "/dashboard/arrival-queue",
+            icon: <PackageOpen />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Import Trucks",
+            href: "/dashboard/import-trucks",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Container Returns",
+            href: "/dashboard/container-returns",
+            icon: <Container />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Terminal Inventory",
+            href: "/dashboard/warehouse-inventory?direction=IMPORT",
+            icon: <Package />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Inventory Inquiry",
+            href: "/dashboard/inventory-inquiry",
+            icon: <Boxes />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+        ],
+      },
+      {
+        label: "Exports",
+        href: "/dashboard/export-warehouse",
+        icon: <Truck />,
+        permission: FREIGHT_PERMS.warehouseInventory.view,
+        children: [
+          {
+            label: "Export Overview",
+            href: "/dashboard/export-warehouse",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Loading Queue",
+            href: "/dashboard/loading-queue",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Loaded Inventory",
+            href: "/dashboard/loaded-inventory",
+            icon: <PackageCheck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Dispatch Queue",
+            href: "/dashboard/dispatch-queue",
+            icon: <Send />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Djibouti Unloading",
+            href: "/dashboard/export-djibouti-unloading",
+            icon: <PackageOpen />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Interchange Documents",
+            href: "/dashboard/interchange-documents",
+            icon: <FileText />,
+            permission: FREIGHT_PERMS.interchangeDocuments.view,
+          },
+          {
+            label: "Terminal Inventory",
+            href: "/dashboard/warehouse-inventory?direction=EXPORT",
+            icon: <Package />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+        ],
+      },
+      {
+        label: "Intercity",
+        href: "/dashboard/intercity",
+        icon: <TrainFront />,
+        permission: FREIGHT_PERMS.trainScheduling.view,
+        children: [
+          {
+            label: "Intercity Cargo",
+            href: "/dashboard/intercity",
+            icon: <TrainFront />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+        ],
+      },
+      {
+        label: "Warehouse Management",
+        icon: <Container />,
+        children: [
+          {
+            label: "Warehouse Dashboard",
+            href: "/dashboard/warehouse-dashboard",
+            icon: <LayoutDashboard />,
+            permission: FREIGHT_PERMS.warehouseDashboard.view,
+          },
+          {
+            // Yard-wide, not per-direction: the gate sees import and export
+            // trucks at the same barrier.
+            label: "Trucks on Site",
+            href: "/dashboard/trucks-on-site",
+            icon: <Truck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
+          },
+          {
+            label: "Warehouses",
+            href: "/dashboard/warehouses",
+            icon: <Container />,
+            permission: FREIGHT_PERMS.warehouses.view,
+          },
+          {
+            label: "Allocation & Fees",
+            href: "/dashboard/warehouse-rules",
+            icon: <SlidersHorizontal />,
+            permission: [
+              FREIGHT_PERMS.warehouseAllocationRules.view,
+              FREIGHT_PERMS.warehouseFeeRules.view,
+            ],
+          },
+          {
+            label: "Fee Invoices",
+            href: "/dashboard/warehouse-fee-invoices",
+            icon: <Wallet />,
+            permission: FREIGHT_PERMS.warehouseFeeInvoices.view,
+          },
+        ],
+      },
+    ],
+  },
+  {
+    title: "Freight configuration",
+    mutedTitle: true,
+    items: [
+      {
+        label: "File settings",
+        href: "/dashboard/file-settings",
+        icon: <Paperclip />,
+        permission: FREIGHT_PERMS.settings.fileUpload.view,
+      },
+      {
+        label: "Dropdown settings",
+        href: "/dashboard/dropdown-settings",
+        icon: <Settings />,
+        permission: FREIGHT_PERMS.settings.dropdown.view,
+      },
+      {
+        label: "Contract templates",
+        href: "/dashboard/contract-templates",
+        icon: <ScrollText />,
+        // `view` opens the page; `read` alone is API-only and shows no menu.
+        permission: FREIGHT_PERMS.settings.contractTemplates.view,
+      },
+      {
+        label: "Portal content",
+        href: "/dashboard/portal-content",
+        icon: <BookOpen />,
+        permission: [
+          FREIGHT_PERMS.settings.supportContent.view,
+          FREIGHT_PERMS.settings.supportContent.manage,
+        ],
+      },
+      {
+        label: "Audit logs",
+        href: "/dashboard/audit-logs",
+        icon: <History />,
+        permission: FREIGHT_PERMS.audit.view,
+      },
+      {
+        label: "Configuration",
+        href: "/dashboard/configuration",
+        icon: <Boxes />,
+        children: [
+          ...getCategorySidebarChildren("configuration"),
+          {
+            label: "Train scheduling rules",
+            href: "/dashboard/configuration/train-scheduling-rules",
+            permission: FREIGHT_PERMS.trainScheduling.rulesManage,
+          },
+          {
+            label: "Trade access",
+            href: "/dashboard/configuration/trade-access",
+            permission: FREIGHT_PERMS.tradeAccess.view,
+          },
+          {
+            label: "Exchange rate",
+            href: "/dashboard/configuration/exchange-rate",
+            permission: FREIGHT_PERMS.settings.exchangeRate.view,
+          },
+        ],
+      },
+      {
+        label: "Rules",
+        href: "/dashboard/rules",
+        icon: <SlidersHorizontal />,
+        children: getCategorySidebarChildren("rules"),
+      },
+
+      {
+        label: "Staff",
+        href: "/user-management",
+        icon: <Users />,
+        permission: [
+          FREIGHT_PERMS.admin,
+          FREIGHT_PERMS.staff.roles.view,
+          FREIGHT_PERMS.staff.employeeRegistration.view,
+          FREIGHT_PERMS.staff.roleAssignment.view,
+        ],
+      },
+    ],
+  },
+];
+
+/** Hrefs of the two document-clearance menu items (stable identifiers). */
+export const ET_CLEARANCE_HREF = "/dashboard/contracts/clearance";
+export const DJ_CLEARANCE_HREF = "/dashboard/gl-djibouti/clearance";
+
+// Routes a GL officer may reach beyond their clearance hub. Path B booking is
+// part of their job (create/rebook under a cleared contract, then view that
+// booking's clearance), but those routes live outside the clearance prefix —
+// without this allowlist the single-prefix lock bounces them out of their own
+// workflow. Matched against location.pathname (no query string).
+export const GL_WORKFLOW_PATH_PATTERNS: RegExp[] = [
+  /^\/dashboard\/contracts\/[^/]+\/create-booking(\/|$)/,
+  /^\/dashboard\/bookings\/[^/]+\/clearance(\/|$)/,
+  // The ET hub's rows open the shipment clearance detail at this URL.
+  /^\/dashboard\/clearance\/[^/]+(\/|$)/,
+];
+
+const isEtClearanceItem = (item: SidebarItem): boolean =>
+  item.href === ET_CLEARANCE_HREF;
+const isDjClearanceItem = (item: SidebarItem): boolean =>
+  item.href === DJ_CLEARANCE_HREF;
+const isClearanceItem = (item: SidebarItem): boolean =>
+  isEtClearanceItem(item) || isDjClearanceItem(item);
+
+/**
+ * Keep only items the user is permitted to see; drop now-empty sections.
+ *
+ * Position-scoped visibility (super_admin sees everything):
+ * - Super Admin → sees all items (all permissions pass, all tabs visible)
+ * - Ethiopian GL  → sees ONLY the ET document-clearance page.
+ * - Djibouti GL   → sees ONLY the DJ clearance page.
+ * - Everyone else → sees everything they have permission for, EXCEPT the two
+ *   clearance pages (those are GL-only).
+ */
+export const filterSidebarByPermission = (
+  sections: SidebarSection[],
+  user: AuthUser | null | undefined,
+): SidebarSection[] => {
+  // Superadmin sees every section and item — no permission filtering.
+  if (isSuperAdmin(user)) return sections;
+
+  const etGl = isEthiopianGl(user);
+  const djGl = isDjiboutiGl(user);
+
+  const permissionAllowed = (item: SidebarItem): boolean => {
+    if (!item.permission) return true;
+    const keys = Array.isArray(item.permission)
+      ? item.permission
+      : [item.permission];
+    return keys.some((key) => hasFreightPermission(user, key));
+  };
+
+  // Recursive: children are filtered first; a group (item with children) stays
+  // only while it still has visible children — so parents without their own
+  // permission key never leak a whole subtree the user cannot open.
+  const filterItems = (items: SidebarItem[]): SidebarItem[] =>
+    items
+      .map((item) =>
+        item.children
+          ? { ...item, children: filterItems(item.children) }
+          : item,
+      )
+      .filter((item) => {
+        if (etGl || djGl) {
+          // GL positions are locked to their single clearance page (parents
+          // survive only as the path to that page).
+          const isTarget = etGl ? isEtClearanceItem : isDjClearanceItem;
+          return isTarget(item) || (item.children?.length ?? 0) > 0;
+        }
+        // Everyone else: hide the GL-only clearance pages entirely.
+        if (isClearanceItem(item)) return false;
+        if (!permissionAllowed(item)) return false;
+        if (item.children) return item.children.length > 0;
+        return true;
+      });
+
+  return sections
+    .map((section) => ({
+      ...section,
+      items: filterItems(section.items),
+    }))
+    .filter((section) => section.items.length > 0);
+};
+
+export const APP_TITLE = "EDR Freight Backoffice";
+
+/** Flatten sidebar sections (incl. nested children) into {href, label} pairs. */
+export const flattenSidebarItems = (
+  sections: SidebarSection[],
+): { href: string; label: string }[] =>
+  sections.flatMap((section) =>
+    section.items.flatMap((item) => [
+      ...(item.href ? [{ href: item.href, label: item.label }] : []),
+      ...(item.children ?? [])
+        .filter((child): child is SidebarItem & { href: string } =>
+          Boolean(child.href),
+        )
+        .map((child) => ({ href: child.href, label: child.label })),
+    ]),
+  );
+
+/** Find the sidebar label whose href matches (exactly or as a prefix of) the current path. */
+export const findActiveSidebarLabel = (
+  pathname: string,
+  sections: SidebarSection[],
+): string | undefined => {
+  const path = pathname.toLowerCase();
+  const candidates = flattenSidebarItems(sections)
+    .map(({ href, label }) => ({
+      label,
+      href: href.split("?")[0].toLowerCase(),
+    }))
+    .sort((a, b) => b.href.length - a.href.length);
+
+  return candidates.find(
+    ({ href }) => path === href || path.startsWith(`${href}/`),
+  )?.label;
+};
diff --git a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineCardGrid.tsx b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineCardGrid.tsx
index 392bf6dfb..e3fe9cb37 100644
--- a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineCardGrid.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineCardGrid.tsx
@@ -234,7 +234,7 @@ const RuleEngineCardGrid = ({
                           {col.header}:
                         </Text>
                         <div style={{ textAlign: "right", flex: 1 }}>
-                          {formatCell(displayValue, col.format)}
+                          {formatCell(displayValue, col.format, record)}
                         </div>
                       </Group>
                     );
@@ -253,7 +253,7 @@ const RuleEngineCardGrid = ({
                   config={config}
                   layout="compact"
                   readOnly={readOnly}
-                  onEdit={onEdit ?? (() => { })}
+                  onEdit={onEdit}
                   onDelete={onDelete ?? (() => { })}
                   onViewChain={onViewChain}
                   onSubmitRate={onSubmitRate}
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 d205aae26..397496fd2 100644
--- a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
@@ -127,6 +127,8 @@ const buildInitialValues = (
       } else {
         values[field.name] = raw;
       }
+    } else if (field.defaultValue !== undefined) {
+      values[field.name] = field.defaultValue;
     } else if (field.type === "boolean") {
       values[field.name] = false;
     } else if (field.type === "number") {
@@ -559,7 +561,7 @@ const RuleEngineFormDialog = ({
         // numbers (@IsInt on points/sizes/order, @IsNumber on money, tons, km),
         // so let the field carry decimals and let a 400 catch the rest.
         step={isNumber ? "any" : undefined}
-        disabled={field.disabled || computed !== undefined}
+        disabled={field.disabled || (field.disabledOnEdit && !!initialRecord) || computed !== undefined}
         value={String((computed !== undefined ? computed : values[field.name]) ?? "")}
         onChange={(e) => {
           const next = e.currentTarget.value;
diff --git a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineRecordActions.tsx b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineRecordActions.tsx
index 96440c001..f724d5b60 100644
--- a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineRecordActions.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineRecordActions.tsx
@@ -14,7 +14,7 @@ import type { RuleEngineRecord } from "@/types/rule-engine";
 export interface RuleEngineRecordActionsProps {
   record: RuleEngineRecord;
   config: RuleEngineResourceConfig;
-  onEdit: (record: RuleEngineRecord) => void;
+  onEdit?: (record: RuleEngineRecord) => void;
   onDelete: (record: RuleEngineRecord) => void;
   onViewChain?: () => void;
   onSubmitRate?: (id: string) => void;
@@ -93,17 +93,19 @@ const RuleEngineRecordActions = ({
         ) : null}
 
         <div style={actionGroupStyle}>
-          <Button
-            variant="subtle"
-            color="gray"
-            size="compact-sm"
-            radius="md"
-            onClick={() => onEdit(record)}
-            leftSection={<Pencil size={14} />}
-            styles={{ root: { fontWeight: 600 } }}
-          >
-            Edit
-          </Button>
+          {onEdit ? (
+            <Button
+              variant="subtle"
+              color="gray"
+              size="compact-sm"
+              radius="md"
+              onClick={() => onEdit(record)}
+              leftSection={<Pencil size={14} />}
+              styles={{ root: { fontWeight: 600 } }}
+            >
+              Edit
+            </Button>
+          ) : null}
           <Button
             variant="subtle"
             color="red"
@@ -151,21 +153,23 @@ const RuleEngineRecordActions = ({
       ) : null}
 
       <div style={actionGroupStyle}>
-        <Tooltip label="Edit">
-          <ActionIcon
-            variant="subtle"
-            color="gray"
-            size="md"
-            radius="md"
-            onClick={() => onEdit(record)}
-            aria-label="Edit record"
-            style={{
-              background: "white",
-            }}
-          >
-            <Pencil size={16} />
-          </ActionIcon>
-        </Tooltip>
+        {onEdit ? (
+          <Tooltip label="Edit">
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              size="md"
+              radius="md"
+              onClick={() => onEdit(record)}
+              aria-label="Edit record"
+              style={{
+                background: "white",
+              }}
+            >
+              <Pencil size={16} />
+            </ActionIcon>
+          </Tooltip>
+        ) : null}
         <Tooltip label="Delete">
           <ActionIcon
             variant="subtle"
diff --git a/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx b/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx
index 173c75b5f..529f53a43 100644
--- a/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx
@@ -17,7 +17,13 @@ const extractLabel = (value: unknown): string | null => {
   );
 };
 
-export const formatCell = (value: unknown, format?: ColumnFormat): ReactNode => {
+export const formatCell = (
+  value: unknown,
+  format?: ColumnFormat,
+  // The row the cell came from — currency amounts read their code off it so a
+  // last-mile rate priced in birr does not render as USD.
+  row?: Record<string, unknown>,
+): ReactNode => {
   if (value === null || value === undefined || value === "") {
     return <Text size="sm" c="dimmed">—</Text>;
   }
@@ -109,9 +115,10 @@ export const formatCell = (value: unknown, format?: ColumnFormat): ReactNode =>
 
   if (format === "currency") {
     const num = Number(value);
+    const code = typeof row?.currency === "string" ? row.currency : "USD";
     return (
       <Text size="sm" fw={500}>
-        {Number.isNaN(num) ? String(value) : `USD ${num.toLocaleString()}`}
+        {Number.isNaN(num) ? String(value) : `${code} ${num.toLocaleString()}`}
       </Text>
     );
   }
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleBatchPanel.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleBatchPanel.tsx
index d44ef4540..9b410ce88 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleBatchPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleBatchPanel.tsx
@@ -19,6 +19,8 @@ import { BookingStatusBadge } from "@/components/bookings/BookingStatusBadge";
 import { api } from "@/services/api";
 import { useToast } from "@/hooks/use-toast";
 import type { TrainScheduleDetail } from "@/types/trainScheduling";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 
 interface ScheduleBatchPanelProps {
   schedule: TrainScheduleDetail;
@@ -31,6 +33,8 @@ const windowColor: Record<string, string> = {
 };
 
 export function ScheduleBatchPanel({ schedule }: ScheduleBatchPanelProps) {
+  const { user } = useAuth();
+  const canMarkPaid = hasPermission(user, FREIGHT_PERMS.trainScheduling.markPaid);
   const { toast } = useToast();
   const actions = {
     runBatch: useMutation(api.trainScheduling.runBatch.mutationOptions()),
@@ -179,7 +183,7 @@ export function ScheduleBatchPanel({ schedule }: ScheduleBatchPanelProps) {
                 <Table.Td>
                   {!locked && (
                     <Group gap={6} justify="flex-end" wrap="nowrap">
-                      {b.status !== "PAID" && (
+                      {canMarkPaid && b.status !== "PAID" && (
                         <Button
                           size="compact-xs"
                           variant="light"
diff --git a/apps/edr-freight-web/backoffice/src/components/wagons/WagonStatusActions.tsx b/apps/edr-freight-web/backoffice/src/components/wagons/WagonStatusActions.tsx
new file mode 100644
index 000000000..10c7bd82a
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/components/wagons/WagonStatusActions.tsx
@@ -0,0 +1,226 @@
+import { useState } from "react";
+import { Freight } from "@edr/types";
+import {
+  ActionIcon,
+  Button,
+  Center,
+  Group,
+  Loader,
+  Modal,
+  Stack,
+  Table,
+  Text,
+  Textarea,
+  Tooltip,
+} from "@mantine/core";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { Activity, ArrowRight } from "lucide-react";
+
+import { api } from "@/services/api";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+import { useToast } from "@/hooks/use-toast";
+import { formatFleetCell } from "@/components/fleet/fleetFormat";
+import type { FleetRecord } from "@/services/fleet/fleet.service";
+import type { WagonStatusLog } from "@/services/wagon.service";
+
+export interface WagonStatusActionsProps {
+  record: FleetRecord;
+  /** Caller's wagons-update permission — the toggle hides without it. */
+  canUpdate: boolean;
+}
+
+const AVAILABLE = Freight.WagonStatus.Available;
+const MAINTENANCE = Freight.WagonStatus.Maintenance;
+
+const fmt = (iso: string) => {
+  const d = new Date(iso);
+  return Number.isNaN(d.getTime()) ? iso : d.toLocaleString();
+};
+
+/**
+ * Wagons-only row actions on the fleet desk: an availability/maintenance
+ * toggle (with confirm + optional note, audited server-side) and the wagon's
+ * status-change history.
+ */
+const WagonStatusActions = ({ record, canUpdate }: WagonStatusActionsProps) => {
+  const r = record as unknown as Record<string, unknown>;
+  const id = r.id ? String(r.id) : "";
+  const wagonNumber = r.wagonNumber ? String(r.wagonNumber) : "";
+  const status = String(r.status ?? "");
+  const { toast } = useToast();
+  const { user } = useAuth();
+  // Dedicated statusToggle key lets operations/OCC flip readiness without
+  // holding full wagon edit; full editors keep the button too.
+  const canToggle =
+    canUpdate || hasPermission(user, FREIGHT_PERMS.wagons.statusToggle);
+  const [confirmOpen, setConfirmOpen] = useState(false);
+  const [historyOpen, setHistoryOpen] = useState(false);
+  const [note, setNote] = useState("");
+
+  // Only these two statuses toggle — ASSIGNED/DETAINED/... have their own flows.
+  const target =
+    status === MAINTENANCE ? AVAILABLE : status === AVAILABLE ? MAINTENANCE : null;
+
+  const setStatus = useMutation(api.wagons.bulkSetStatus.mutationOptions());
+
+  const { data: logs = [], isLoading: logsLoading } = useQuery(
+    api.wagons.statusHistory.queryOptions({
+      input: { id },
+      enabled: historyOpen && Boolean(id),
+    }),
+  );
+
+  const closeConfirm = () => {
+    setConfirmOpen(false);
+    setNote("");
+  };
+
+  const handleConfirm = async () => {
+    if (!target || !id) return;
+    try {
+      await setStatus.mutateAsync({
+        wagonIds: [id],
+        status: target,
+        note: note.trim() || undefined,
+      });
+      toast({
+        title:
+          target === AVAILABLE
+            ? `Wagon ${wagonNumber} marked available`
+            : `Wagon ${wagonNumber} sent to maintenance`,
+      });
+      closeConfirm();
+    } catch (err: unknown) {
+      const message =
+        (err as { response?: { data?: { message?: string } } })?.response?.data
+          ?.message ?? "Status change failed";
+      toast({
+        title: "Status change failed",
+        description: String(message),
+        variant: "destructive",
+      });
+    }
+  };
+
+  return (
+    <>
+      {canToggle && target ? (
+        <Button
+          size="compact-xs"
+          variant="light"
+          color={target === AVAILABLE ? "edr-green" : "orange"}
+          styles={{ label: { fontWeight: 500 } }}
+          onClick={() => setConfirmOpen(true)}
+        >
+          {target === AVAILABLE ? "Mark available" : "Send to maintenance"}
+        </Button>
+      ) : null}
+
+      <Tooltip label="Status history">
+        <ActionIcon
+          variant="subtle"
+          color="gray"
+          size="sm"
+          onClick={() => setHistoryOpen(true)}
+        >
+          <Activity size={16} strokeWidth={2} />
+        </ActionIcon>
+      </Tooltip>
+
+      <Modal
+        opened={confirmOpen}
+        onClose={closeConfirm}
+        title={
+          <Text fw={600}>
+            {target === AVAILABLE ? "Mark available" : "Send to maintenance"}
+          </Text>
+        }
+        radius="lg"
+        centered
+      >
+        <Stack gap="md">
+          <Group gap={8} wrap="nowrap">
+            <Text size="sm">
+              Wagon{" "}
+              <Text span fw={700}>
+                {wagonNumber}
+              </Text>
+            </Text>
+            {formatFleetCell(status, "statusBadge")}
+            <ArrowRight size={14} />
+            {formatFleetCell(target ?? "", "statusBadge")}
+          </Group>
+          <Textarea
+            label="Note"
+            placeholder="Optional note (e.g. reason for maintenance)"
+            value={note}
+            onChange={(e) => setNote(e.currentTarget.value)}
+            autosize
+            minRows={2}
+          />
+          <Group justify="flex-end">
+            <Button variant="default" onClick={closeConfirm}>
+              Cancel
+            </Button>
+            <Button loading={setStatus.isPending} onClick={handleConfirm}>
+              Confirm
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
+      <Modal
+        opened={historyOpen}
+        onClose={() => setHistoryOpen(false)}
+        title={<Text fw={600}>{`Status history — ${wagonNumber}`.trim()}</Text>}
+        radius="lg"
+        size="lg"
+        centered
+      >
+        {logsLoading ? (
+          <Center py="xl">
+            <Loader size="sm" />
+          </Center>
+        ) : logs.length === 0 ? (
+          <Text c="dimmed" ta="center" py="lg" size="sm">
+            No status changes recorded yet.
+          </Text>
+        ) : (
+          <Table verticalSpacing="xs" highlightOnHover>
+            <Table.Thead>
+              <Table.Tr>
+                <Table.Th>Date</Table.Th>
+                <Table.Th>Change</Table.Th>
+                <Table.Th>Note</Table.Th>
+              </Table.Tr>
+            </Table.Thead>
+            <Table.Tbody>
+              {(logs as WagonStatusLog[]).map((log) => (
+                <Table.Tr key={log.id}>
+                  <Table.Td>
+                    <Text size="sm">{fmt(log.createdAt)}</Text>
+                  </Table.Td>
+                  <Table.Td>
+                    <Group gap={6} wrap="nowrap">
+                      {formatFleetCell(log.fromStatus, "statusBadge")}
+                      <ArrowRight size={13} />
+                      {formatFleetCell(log.toStatus, "statusBadge")}
+                    </Group>
+                  </Table.Td>
+                  <Table.Td>
+                    <Text size="sm" c={log.note ? undefined : "dimmed"}>
+                      {log.note ?? "—"}
+                    </Text>
+                  </Table.Td>
+                </Table.Tr>
+              ))}
+            </Table.Tbody>
+          </Table>
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default WagonStatusActions;
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 f34fa6470..b681a2909 100644
--- a/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
@@ -51,6 +51,9 @@ export const QUERY_KEYS = {
     list: (filter?: InvoiceListFilter) =>
       ["invoices", "list", filter ?? {}] as const,
     byId: (id: string) => ["invoices", "detail", id] as const,
+    offlineUsd: (filter?: InvoiceListFilter) =>
+      ["invoices", "offline-usd", filter ?? {}] as const,
+    eimsStatus: (id: string) => ["invoices", "eims", id] as const,
   },
 
   BOOKINGS: {
diff --git a/apps/edr-freight-web/backoffice/src/constants/URLS.ts b/apps/edr-freight-web/backoffice/src/constants/URLS.ts
index cb45a34ae..3b482571c 100644
--- a/apps/edr-freight-web/backoffice/src/constants/URLS.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/URLS.ts
@@ -105,6 +105,16 @@ export const URL_CONSTANTS = {
     INVOICES: "/billing/invoices",
     INVOICE_BY_ID: (id: string) => `/billing/invoices/${id}`,
     INVOICE_DOCUMENT: (id: string) => `/billing/invoices/${id}/document`,
+    OFFLINE_USD: "/billing/offline-usd",
+    CONFIRM_OFFLINE: (id: string) => `/billing/invoices/${id}/confirm-offline`,
+  },
+
+  // MoR EIMS filing. Mounted on /invoices, not /billing/invoices — see EimsInvoiceController.
+  EIMS: {
+    STATUS: (id: string) => `/invoices/${id}/eims/status`,
+    REGISTER: (id: string) => `/invoices/${id}/eims/register`,
+    VERIFY: (id: string) => `/invoices/${id}/eims/verify`,
+    RESOLVE: (id: string) => `/invoices/${id}/eims/resolve`,
   },
 
   CUSTOMERS_API: {
@@ -145,6 +155,8 @@ export const URL_CONSTANTS = {
     CONTRACT_DOWNLOAD: (id: string) => `/bookings/${id}/contract`,
     CARRIAGE_ACCEPTANCE_SHEET: (id: string) =>
       `/bookings/${id}/carriage-acceptance-sheet`,
+    EXPORT_HANDOVER_MODE: (id: string) =>
+      `/bookings/${id}/export-handover-mode`,
     SUMMARY: (id: string) => `/bookings/${id}/summary`,
     CUSTOMER_SIGN: (id: string) => `/bookings/${id}/customer/sign`,
     MARKETING_APPROVE: (id: string) => `/bookings/${id}/marketing/approve`,
diff --git a/apps/edr-freight-web/backoffice/src/features/bookingWindows/useBookingWindowSocket.ts b/apps/edr-freight-web/backoffice/src/features/bookingWindows/useBookingWindowSocket.ts
index b9195b1ff..59318f703 100644
--- a/apps/edr-freight-web/backoffice/src/features/bookingWindows/useBookingWindowSocket.ts
+++ b/apps/edr-freight-web/backoffice/src/features/bookingWindows/useBookingWindowSocket.ts
@@ -30,6 +30,7 @@ interface WindowRow {
   windowClosesAt: string | null;
   docReviewEndsAt: string | null;
   paymentPhaseEndsAt: string | null;
+  paymentDrainEndsAt?: string | null;
   bookingWindowStatus: string;
   bookingCycleNo: number;
   departureDate: string;
@@ -55,6 +56,7 @@ function applyEvent<T extends WindowRow>(row: T, event: BookingWindowPhaseEvent)
     windowClosesAt: event.windowClosesAt,
     docReviewEndsAt: event.docReviewEndsAt,
     paymentPhaseEndsAt: event.paymentPhaseEndsAt,
+    paymentDrainEndsAt: event.paymentDrainEndsAt,
     departureDate: event.scheduledDepartureDate ?? row.departureDate,
   };
 }
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
index 7e01d883c..0d7d78b56 100644
--- a/apps/edr-freight-web/backoffice/src/hooks/contract-templates/useContractTemplates.ts
+++ b/apps/edr-freight-web/backoffice/src/hooks/contract-templates/useContractTemplates.ts
@@ -4,6 +4,7 @@ import toast from "react-hot-toast";
 import {
   contractTemplatesService,
   type ArticlePayload,
+  type CreateContractTemplatePayload,
   type UpdateContractTemplatePayload,
 } from "@/services/contract-templates.service";
 
@@ -59,6 +60,21 @@ function useTemplateMutation<TVariables>(
   });
 }
 
+export function useCreateContractTemplate() {
+  return useTemplateMutation(
+    (payload: CreateContractTemplatePayload) =>
+      contractTemplatesService.create(payload),
+    "Template created",
+  );
+}
+
+export function useDeleteContractTemplate() {
+  return useTemplateMutation(
+    (code: string) => contractTemplatesService.remove(code),
+    "Template deleted",
+  );
+}
+
 export function useUpdateContractTemplate(code: string) {
   return useTemplateMutation(
     (payload: UpdateContractTemplatePayload) =>
diff --git a/apps/edr-freight-web/backoffice/src/hooks/portal-content/usePortalContentAdmin.ts b/apps/edr-freight-web/backoffice/src/hooks/portal-content/usePortalContentAdmin.ts
new file mode 100644
index 000000000..49e76c80b
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/hooks/portal-content/usePortalContentAdmin.ts
@@ -0,0 +1,78 @@
+import type { SupportDocPayload, SupportDocSlug } from "@edr/types";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import toast from "react-hot-toast";
+
+import { portalContentService } from "@/services/portal-content.service";
+
+/**
+ * Every key shares the `portal-content` prefix so one invalidate after a save
+ * or a restore sweeps the document and its version list together.
+ */
+const KEYS = {
+  ROOT: ["portal-content"] as const,
+  bySlug: (slug: string) => ["portal-content", "detail", slug] as const,
+  versions: (slug: string) => ["portal-content", "versions", slug] as const,
+};
+
+export function usePortalDoc(slug: SupportDocSlug) {
+  return useQuery({
+    queryKey: KEYS.bySlug(slug),
+    queryFn: () => portalContentService.getBySlug(slug),
+  });
+}
+
+/** Version history. Stays idle until the history modal is opened. */
+export function usePortalDocVersions(slug: SupportDocSlug, enabled: boolean) {
+  return useQuery({
+    queryKey: KEYS.versions(slug),
+    queryFn: () => portalContentService.listVersions(slug),
+    enabled,
+  });
+}
+
+/** One historical payload, fetched only when a version is previewed. */
+export function usePortalDocVersion(
+  slug: SupportDocSlug,
+  version: number | null,
+) {
+  return useQuery({
+    queryKey: [...KEYS.versions(slug), version],
+    queryFn: () => portalContentService.getVersion(slug, version as number),
+    enabled: version !== null,
+  });
+}
+
+function usePortalContentMutation<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 useUpdatePortalDoc(slug: SupportDocSlug) {
+  return usePortalContentMutation(
+    (vars: { payload: SupportDocPayload; note?: string }) =>
+      portalContentService.update(slug, vars.payload, vars.note),
+    "Portal content saved",
+  );
+}
+
+export function useRestorePortalVersion(slug: SupportDocSlug) {
+  return usePortalContentMutation(
+    (version: number) => portalContentService.restore(slug, version),
+    "Version restored",
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/layout/TopBar.tsx b/apps/edr-freight-web/backoffice/src/layout/TopBar.tsx
index 87a56efde..708a5a3ca 100644
--- a/apps/edr-freight-web/backoffice/src/layout/TopBar.tsx
+++ b/apps/edr-freight-web/backoffice/src/layout/TopBar.tsx
@@ -6,8 +6,6 @@ import {
   LogOut,
   User,
   Key,
-  Moon,
-  Sun,
   Home,
   Menu,
 } from "lucide-react";
@@ -25,7 +23,6 @@ import { NavLink, useNavigate, useLocation } from "react-router-dom";
 import { useRef, useEffect, useState } from "react";
 import { FiBell } from "react-icons/fi";
 import { useUser } from "@/shared/context/UserContext";
-import { useDarkMode } from "@/shared/hooks/useDarkMode";
 import {
   UI_LANGUAGE_OPTIONS,
   getUiLanguageLabel,
@@ -49,7 +46,6 @@ export const TopBar = () => {
   const { pathname } = useLocation();
   const { logout } = useAuthUser();
   const userDetails = useUser();
-  const { isDarkMode, toggleDarkMode } = useDarkMode();
   const { config: tenantConfig } = useTenantConfig();
   const moduleConfig = resolveModuleConfig(tenantConfig);
   const isAdminModuleVisible = userDetails?.roles?.some(
@@ -66,7 +62,6 @@ export const TopBar = () => {
     moduleConfig.siteManagement && isAdminModuleVisible,
   ].filter(Boolean).length;
   const shouldShowHomePageLink = visibleModuleCount > 1;
-  const isObjectiveManagementRoute = pathname.startsWith("/objective-management");
   const fullName = userDetails?.name?.en || t("user");
   const splittedName = fullName.trim().split(" ");
   const initials =
@@ -269,19 +264,6 @@ export const TopBar = () => {
           )}
         </div>
 
-        <Button
-          onClick={toggleDarkMode}
-          aria-label="Toggle Dark Mode"
-          className="p-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors duration-200"
-          title={isDarkMode ? "Switch to light mode" : "Switch to dark mode"}
-          style={{ display: isObjectiveManagementRoute ? "none" : "block" }}>
-          {isDarkMode ? (
-            <Sun className="h-5 w-5 text-yellow-500" />
-          ) : (
-            <Moon className="h-5 w-5 text-gray-600" />
-          )}
-        </Button>
-
         <DropdownMenu>
           <DropdownMenuTrigger asChild>
             <Button
diff --git a/apps/edr-freight-web/backoffice/src/layout/components/Header.tsx b/apps/edr-freight-web/backoffice/src/layout/components/Header.tsx
index 9d075f347..c94eb6171 100644
--- a/apps/edr-freight-web/backoffice/src/layout/components/Header.tsx
+++ b/apps/edr-freight-web/backoffice/src/layout/components/Header.tsx
@@ -18,11 +18,8 @@ import {
   Info,
   Menu,
   X,
-  Moon,
-  Sun,
 } from "lucide-react";
 import { useUser } from "@/shared/context/UserContext";
-import { useDarkMode } from "@/shared/hooks/useDarkMode";
 import { useTenantConfig, resolveModuleConfig } from "@/layout/components/TenantConfig";
 import {
   UI_LANGUAGE_OPTIONS,
@@ -55,7 +52,6 @@ const Header = () => {
   const location = useLocation();
   const isComplaintContext = isComplaintAuthContext(location.pathname);
   const { isAuthenticated, showExternalPortalChrome } = useExternalPortalSession();
-  const { isDarkMode, toggleDarkMode } = useDarkMode();
   const { config: tenantConfig } = useTenantConfig();
   const moduleConfig = resolveModuleConfig(tenantConfig);
 
@@ -480,22 +476,6 @@ const Header = () => {
                     </SelectContent>
                   </Select>
                 </div>
-                {/* Dark Mode Toggle */}
-                <motion.button
-                  onClick={toggleDarkMode}
-                  whileHover={{ scale: 1.05 }}
-                  whileTap={{ scale: 0.95 }}
-                  className="p-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 transition-colors duration-200"
-                  title={
-                    isDarkMode ? "Switch to light mode" : "Switch to dark mode"
-                  }
-                >
-                  {isDarkMode ? (
-                    <Sun className="h-5 w-5 text-yellow-500" />
-                  ) : (
-                    <Moon className="h-5 w-5 text-gray-600" />
-                  )}
-                </motion.button>
                 <motion.button
                   onClick={handleSignIn}
                   whileHover={{
@@ -646,26 +626,6 @@ const Header = () => {
                       </Select>
                     </div>
 
-                    {/* Dark Mode Toggle for Mobile */}
-                    <motion.button
-                      onClick={toggleDarkMode}
-                      whileHover={{ scale: 1.02 }}
-                      whileTap={{ scale: 0.98 }}
-                      className="block w-full px-4 py-3 text-base font-medium text-center text-gray-700 dark:text-gray-200 bg-gray-100 dark:bg-gray-700 rounded-lg shadow hover:bg-gray-200 dark:hover:bg-gray-600 transition-all duration-200 flex items-center justify-center gap-2"
-                    >
-                      {isDarkMode ? (
-                        <>
-                          <Sun className="h-5 w-5 text-yellow-500" />
-                          {t("landingPage.lightMode")}
-                        </>
-                      ) : (
-                        <>
-                          <Moon className="h-5 w-5 text-gray-600" />
-                          {t("landingPage.darkMode")}
-                        </>
-                      )}
-                    </motion.button>
-
                     <motion.button
                       onClick={() => {
                         handleSignIn();
diff --git a/apps/edr-freight-web/backoffice/src/lib/landing.test.ts b/apps/edr-freight-web/backoffice/src/lib/landing.test.ts
new file mode 100644
index 000000000..e286e197d
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/lib/landing.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it } from "vitest";
+
+import type { AuthUser } from "@/auth/types";
+import { FREIGHT_PERMS } from "./permissions";
+import { NO_ACCESS_PATH, resolveLandingPath } from "./landing";
+
+const withPermissions = (...keys: string[]): AuthUser => ({
+  permissionKeys: keys,
+});
+
+const withRole = (roleKey: string): AuthUser => ({ roles: [{ key: roleKey }] });
+
+describe("resolveLandingPath", () => {
+  it("keeps normal staff on the overview", () => {
+    expect(resolveLandingPath(withPermissions(FREIGHT_PERMS.overview.view))).toBe(
+      "/dashboard/overview",
+    );
+  });
+
+  it("sends super admins to the overview (they pass every check)", () => {
+    expect(resolveLandingPath(withRole("super_admin"))).toBe(
+      "/dashboard/overview",
+    );
+  });
+
+  it("sends IAM-only admins to the user-management dashboard", () => {
+    // A pure unit_admin holds `can:*` IAM keys and no edr_freight_app:* key, so
+    // the freight sidebar filters down to nothing. Landing them on the overview
+    // is what produced the blank page.
+    for (const role of ["unit_admin", "admin", "organization_admin"]) {
+      expect(resolveLandingPath(withRole(role))).toBe(
+        "/user-management/user_management-dashboard",
+      );
+    }
+  });
+
+  it("lands staff without overview:view on a page they can see", () => {
+    const target = resolveLandingPath(
+      withPermissions(FREIGHT_PERMS.warehouses.view),
+    );
+    expect(target).not.toBe("/dashboard/overview");
+    expect(target.startsWith("/dashboard/")).toBe(true);
+  });
+
+  it("never returns /user-management for a freight-only staff key", () => {
+    // The Staff sidebar item points at /user-management, which redirects by
+    // ROLE — returning it here would ping-pong for a user with no IAM role.
+    expect(resolveLandingPath(withPermissions(FREIGHT_PERMS.staff.roles.view))).toBe(
+      NO_ACCESS_PATH,
+    );
+  });
+
+  it("falls back to the no-access page when nothing is granted", () => {
+    expect(resolveLandingPath({})).toBe(NO_ACCESS_PATH);
+    expect(resolveLandingPath(null)).toBe(NO_ACCESS_PATH);
+  });
+});
diff --git a/apps/edr-freight-web/backoffice/src/lib/landing.ts b/apps/edr-freight-web/backoffice/src/lib/landing.ts
new file mode 100644
index 000000000..2cfd6f5d1
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/lib/landing.ts
@@ -0,0 +1,51 @@
+import {
+  buildSidebarSections,
+  filterSidebarByPermission,
+  flattenSidebarItems,
+} from "@/components/layout/sidebar-sections";
+
+import type { AuthUser } from "@/auth/types";
+
+import { isSuperAdmin } from "./permissions";
+
+/**
+ * IAM roles that grant the user-management subtree but no freight permissions.
+ * Mirrors the `allowedRoles` on the org-admin route group in
+ * `user-management/route.tsx` — a role outside this list is bounced by its
+ * PrivateRoute, so landing anyone else there would just bounce again.
+ */
+const IAM_ADMIN_ROLES = ["admin", "organization_admin", "unit_admin"];
+
+/** Terminal page for accounts with nothing granted. Never permission-gated. */
+export const NO_ACCESS_PATH = "/no-access";
+
+/**
+ * The first route a user can actually reach.
+ *
+ * Every redirect in the app funnels through here instead of hardcoding
+ * `/dashboard/overview`: that page is itself gated on `overview:view`, so
+ * sending a user who lacks the key there redirects them to the page that just
+ * rejected them — React Router renders nothing and the user sees a blank frame.
+ * A pure `unit_admin` holds only `can:*` IAM keys and no `edr_freight_app:*`
+ * key at all, so this hit them on every login.
+ */
+export function resolveLandingPath(user: AuthUser | null | undefined): string {
+  const visible = filterSidebarByPermission(buildSidebarSections([]), user);
+
+  // Only /dashboard/* items are safe landings. The "Staff" item points at
+  // /user-management, which re-redirects by ROLE — a freight user holding
+  // staff:* keys but no IAM role would ping-pong between the two.
+  const firstFreightPage = flattenSidebarItems(visible).find((item) =>
+    item.href.startsWith("/dashboard/"),
+  )?.href;
+  if (firstFreightPage) return firstFreightPage;
+
+  if (isSuperAdmin(user)) return "/user-management/dashboard";
+
+  const roleKeys = (user?.roles ?? []).map((role) => role.key ?? "");
+  if (roleKeys.some((key) => IAM_ADMIN_ROLES.includes(key))) {
+    return "/user-management/user_management-dashboard";
+  }
+
+  return NO_ACCESS_PATH;
+}
diff --git a/apps/edr-freight-web/backoffice/src/lib/permissions.ts b/apps/edr-freight-web/backoffice/src/lib/permissions.ts
index 8dbb61a7c..09790091d 100644
--- a/apps/edr-freight-web/backoffice/src/lib/permissions.ts
+++ b/apps/edr-freight-web/backoffice/src/lib/permissions.ts
@@ -6,7 +6,32 @@ export const FREIGHT_PERMS = {
     view: "edr_freight_app:overview:view",
   },
   support: {
-    view: "edr_freight_app:support:view",
+    agentView: "edr_freight_app:support:agent_view",
+    agentSend: "edr_freight_app:support:agent_send",
+  },
+  reports: {
+    view: "edr_freight_app:reports:view",
+  },
+  procurement: {
+    view: "edr_freight_app:procurement:view",
+    vendorManage: "edr_freight_app:procurement:vendor_manage",
+    acquisitionManage: "edr_freight_app:procurement:acquisition_manage",
+    disposalManage: "edr_freight_app:procurement:disposal_manage",
+  },
+  compliance: {
+    view: "edr_freight_app:compliance:view",
+    manage: "edr_freight_app:compliance:manage",
+  },
+  facilities: {
+    view: "edr_freight_app:facilities:view",
+    manage: "edr_freight_app:facilities:manage",
+  },
+  tradeAccess: {
+    view: "edr_freight_app:trade_access:view",
+    manage: "edr_freight_app:trade_access:manage",
+  },
+  staffUsers: {
+    view: "edr_freight_app:staff:users:view",
   },
   bookings: {
     view: "edr_freight_app:bookings:view",
@@ -27,6 +52,11 @@ export const FREIGHT_PERMS = {
     uploadClearanceOutput: "edr_freight_app:bookings:upload_clearance_output",
     finalizeClearance: "edr_freight_app:bookings:finalize_clearance",
     docReviewAlert: "edr_freight_app:bookings:doc_review_alert",
+    governmentExpedite: "edr_freight_app:bookings:government_expedite",
+    wagonCancellationView: "edr_freight_app:bookings:wagon_cancellation_view",
+    wagonCancellationVoid: "edr_freight_app:bookings:wagon_cancellation_void",
+    wagonCancellationRebook:
+      "edr_freight_app:bookings:wagon_cancellation_rebook",
   },
   contracts: {
     view: "edr_freight_app:contracts:view",
@@ -61,6 +91,9 @@ export const FREIGHT_PERMS = {
     clearanceEtActions: "edr_freight_app:contracts:clearance_et_actions",
     clearanceDjActions: "edr_freight_app:contracts:clearance_dj_actions",
     suspend: "edr_freight_app:contracts:suspend",
+    editDocument: "edr_freight_app:contracts:edit_document",
+    finalInvoiceRaise: "edr_freight_app:contracts:final_invoice_raise",
+    finalInvoiceConfirm: "edr_freight_app:contracts:final_invoice_confirm",
   },
   trainScheduling: {
     view: "edr_freight_app:train_scheduling:view",
@@ -69,6 +102,9 @@ export const FREIGHT_PERMS = {
     cancel: "edr_freight_app:train_scheduling:cancel",
     reschedule: "edr_freight_app:train_scheduling:reschedule",
     rulesManage: "edr_freight_app:train_scheduling:rules_manage",
+    dispatch: "edr_freight_app:train_scheduling:dispatch",
+    markPaid: "edr_freight_app:train_scheduling:mark_paid",
+    expireBooking: "edr_freight_app:train_scheduling:expire_booking",
   },
   fleet: {
     view: "edr_freight_app:fleet:view",
@@ -88,14 +124,15 @@ export const FREIGHT_PERMS = {
   },
   payments: {
     view: "edr_freight_app:payments:view",
-    verify: "edr_freight_app:payments:verify",
-    refund: "edr_freight_app:payments:refund",
   },
   invoices: {
     view: "edr_freight_app:invoices:view",
-    create: "edr_freight_app:invoices:create",
-    cancel: "edr_freight_app:invoices:cancel",
     export: "edr_freight_app:invoices:export",
+    confirmOffline: "edr_freight_app:invoices:confirm_offline",
+    // Filing with MoR EIMS. Held by named admins rather than a role preset: registration is
+    // irreversible at the tax authority, and resolving clears a system-wide filing block.
+    eimsRegister: "edr_freight_app:invoices:eims_register",
+    eimsResolve: "edr_freight_app:invoices:eims_resolve",
   },
   firstMile: {
     view: "edr_freight_app:first_mile:view",
@@ -142,6 +179,8 @@ export const FREIGHT_PERMS = {
     transferView: "edr_freight_app:wagons:transfer_view",
     transferCancel: "edr_freight_app:wagons:transfer_cancel",
     transferCloseShort: "edr_freight_app:wagons:transfer_close_short",
+    /** Maintenance ⇄ availability flip on the wagons desk (audited). */
+    statusToggle: "edr_freight_app:wagons:status_toggle",
   },
   trains: {
     view: "edr_freight_app:trains:view",
@@ -191,14 +230,12 @@ export const FREIGHT_PERMS = {
     create: "edr_freight_app:fuel:create",
     update: "edr_freight_app:fuel:update",
     delete: "edr_freight_app:fuel:delete",
-    approve: "edr_freight_app:fuel:approve",
   },
   maintenance: {
     view: "edr_freight_app:maintenance:view",
     create: "edr_freight_app:maintenance:create",
     update: "edr_freight_app:maintenance:update",
     delete: "edr_freight_app:maintenance:delete",
-    complete: "edr_freight_app:maintenance:complete",
   },
   fleetReports: {
     view: "edr_freight_app:fleet_reports:view",
@@ -278,6 +315,23 @@ export const FREIGHT_PERMS = {
       view: "edr_freight_app:settings:dropdown:view",
       manage: "edr_freight_app:settings:dropdown:manage",
     },
+    exchangeRate: {
+      view: "edr_freight_app:settings:exchange_rate:view",
+      manage: "edr_freight_app:settings:exchange_rate:manage",
+    },
+    contractTemplates: {
+      view: "edr_freight_app:settings:contract_templates:view",
+      manage: "edr_freight_app:settings:contract_templates:manage",
+      create: "edr_freight_app:settings:contract_templates:create",
+      update: "edr_freight_app:settings:contract_templates:update",
+      delete: "edr_freight_app:settings:contract_templates:delete",
+      read: "edr_freight_app:settings:contract_templates:read",
+    },
+    // Portal-facing help/FAQ/legal copy, edited from Portal content.
+    supportContent: {
+      view: "edr_freight_app:settings:support_content:view",
+      manage: "edr_freight_app:settings:support_content:manage",
+    },
   },
   audit: {
     view: "edr_freight_app:audit:view",
@@ -348,6 +402,14 @@ export function getPermissionKeys(user: AuthUser | null | undefined): string[] {
       for (const p of pos.permissions ?? []) {
         if (p.key) keys.add(p.key);
       }
+      // Positions created through the admin UI keep their grants on the
+      // position TYPE, not the position — miss these and such staff resolve to
+      // zero permissions and every gated route rejects them. `/api/me` folds
+      // them into the position's permission list, but older payloads may still
+      // carry them separately.
+      for (const p of pos.positionType?.permissions ?? []) {
+        if (p.key) keys.add(p.key);
+      }
     }
   }
   return [...keys];
@@ -563,7 +625,9 @@ export function canViewScheduling(user: AuthUser | null | undefined): boolean {
 }
 
 /** Any train-scheduling write action (create / update / cancel / reschedule). */
-export function canManageScheduling(user: AuthUser | null | undefined): boolean {
+export function canManageScheduling(
+  user: AuthUser | null | undefined,
+): boolean {
   return (
     hasPermission(user, FREIGHT_PERMS.trainScheduling.create) ||
     hasPermission(user, FREIGHT_PERMS.trainScheduling.update) ||
@@ -595,19 +659,13 @@ export type FleetCrudResource =
   | "vehicles"
   | "drivers";
 
-/**
- * Per-resource fleet CRUD check. The legacy coarse fleet:manage key still
- * grants every action (mirrors the API's one-of guard fallback).
- */
+/** Per-resource fleet CRUD check — each resource needs its own grant. */
 export function canFleetAction(
   user: AuthUser | null | undefined,
   resource: FleetCrudResource,
   action: "create" | "update" | "delete",
 ): boolean {
-  return (
-    hasPermission(user, FREIGHT_PERMS[resource][action]) ||
-    hasPermission(user, FREIGHT_PERMS.fleet.manage)
-  );
+  return hasPermission(user, FREIGHT_PERMS[resource][action]);
 }
 
 /**
diff --git a/apps/edr-freight-web/backoffice/src/main.tsx b/apps/edr-freight-web/backoffice/src/main.tsx
index 3de483c5b..055557ae9 100644
--- a/apps/edr-freight-web/backoffice/src/main.tsx
+++ b/apps/edr-freight-web/backoffice/src/main.tsx
@@ -31,24 +31,19 @@ import { QueryClientProvider } from "@tanstack/react-query";
 
 const THEME_STORAGE_KEY = "edr-theme";
 
-const applyStoredTheme = () => {
-  const storedTheme = window.localStorage.getItem(THEME_STORAGE_KEY);
-  const prefersDark = window.matchMedia?.("(prefers-color-scheme: dark)").matches;
-  const theme = storedTheme === "dark" || storedTheme === "light"
-    ? storedTheme
-    : prefersDark
-      ? "dark"
-      : "light";
-
-  if (theme === "dark") {
-    document.documentElement.classList.add("dark");
-    return;
-  }
-
+/**
+ * The backoffice is light-only. This runs before render for two reasons:
+ * strip the `dark` class in case anything ever adds it, and evict the
+ * `edr-theme` key that earlier builds persisted — without the eviction, a user
+ * who had toggled dark before this change keeps a "dark" value in
+ * localStorage that any future re-read would resurrect.
+ */
+const forceLightTheme = () => {
   document.documentElement.classList.remove("dark");
+  window.localStorage.removeItem(THEME_STORAGE_KEY);
 };
 
-applyStoredTheme();
+forceLightTheme();
 
 // Must run before render so replay and exception capture cover startup errors.
 // No-ops when VITE_POSTHOG_KEY is unset.
@@ -63,7 +58,7 @@ if (!rootElement) {
 createRoot(rootElement).render(
   <PostHogProvider client={posthog}>
     <QueryClientProvider client={queryClient}>
-      <MantineProvider theme={freightMantineTheme}>
+      <MantineProvider theme={freightMantineTheme} forceColorScheme="light">
         <StrictMode>
           <BrowserRouter>
             <AuthProvider>
diff --git a/apps/edr-freight-web/backoffice/src/pages/HomePage/Header.tsx b/apps/edr-freight-web/backoffice/src/pages/HomePage/Header.tsx
index 645b72d9c..ed569a83d 100644
--- a/apps/edr-freight-web/backoffice/src/pages/HomePage/Header.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/HomePage/Header.tsx
@@ -25,8 +25,6 @@ import {
   Cog,
   Bolt,
   Globe,
-  Moon,
-  Sun,
 } from "lucide-react";
 import {
   DropdownMenu,
@@ -39,7 +37,6 @@ import { Button } from "@/shared/common/ui/button";
 import { useTheme } from "@/user-management/web-Management/hooks/useTheme";
 import { useLocalizedName } from "@/shared/common/localizedName";
 import { useModules } from "@/user-management/web-Management/hooks/useModules";
-import { useDarkMode } from "@/shared/hooks/useDarkMode";
 import {
   useTenantConfig,
   resolveModuleConfig,
@@ -98,7 +95,6 @@ const Header = () => {
     logout();
   };
 
-  const { isDarkMode, toggleDarkMode } = useDarkMode();
 
   useEffect(() => {
     if (!localStorage.getItem("i18nextLng")) {
@@ -440,22 +436,6 @@ const Header = () => {
               ))}
             </div>
             <div className="hidden md:flex items-center gap-3 lg:gap-4">
-              <motion.button
-                onClick={toggleDarkMode}
-                className="p-2 rounded-lg text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-800 transition-colors"
-                whileHover={{ scale: 1.05 }}
-                whileTap={{ scale: 0.95 }}
-                aria-label={
-                  isDarkMode ? t("header.lightMode") : t("header.darkMode")
-                }
-              >
-                {isDarkMode ? (
-                  <Sun className="w-5 h-5" />
-                ) : (
-                  <Moon className="w-5 h-5" />
-                )}
-              </motion.button>
-
               <div className="w-32 lg:w-36">
                 <Select
                   value={currentLanguage}
@@ -544,21 +524,6 @@ const Header = () => {
             </div>
 
             <div className="flex items-center md:hidden gap-2">
-              <motion.button
-                onClick={toggleDarkMode}
-                className="p-2 rounded-lg text-gray-600 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-800 transition-colors"
-                whileTap={{ scale: 0.9 }}
-                aria-label={
-                  isDarkMode ? t("header.lightMode") : t("header.darkMode")
-                }
-              >
-                {isDarkMode ? (
-                  <Sun className="h-5 w-5" />
-                ) : (
-                  <Moon className="h-5 w-5" />
-                )}
-              </motion.button>
-
               <motion.button
                 onClick={() => setMobileMenuOpen(!mobileMenuOpen)}
                 className="inline-flex items-center justify-center p-2 rounded-lg text-gray-600 hover:text-gray-900 hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-all"
diff --git a/apps/edr-freight-web/backoffice/src/pages/NoAccessPage.tsx b/apps/edr-freight-web/backoffice/src/pages/NoAccessPage.tsx
new file mode 100644
index 000000000..06d19ac5f
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/NoAccessPage.tsx
@@ -0,0 +1,32 @@
+import { ShieldOff } from "lucide-react";
+
+import { useAuth } from "@/auth/useAuth";
+import { Button } from "@/components/ui/button";
+
+/**
+ * Terminal page for an account with no freight permissions and no IAM admin
+ * role. Reached via `resolveLandingPath`, which needs one destination that can
+ * never bounce — every other page is permission-gated.
+ */
+export default function NoAccessPage() {
+  const { user, logout } = useAuth();
+
+  return (
+    <div className="flex min-h-screen items-center justify-center p-6">
+      <div className="w-full max-w-md space-y-4 rounded-lg border p-8 text-center">
+        <ShieldOff className="mx-auto h-10 w-10 text-muted-foreground" />
+        <h1 className="text-lg font-semibold">No access assigned</h1>
+        <p className="text-sm text-muted-foreground">
+          Your account has no permissions assigned yet, so there are no pages to
+          show. Contact your administrator to have a position or role assigned.
+        </p>
+        {user?.email ? (
+          <p className="text-xs text-muted-foreground">Signed in as {user.email}</p>
+        ) : null}
+        <Button variant="outline" onClick={logout}>
+          Log out
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/auth/LoginPage.tsx b/apps/edr-freight-web/backoffice/src/pages/auth/LoginPage.tsx
index 811d7e34b..db4533d21 100644
--- a/apps/edr-freight-web/backoffice/src/pages/auth/LoginPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/auth/LoginPage.tsx
@@ -64,7 +64,9 @@ const LoginPage = () => {
 
     try {
       await verifyMfa({ email: normalizedIdentifier, otp: otp.trim() });
-      navigate("/dashboard/overview", { replace: true });
+      // "/" resolves to the user's own landing page once the session lands —
+      // not every user can see the overview.
+      navigate("/", { replace: true });
     } catch (err) {
       setError(extractApiError(err).message);
     } finally {
diff --git a/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx
index e77b4c44b..feee70b9d 100644
--- a/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx
@@ -22,6 +22,7 @@ import {
   Paper,
   Button,
   Box,
+  SegmentedControl,
 } from "@mantine/core";
 
 import { PageContainer } from "@/components/page";
@@ -258,6 +259,44 @@ export default function BookingRequestDetailPage() {
                   booking={booking}
                   mutations={mutations}
                 />
+                {booking.tradeDirection === "EXPORT" && (
+                  <Paper withBorder radius="md" p="sm">
+                    <Stack gap={6}>
+                      <Text size="sm" fw={600}>
+                        How the cargo reaches the train
+                      </Text>
+                      <SegmentedControl
+                        fullWidth
+                        size="xs"
+                        value={booking.exportHandoverMode ?? "WAREHOUSE"}
+                        data={[
+                          { value: "WAREHOUSE", label: "Warehouse then train" },
+                          { value: "DIRECT_TO_TRAIN", label: "Direct truck to train" },
+                        ]}
+                        onChange={async (value) => {
+                          try {
+                            await bookingsService.setExportHandoverMode(
+                              booking.id,
+                              value as "DIRECT_TO_TRAIN" | "WAREHOUSE",
+                            );
+                            await refetch();
+                          } catch (error) {
+                            toast.error(
+                              error instanceof Error
+                                ? error.message
+                                : "Could not change the handover mode",
+                            );
+                          }
+                        }}
+                      />
+                      <Text size="xs" c="dimmed">
+                        {booking.exportHandoverMode === "DIRECT_TO_TRAIN"
+                          ? "No warehouse receipt and no GRN — the carriage acceptance sheet is the handover document."
+                          : "Cargo is received at the warehouse and issued a GRN before loading."}
+                      </Text>
+                    </Stack>
+                  </Paper>
+                )}
                 {booking.isGovernment && booking.contractSummary && (
                   <Button
                     fullWidth
diff --git a/apps/edr-freight-web/backoffice/src/pages/bookings/NewBookingPage.tsx b/apps/edr-freight-web/backoffice/src/pages/bookings/NewBookingPage.tsx
index 489e324e8..41600272a 100644
--- a/apps/edr-freight-web/backoffice/src/pages/bookings/NewBookingPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/bookings/NewBookingPage.tsx
@@ -529,10 +529,7 @@ export default function NewBookingPage() {
                 />
                 <Select
                   label="Payment currency"
-                  data={[
-                    { value: "ETB", label: "ETB — Birr" },
-                    { value: "USD", label: "USD — Dollar" },
-                  ]}
+                  data={[{ value: "ETB", label: "ETB — Birr" }]}
                   value={paymentCurrency}
                   onChange={(v) => setPaymentCurrency(v ?? "ETB")}
                 />
diff --git a/apps/edr-freight-web/backoffice/src/pages/bookings/WagonCancellationsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/bookings/WagonCancellationsPage.tsx
new file mode 100644
index 000000000..fff83d479
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/bookings/WagonCancellationsPage.tsx
@@ -0,0 +1,420 @@
+import {
+  Anchor,
+  Badge,
+  Box,
+  Button,
+  Card,
+  Group,
+  Modal,
+  Select,
+  Stack,
+  Text,
+  TextInput,
+} from "@mantine/core";
+import { DateInput } from "@mantine/dates";
+import { useDebouncedValue } from "@mantine/hooks";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { Search, XCircle } from "lucide-react";
+import { useMemo, useState } from "react";
+import toast from "react-hot-toast";
+import { Link } from "react-router-dom";
+
+import { api } from "@/auth/http";
+import { useAuth } from "@/auth/useAuth";
+import { PageContainer, PageHeader } from "@/components/page";
+import { toDayString } from "@/hooks/useListControls";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+import {
+  DataTable,
+  DataTableFooter,
+  usePagination,
+  type ColumnDef,
+} from "@edr/ui-common";
+
+type WagonCancellationStatus =
+  | "FEE_PENDING"
+  | "CREDIT_AVAILABLE"
+  | "REBOOKED"
+  | "WITHDRAWN"
+  | "EXPIRED";
+
+interface WagonCancellation {
+  id: string;
+  bookingId: string;
+  rebookedBookingId?: string | null;
+  wagonsCancelled: number;
+  weightTons: number;
+  creditAmount: number;
+  feeAmount: number;
+  feeCurrency: string;
+  feeInvoiceId?: string | null;
+  feePaidAt?: string | null;
+  status: WagonCancellationStatus;
+  reason?: string | null;
+  rebookedAt?: string | null;
+  createdAt: string;
+  booking?: { id: string; reference: string; company?: { name: string } };
+  rebookedBooking?: { id: string; reference: string };
+  feeInvoice?: { invoiceNumber: string; status: string };
+}
+
+interface WagonCancellationListResponse {
+  items: WagonCancellation[];
+  total: number;
+}
+
+const STATUS_CHIP: Record<
+  WagonCancellationStatus,
+  { label: string; color: string }
+> = {
+  FEE_PENDING: { label: "Fee pending", color: "yellow" },
+  CREDIT_AVAILABLE: { label: "Credit available", color: "edr-green" },
+  REBOOKED: { label: "Rebooked", color: "indigo" },
+  WITHDRAWN: { label: "Withdrawn", color: "gray" },
+  EXPIRED: { label: "Expired", color: "red" },
+};
+
+const STATUS_FILTER_OPTIONS = (
+  Object.keys(STATUS_CHIP) as WagonCancellationStatus[]
+).map((s) => ({ value: s, label: STATUS_CHIP[s].label }));
+
+function StatusChip({ status }: { status: WagonCancellationStatus }) {
+  const chip = STATUS_CHIP[status] ?? { label: status, color: "gray" };
+  return (
+    <Badge
+      color={chip.color}
+      variant="light"
+      size="sm"
+      radius="md"
+      tt="uppercase"
+      fw={600}
+      style={{ fontSize: "0.7rem", letterSpacing: "0.05em" }}
+    >
+      {chip.label}
+    </Badge>
+  );
+}
+
+function formatDate(iso: string | null | undefined): string {
+  if (!iso) return "—";
+  const d = new Date(iso);
+  return Number.isNaN(d.getTime())
+    ? "—"
+    : d.toLocaleDateString(undefined, {
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+      });
+}
+
+function formatAmount(amount: number, currency: string): string {
+  return `${currency} ${Number(amount).toLocaleString(undefined, {
+    minimumFractionDigits: 2,
+  })}`;
+}
+
+/**
+ * Staff view of partial wagon cancellations: every slice of capacity a
+ * customer gave back, its cancellation fee, and where the credit went
+ * (rebooked, still available, expired, or the request was voided).
+ */
+export default function WagonCancellationsPage() {
+  const { user } = useAuth();
+  const canVoid = hasPermission(
+    user,
+    FREIGHT_PERMS.bookings.wagonCancellationVoid,
+  );
+
+  const { pagination, setPagination } = usePagination({ pageSize: 10 });
+  const [status, setStatus] = useState<string | null>(null);
+  const [search, setSearch] = useState("");
+  const [debouncedSearch] = useDebouncedValue(search, 300);
+  const [from, setFrom] = useState<Date | null>(null);
+  const [to, setTo] = useState<Date | null>(null);
+  const [voiding, setVoiding] = useState<WagonCancellation | null>(null);
+
+  const resetPage = () =>
+    setPagination({ pageIndex: 0, pageSize: pagination.pageSize });
+
+  const filter = useMemo(
+    () => ({
+      page: pagination.pageIndex + 1,
+      pageSize: pagination.pageSize,
+      ...(status ? { statuses: status } : {}),
+      ...(debouncedSearch.trim() ? { search: debouncedSearch.trim() } : {}),
+      ...(from ? { from: toDayString(from) } : {}),
+      ...(to ? { to: toDayString(to) } : {}),
+    }),
+    [pagination.pageIndex, pagination.pageSize, status, debouncedSearch, from, to],
+  );
+
+  const { data, isLoading, isError, refetch } = useQuery({
+    queryKey: ["bookings", "wagon-cancellations", filter],
+    queryFn: async () => {
+      const res = await api.get<WagonCancellationListResponse>(
+        "/bookings/wagon-cancellations/history",
+        { params: filter },
+      );
+      return res.data;
+    },
+  });
+  const rows = data?.items ?? [];
+  const total = data?.total ?? 0;
+  const pageCount = Math.max(1, Math.ceil(total / pagination.pageSize));
+
+  const withdraw = useMutation({
+    mutationFn: (id: string) =>
+      api.post(`/bookings/wagon-cancellations/${id}/withdraw`),
+  });
+
+  const columns: ColumnDef<WagonCancellation>[] = [
+    {
+      id: "requested",
+      header: () => <span>Requested</span>,
+      cell: ({ row }) => (
+        <Text size="xs" c="dimmed">
+          {formatDate(row.original.createdAt)}
+        </Text>
+      ),
+    },
+    {
+      id: "booking",
+      header: () => <span>Booking</span>,
+      cell: ({ row }) => (
+        <Anchor
+          component={Link}
+          to={`/dashboard/booking-requests/${row.original.bookingId}`}
+          size="sm"
+          fw={600}
+        >
+          {row.original.booking?.reference ?? row.original.bookingId}
+        </Anchor>
+      ),
+    },
+    {
+      id: "company",
+      header: () => <span>Company</span>,
+      cell: ({ row }) => (
+        <Text size="sm">{row.original.booking?.company?.name ?? "—"}</Text>
+      ),
+    },
+    {
+      id: "wagons",
+      header: () => <span>Wagons</span>,
+      cell: ({ row }) => <Text size="sm">{row.original.wagonsCancelled}</Text>,
+    },
+    {
+      id: "fee",
+      header: () => <span>Fee</span>,
+      cell: ({ row }) => (
+        <Text size="sm" style={{ fontVariantNumeric: "tabular-nums" }}>
+          {formatAmount(row.original.feeAmount, row.original.feeCurrency)}
+        </Text>
+      ),
+    },
+    {
+      id: "credit",
+      header: () => <span>Credit</span>,
+      cell: ({ row }) => (
+        <Text size="sm" style={{ fontVariantNumeric: "tabular-nums" }}>
+          {formatAmount(row.original.creditAmount, row.original.feeCurrency)}
+        </Text>
+      ),
+    },
+    {
+      id: "status",
+      header: () => <span>Status</span>,
+      cell: ({ row }) => <StatusChip status={row.original.status} />,
+    },
+    {
+      id: "rebookedAs",
+      header: () => <span>Rebooked as</span>,
+      cell: ({ row }) => {
+        const r = row.original;
+        if (!r.rebookedBookingId) return <Text size="sm">—</Text>;
+        return (
+          <Anchor
+            component={Link}
+            to={`/dashboard/booking-requests/${r.rebookedBookingId}`}
+            size="sm"
+          >
+            {r.rebookedBooking?.reference ?? r.rebookedBookingId}
+          </Anchor>
+        );
+      },
+    },
+    {
+      id: "actions",
+      header: () => <span />,
+      cell: ({ row }) => {
+        const r = row.original;
+        if (r.status !== "FEE_PENDING" || !canVoid) return null;
+        return (
+          <Group justify="flex-end" wrap="nowrap">
+            <Button
+              size="xs"
+              radius="md"
+              variant="subtle"
+              color="red"
+              onClick={() => setVoiding(r)}
+            >
+              Void
+            </Button>
+          </Group>
+        );
+      },
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <Stack gap="lg">
+        <PageHeader
+          title="Wagon cancellations"
+          subtitle="Partial wagon cancellations — fees charged, credits held, and where each credit was rebooked"
+          breadcrumbs={[
+            { label: "Bookings", href: "/dashboard/booking-requests" },
+            { label: "Wagon cancellations" },
+          ]}
+        />
+
+        <Card withBorder radius="md" p="md">
+          <Stack gap="md">
+            <Group gap="sm" wrap="wrap">
+              <TextInput
+                placeholder="Search booking ref or company…"
+                leftSection={<Search size={15} />}
+                value={search}
+                onChange={(e) => {
+                  setSearch(e.currentTarget.value);
+                  resetPage();
+                }}
+                w={260}
+                radius="md"
+              />
+              <Select
+                placeholder="Status"
+                data={STATUS_FILTER_OPTIONS}
+                value={status}
+                onChange={(v) => {
+                  setStatus(v);
+                  resetPage();
+                }}
+                clearable
+                w={190}
+                radius="md"
+              />
+              <DateInput
+                placeholder="From"
+                value={from}
+                onChange={(v) => {
+                  setFrom(v ? new Date(v) : null);
+                  resetPage();
+                }}
+                maxDate={to ?? undefined}
+                clearable
+                radius="md"
+                style={{ minWidth: 140 }}
+              />
+              <DateInput
+                placeholder="To"
+                value={to}
+                onChange={(v) => {
+                  setTo(v ? new Date(v) : null);
+                  resetPage();
+                }}
+                minDate={from ?? undefined}
+                clearable
+                radius="md"
+                style={{ minWidth: 140 }}
+              />
+              <Button
+                variant="subtle"
+                radius="md"
+                onClick={() => {
+                  setStatus(null);
+                  setSearch("");
+                  setFrom(null);
+                  setTo(null);
+                  resetPage();
+                }}
+              >
+                Clear
+              </Button>
+            </Group>
+
+            <Box style={{ overflowX: "auto" }} w="100%">
+              <DataTable
+                columns={columns}
+                data={rows}
+                status={isLoading ? "loading" : isError ? "error" : "success"}
+                pagination={{
+                  pageIndex: pagination.pageIndex,
+                  pageSize: pagination.pageSize,
+                  pageCount,
+                  totalCount: total,
+                }}
+                tableOptions={{
+                  state: { pagination },
+                  onPaginationChange: setPagination,
+                  manualPagination: true,
+                  pageCount,
+                }}
+                containerClassName="border-0 shadow-none bg-transparent"
+                footer={DataTableFooter}
+              />
+            </Box>
+          </Stack>
+        </Card>
+      </Stack>
+
+      <Modal
+        opened={Boolean(voiding)}
+        onClose={() => setVoiding(null)}
+        radius="md"
+        title="Void this cancellation?"
+      >
+        {!voiding ? null : (
+          <Stack gap="sm">
+            <Text size="sm">
+              {voiding.booking?.reference ?? voiding.bookingId} ·{" "}
+              {voiding.wagonsCancelled} wagon(s) · fee{" "}
+              {formatAmount(voiding.feeAmount, voiding.feeCurrency)}
+            </Text>
+            <Text size="sm" c="dimmed">
+              The pending fee is dropped and the wagons stay on the booking.
+              Voiding can't be undone.
+            </Text>
+            <Group justify="flex-end" gap="sm">
+              <Button
+                variant="default"
+                radius="md"
+                onClick={() => setVoiding(null)}
+              >
+                Keep it
+              </Button>
+              <Button
+                color="red"
+                radius="md"
+                leftSection={<XCircle size={15} />}
+                loading={withdraw.isPending}
+                onClick={async () => {
+                  try {
+                    await withdraw.mutateAsync(voiding.id);
+                    toast.success("Cancellation voided");
+                    setVoiding(null);
+                    void refetch();
+                  } catch {
+                    // interceptor surfaces the reason
+                  }
+                }}
+              >
+                Void
+              </Button>
+            </Group>
+          </Stack>
+        )}
+      </Modal>
+    </PageContainer>
+  );
+}
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
index 30b31f54d..1a66bbdd5 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplatesPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contract_templates/ContractTemplatesPage.tsx
@@ -1,11 +1,15 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
+import { useQuery } from "@tanstack/react-query";
 import {
   Badge,
   Box,
   Button,
   Card,
   Group,
+  Modal,
+  SegmentedControl,
+  Select,
   SimpleGrid,
   Skeleton,
   Stack,
@@ -19,11 +23,21 @@ import {
   Container,
   Eye,
   FileText,
+  Lock,
   Pencil,
+  Plus,
+  Trash2,
 } from "lucide-react";
 
+import { useAuth } from "@/auth/useAuth";
 import { PageContainer, PageHeader } from "@/components/page";
-import { useContractTemplates } from "@/hooks/contract-templates/useContractTemplates";
+import {
+  useContractTemplates,
+  useCreateContractTemplate,
+  useDeleteContractTemplate,
+} from "@/hooks/contract-templates/useContractTemplates";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+import { cargoTypesService } from "@/services/cargo-types.service";
 import type { ContractTemplate } from "@/services/contract-templates.service";
 import TemplatePreviewModal from "./TemplatePreviewModal";
 
@@ -39,22 +53,18 @@ const DIRECTION_DOT: Record<string, string> = {
   INTERCITY: "var(--mantine-color-orange-5)",
 };
 
-function templateDirection(code: ContractTemplate["code"]): string {
-  return code.split("_")[0];
+function isBulk(template: ContractTemplate): boolean {
+  return Boolean(template.cargoTypeId);
 }
 
-// Codes are DIRECTION_FREIGHT_{CUSTOMS,NO_CUSTOMS}, so the freight segment is
-// the second one — never the suffix.
-function isBulk(code: ContractTemplate["code"]): boolean {
-  return code.split("_")[1] === "BULK";
-}
-
-// Intercity is domestic and crosses no border, so it has no customs variant at
-// all — hence null rather than false, which would wrongly read as a deliberate
-// "client clears its own customs" choice.
-function customsVariant(code: ContractTemplate["code"]): boolean | null {
-  if (code.endsWith("_NO_CUSTOMS")) return false;
-  if (code.endsWith("_CUSTOMS")) return true;
+// System container codes are DIRECTION_CONTAINER(_CUSTOMS); intercity is
+// domestic and crosses no border, so it has no customs variant at all — hence
+// null rather than false, which would wrongly read as a deliberate "client
+// clears its own customs" choice.
+function customsVariant(template: ContractTemplate): boolean | null {
+  if (isBulk(template)) return template.withCustoms ?? null;
+  if (template.code.endsWith("_NO_CUSTOMS")) return false;
+  if (template.code.endsWith("_CUSTOMS")) return true;
   return null;
 }
 
@@ -66,10 +76,28 @@ function formatUpdated(value: string): string {
   });
 }
 
+interface CargoTypeOption {
+  id: string;
+  cargoTypeName?: string;
+  hasContractTemplate?: boolean;
+}
+
 export default function ContractTemplatesPage() {
   const navigate = useNavigate();
+  const { user } = useAuth();
   const { data: templates, isLoading } = useContractTemplates();
   const [previewCode, setPreviewCode] = useState<string | null>(null);
+  const [createOpen, setCreateOpen] = useState(false);
+  const [deleteTarget, setDeleteTarget] = useState<ContractTemplate | null>(null);
+
+  const perms = FREIGHT_PERMS.settings.contractTemplates;
+  const isAdmin = hasPermission(user, FREIGHT_PERMS.admin);
+  const canManage = isAdmin || hasPermission(user, perms.manage);
+  const canCreate = canManage || hasPermission(user, perms.create);
+  const canUpdate = canManage || hasPermission(user, perms.update);
+  const canDelete = isAdmin || hasPermission(user, perms.delete);
+
+  const deleteTemplate = useDeleteContractTemplate();
 
   const previewTemplate = templates?.find((t) => t.code === previewCode);
 
@@ -77,20 +105,34 @@ export default function ContractTemplatesPage() {
     <PageContainer>
       <PageHeader
         title="Contract templates"
-        subtitle="The ten contract documents generated when a contract is approved — one per trade direction, freight type, and customs-clearing option. Intercity is domestic, so it has no customs variant. Articles are fully editable."
+        subtitle="The five container contract documents are built in — one per trade direction and customs-clearing option. Bulk contracts are written per cargo type: create one template per commodity and customs option. Articles are fully editable."
+        action={
+          canCreate ? (
+            <Button
+              color="edr-green"
+              leftSection={<Plus size={16} />}
+              onClick={() => setCreateOpen(true)}
+            >
+              New bulk template
+            </Button>
+          ) : undefined
+        }
       />
 
       <SimpleGrid cols={{ base: 1, md: 2, xl: 3 }} spacing="lg">
         {isLoading
-          ? Array.from({ length: 10 }, (_, i) => <TemplateCardSkeleton key={i} />)
+          ? Array.from({ length: 6 }, (_, i) => <TemplateCardSkeleton key={i} />)
           : (templates ?? []).map((template) => (
               <TemplateCard
                 key={template.code}
                 template={template}
+                canUpdate={canUpdate}
+                canDelete={canDelete}
                 onPreview={() => setPreviewCode(template.code)}
                 onEdit={() =>
                   navigate(`/dashboard/contract-templates/${template.code}`)
                 }
+                onDelete={() => setDeleteTarget(template)}
               />
             ))}
       </SimpleGrid>
@@ -100,22 +142,174 @@ export default function ContractTemplatesPage() {
         title={previewTemplate ? `${previewTemplate.name} — preview` : undefined}
         onClose={() => setPreviewCode(null)}
       />
+
+      <CreateTemplateModal
+        opened={createOpen}
+        onClose={() => setCreateOpen(false)}
+        onCreated={(code) => {
+          setCreateOpen(false);
+          navigate(`/dashboard/contract-templates/${code}`);
+        }}
+      />
+
+      {/* ── Delete confirm ─────────────────────────────────────── */}
+      <Modal
+        opened={Boolean(deleteTarget)}
+        onClose={() => setDeleteTarget(null)}
+        title="Delete contract template?"
+        centered
+        size="sm"
+      >
+        <Stack gap="md">
+          <Text size="sm">
+            This will delete{" "}
+            <Text span fw={600}>
+              {deleteTarget?.name}
+            </Text>{" "}
+            and its articles. Contracts already generated keep their frozen
+            document; new contracts for this combination fall back to the
+            generic layout until a new template is created.
+          </Text>
+          <Group justify="flex-end" gap="sm">
+            <Button variant="default" onClick={() => setDeleteTarget(null)}>
+              Cancel
+            </Button>
+            <Button
+              color="red"
+              loading={deleteTemplate.isPending}
+              onClick={() => {
+                if (!deleteTarget) return;
+                deleteTemplate.mutate(deleteTarget.code, {
+                  onSuccess: () => setDeleteTarget(null),
+                });
+              }}
+            >
+              Delete
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
     </PageContainer>
   );
 }
 
+/**
+ * Staff pick the customs option first, then a bulk cargo type that has
+ * "has contract template" enabled. One template per combination — the API
+ * rejects duplicates, so an existing pairing must be edited instead.
+ */
+function CreateTemplateModal({
+  opened,
+  onClose,
+  onCreated,
+}: {
+  opened: boolean;
+  onClose: () => void;
+  onCreated: (code: string) => void;
+}) {
+  const [withCustoms, setWithCustoms] = useState<string>("true");
+  const [cargoTypeId, setCargoTypeId] = useState<string | null>(null);
+  const create = useCreateContractTemplate();
+
+  const { data: cargoTypes, isLoading } = useQuery({
+    queryKey: ["cargo-types", "contract-template-options"],
+    queryFn: () => cargoTypesService.getCargoTypes(),
+    enabled: opened,
+  });
+
+  const options = useMemo(
+    () =>
+      ((cargoTypes ?? []) as CargoTypeOption[])
+        .filter((cargoType) => cargoType.hasContractTemplate)
+        .map((cargoType) => ({
+          value: cargoType.id,
+          label: cargoType.cargoTypeName ?? "Untitled",
+        })),
+    [cargoTypes],
+  );
+
+  const close = () => {
+    setCargoTypeId(null);
+    onClose();
+  };
+
+  return (
+    <Modal opened={opened} onClose={close} title="New bulk contract template" centered>
+      <Stack gap="md">
+        <div>
+          <Text size="sm" fw={500} mb={6}>
+            Customs clearing
+          </Text>
+          <SegmentedControl
+            fullWidth
+            value={withCustoms}
+            onChange={setWithCustoms}
+            data={[
+              { value: "true", label: "With customs clearing" },
+              { value: "false", label: "Without customs clearing" },
+            ]}
+          />
+        </div>
+
+        <Select
+          label="Bulk cargo type"
+          description="Only cargo types with “has contract template” enabled are listed"
+          placeholder={isLoading ? "Loading…" : "Select a cargo type"}
+          data={options}
+          value={cargoTypeId}
+          onChange={setCargoTypeId}
+          searchable
+          nothingFoundMessage="No cargo type allows contract templates yet — enable the flag on the cargo type first"
+        />
+
+        <Group justify="flex-end" gap="sm">
+          <Button variant="default" onClick={close}>
+            Cancel
+          </Button>
+          <Button
+            color="edr-green"
+            disabled={!cargoTypeId}
+            loading={create.isPending}
+            onClick={() => {
+              if (!cargoTypeId) return;
+              create.mutate(
+                { cargoTypeId, withCustoms: withCustoms === "true" },
+                {
+                  onSuccess: (template) =>
+                    onCreated((template as ContractTemplate).code),
+                },
+              );
+            }}
+          >
+            Create template
+          </Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+}
+
 function TemplateCard({
   template,
+  canUpdate,
+  canDelete,
   onPreview,
   onEdit,
+  onDelete,
 }: {
   template: ContractTemplate;
+  canUpdate: boolean;
+  canDelete: boolean;
   onPreview: () => void;
   onEdit: () => void;
+  onDelete: () => void;
 }) {
-  const direction = templateDirection(template.code);
-  const bulk = isBulk(template.code);
-  const customs = customsVariant(template.code);
+  const bulk = isBulk(template);
+  const direction = template.code.split("_")[0];
+  const customs = customsVariant(template);
+  const kicker = bulk
+    ? `${template.cargoType?.cargoTypeName ?? "Bulk cargo"} · Bulk`
+    : `${DIRECTION_LABEL[direction] ?? direction} · Container`;
 
   return (
     <Card
@@ -142,12 +336,13 @@ function TemplateCard({
                 style={{
                   borderRadius: 999,
                   flexShrink: 0,
-                  background: DIRECTION_DOT[direction] ?? "var(--mantine-color-gray-5)",
+                  background: bulk
+                    ? "var(--mantine-color-teal-5)"
+                    : DIRECTION_DOT[direction] ?? "var(--mantine-color-gray-5)",
                 }}
               />
               <Text size="xs" fw={600} tt="uppercase" lts="0.06em" c="dimmed">
-                {DIRECTION_LABEL[direction] ?? direction} ·{" "}
-                {bulk ? "Bulk" : "Container"}
+                {kicker}
               </Text>
             </Group>
           </Group>
@@ -166,6 +361,18 @@ function TemplateCard({
                 </Badge>
               </Tooltip>
             )}
+            {template.isSystem && (
+              <Tooltip label="Built-in template — cannot be deleted" withArrow>
+                <Badge
+                  size="sm"
+                  variant="light"
+                  color="gray"
+                  leftSection={<Lock size={11} />}
+                >
+                  System
+                </Badge>
+              </Tooltip>
+            )}
             {!template.isActive && (
               <Tooltip label="Not used for new contracts" withArrow>
                 <Badge size="sm" variant="light" color="red">
@@ -221,16 +428,34 @@ function TemplateCard({
           >
             Preview
           </Button>
-          <Button
-            variant="light"
-            color="edr-green"
-            size="compact-sm"
-            radius="md"
-            leftSection={<Pencil size={14} />}
-            onClick={onEdit}
-          >
-            Edit articles
-          </Button>
+          <Group gap={6} wrap="nowrap">
+            {canDelete && !template.isSystem && (
+              <Tooltip label="Delete template" withArrow>
+                <Button
+                  variant="subtle"
+                  color="red"
+                  size="compact-sm"
+                  radius="md"
+                  px={8}
+                  onClick={onDelete}
+                >
+                  <Trash2 size={14} />
+                </Button>
+              </Tooltip>
+            )}
+            {canUpdate && (
+              <Button
+                variant="light"
+                color="edr-green"
+                size="compact-sm"
+                radius="md"
+                leftSection={<Pencil size={14} />}
+                onClick={onEdit}
+              >
+                Edit articles
+              </Button>
+            )}
+          </Group>
         </Group>
       </Box>
     </Card>
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx
index 8a7949410..ca4ed18ce 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx
@@ -161,10 +161,10 @@ export default function ClearanceDocumentsPage() {
                 <User className="size-4" strokeWidth={1.75} />
               </div>
               <div className="min-w-0">
-                <p className="truncate font-medium text-foreground">
+                <p className="font-medium text-foreground">
                   {customer}
                 </p>
-                <p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
+                <p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground">
                   <FileText className="size-3 shrink-0 opacity-70" />
                   {b.reference}
                 </p>
@@ -182,7 +182,7 @@ export default function ClearanceDocumentsPage() {
             <ContractReferenceLink
               contractId={b.contractId}
               contractReference={b.contractReference}
-              className="block truncate text-sm text-foreground underline underline-offset-2 hover:text-muted-foreground"
+              className="block text-sm text-foreground underline underline-offset-2 hover:text-muted-foreground"
             />
           ) : (
             <Text size="sm">—</Text>
@@ -409,7 +409,7 @@ export default function ClearanceDocumentsPage() {
                     manualPagination: true,
                     pageCount,
                   }}
-                  containerClassName="border-0 shadow-none bg-transparent"
+                  containerClassName="border-0 shadow-none bg-transparent [&_th]:max-w-[100px] [&_td]:max-w-[100px] [&_td]:break-words"
                   footer={DataTableFooter}
                 />
               </Box>
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx
index 3b4d2edd9..b49eb419c 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx
@@ -311,6 +311,7 @@ export default function ContractClearanceDetailPage() {
             note={clearance.linkedBookingReviewNote}
             scheduledDate={clearance.linkedBookingScheduledDate}
             canResubmit={canResubmitBooking}
+            editHref={`/dashboard/contracts/${id}/bookings/${linkedBookingId}/complete?copyFrom=${linkedBookingId}`}
             onResubmitted={() => {
               void refetch();
               void refetchContract();
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 3d1e20bb6..8719f644a 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
@@ -393,10 +393,10 @@ function ShipmentBookingsTable({
               <PackageCheck className="size-4" strokeWidth={1.75} />
             </div>
             <div className="min-w-0">
-              <p className="truncate font-medium text-foreground">
+              <p className="font-medium text-foreground">
                 {row.original.reference}
               </p>
-              <p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
+              <p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground">
                 <User className="size-3 shrink-0 opacity-70" />
                 {row.original.customerLabel}
               </p>
@@ -413,7 +413,7 @@ function ShipmentBookingsTable({
             <Stack gap={4} py={2}>
               <Group gap={6} wrap="nowrap">
                 <FileText size={13} className="shrink-0 text-muted-foreground" />
-                <Text size="sm" fw={500} truncate maw={150}>
+                <Text size="sm" fw={500}>
                   {r.contractReference ?? "—"}
                 </Text>
               </Group>
@@ -431,13 +431,9 @@ function ShipmentBookingsTable({
         header: () => <span className={bookingTable.headerCell}>Route</span>,
         cell: ({ row }) => (
           <Group gap={6} wrap="nowrap">
-            <Text size="sm" className="truncate">
-              {row.original.originLabel}
-            </Text>
+            <Text size="sm">{row.original.originLabel}</Text>
             <ArrowRight size={13} className="shrink-0 text-muted-foreground" />
-            <Text size="sm" className="truncate">
-              {row.original.destinationLabel}
-            </Text>
+            <Text size="sm">{row.original.destinationLabel}</Text>
           </Group>
         ),
       },
@@ -610,7 +606,7 @@ function ShipmentBookingsTable({
         data={rows}
         status={loading ? "loading" : error ? "error" : "success"}
         onRowClick={(row) => onOpen(row.id)}
-        containerClassName="border-0 shadow-none bg-transparent"
+        containerClassName="border-0 shadow-none bg-transparent [&_th]:max-w-[100px] [&_td]:max-w-[100px] [&_td]:break-words"
       />
     </Box>
   );
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 0caea8df5..8c0ef7b5c 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
@@ -450,6 +450,35 @@ export default function ContractRequestDetailPage() {
           description={statusMeta.description}
         />
 
+        {/* A contract resting in APPROVED means the automatic PDF generation on
+            final approval failed — on success it moves straight to
+            CONTRACT_READY. Offer the manual retry. */}
+        {contract.status === "APPROVED" ? (
+          <Alert
+            color="orange"
+            radius="md"
+            icon={<AlertTriangle size={18} />}
+            title="Contract document was not generated"
+          >
+            <Stack gap="sm" align="flex-start">
+              <Text size="sm">
+                All approvals are complete, but generating the contract PDF
+                failed. Retry the generation below.
+              </Text>
+              <Button
+                color="edr-green"
+                size="compact-sm"
+                radius="lg"
+                leftSection={<RefreshCw size={15} />}
+                loading={mutations.generateContract.isPending}
+                onClick={() => mutations.generateContract.mutate()}
+              >
+                Regenerate contract
+              </Button>
+            </Stack>
+          </Alert>
+        ) : null}
+
         {contract.status === "REJECTED" && contract.latestRejectionNote ? (
           <Alert
             color="red"
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 c82cfd152..77ad33f56 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
@@ -226,11 +226,11 @@ function RouteCell({
   return (
     <Stack gap={4} py={2}>
       <Group gap={6} wrap="nowrap">
-        <Text size="sm" fw={500} truncate maw={120}>
+        <Text size="sm" fw={500}>
           {origin}
         </Text>
         <ArrowRight size={14} className="shrink-0 text-muted-foreground" />
-        <Text size="sm" fw={500} truncate maw={120}>
+        <Text size="sm" fw={500}>
           {destination}
         </Text>
       </Group>
@@ -385,10 +385,10 @@ export default function GlDjiboutiClearanceListPage() {
                 <PackageCheck className="size-4" strokeWidth={1.75} />
               </div>
               <div className="min-w-0">
-                <p className="truncate font-medium text-foreground">
+                <p className="font-medium text-foreground">
                   {r.reference}
                 </p>
-                <p className="mt-0.5 flex items-center gap-1 truncate text-xs text-muted-foreground">
+                <p className="mt-0.5 flex items-center gap-1 text-xs text-muted-foreground">
                   <User className="size-3 shrink-0 opacity-70" />
                   {r.customerLabel}
                 </p>
@@ -403,9 +403,7 @@ export default function GlDjiboutiClearanceListPage() {
         cell: ({ row }) => (
           <Group gap={6} wrap="nowrap">
             <FileText size={13} className="shrink-0 text-muted-foreground" />
-            <Text size="sm" truncate maw={140}>
-              {row.original.contractReference}
-            </Text>
+            <Text size="sm">{row.original.contractReference}</Text>
           </Group>
         ),
       },
@@ -710,7 +708,7 @@ export default function GlDjiboutiClearanceListPage() {
                     manualPagination: true,
                     pageCount,
                   }}
-                  containerClassName="border-0 shadow-none bg-transparent"
+                  containerClassName="border-0 shadow-none bg-transparent [&_th]:max-w-[100px] [&_td]:max-w-[100px] [&_td]:break-words"
                   footer={DataTableFooter}
                 />
               </Box>
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 a9e56a6d8..f31ce02e9 100644
--- a/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
@@ -812,6 +812,14 @@ export default function CustomerDetailPage() {
                     }
                   />
                   <InfoField label="Country" value={company.country} />
+                  <InfoField
+                    label="Nationality"
+                    value={
+                      company.nationality
+                        ? humanize(company.nationality)
+                        : undefined
+                    }
+                  />
                   <InfoField label="Address" value={company.address} />
                   <InfoField label="Website" value={company.website} />
                   <InfoField label="Email" value={company.email} />
diff --git a/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx b/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx
index 34f90ffff..815615a1b 100644
--- a/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx
@@ -31,6 +31,7 @@ import { useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import {
+  CompanyNationalityBadge,
   CompanyStatusBadge,
   ProfileChips,
   formatDate,
@@ -149,6 +150,7 @@ export default function CustomersPage() {
                   <Text fw={600} c="edr-text" truncate>
                     {c.name}
                   </Text>
+                  <CompanyNationalityBadge nationality={c.nationality} />
                 </Group>
                 <Text size="xs" c="dimmed">
                   TIN {c.tin}
diff --git a/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx b/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx
index 12bce6aae..008149adb 100644
--- a/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx
@@ -87,11 +87,7 @@ const TAB_ITEMS: Array<{
     icon: TrainFront,
     kpiKey: "operations",
     metricKey: "wagonsAvailable",
-    permission: [
-      FREIGHT_PERMS.fleet.view,
-      FREIGHT_PERMS.wagons.view,
-      FREIGHT_PERMS.trainScheduling.view,
-    ],
+    permission: [FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.trainScheduling.view],
   },
   {
     value: "customers",
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
index 98da6b50f..6bea10a8c 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
@@ -23,6 +23,7 @@ import FleetRecordActions from "@/components/fleet/FleetRecordActions";
 import FleetToolbar from "@/components/fleet/FleetToolbar";
 import { matchesDayRange } from "@/hooks/useListControls";
 import WagonMovementHistoryModal from "@/components/fleet/WagonMovementHistoryModal";
+import WagonStatusActions from "@/components/wagons/WagonStatusActions";
 import WagonYardWorkspaceModal from "@/components/wagons/WagonYardWorkspaceModal";
 import { formatFleetCell, registerFleetOptionLabels } from "@/components/fleet/fleetFormat";
 import { useFleetViewMode } from "@/components/fleet/useFleetViewMode";
@@ -385,27 +386,33 @@ const FleetResourcePage = () => {
     base.push({
       id: "actions",
       header: "Actions",
-      size: 160,
+      // Wagons carry the inline maintenance toggle, which needs more room.
+      size: config.slug === "wagons" ? 240 : 160,
       meta: { headerClassName, cellClassName: `${cellClassName} whitespace-nowrap` },
       cell: ({ row }) => (
         <div onClick={(e) => e.stopPropagation()} data-stop-row-click>
-          <FleetRecordActions
-            record={row.original}
-            config={config}
-            layout="compact"
-            onEdit={
-              canUpdate
-                ? (record) => {
-                    setEditing(record);
-                    setFormOpen(true);
-                  }
-                : undefined
-            }
-            onRemove={canDelete ? setRemoveTarget : undefined}
-            onPurge={canPurge ? setPurgeTarget : undefined}
-            onAssignDriver={canUpdate ? setAssigningDriver : undefined}
-            onHistory={setHistoryTarget}
-          />
+          <Group gap={4} wrap="nowrap">
+            {config.slug === "wagons" ? (
+              <WagonStatusActions record={row.original} canUpdate={canUpdate} />
+            ) : null}
+            <FleetRecordActions
+              record={row.original}
+              config={config}
+              layout="compact"
+              onEdit={
+                canUpdate
+                  ? (record) => {
+                      setEditing(record);
+                      setFormOpen(true);
+                    }
+                  : undefined
+              }
+              onRemove={canDelete ? setRemoveTarget : undefined}
+              onPurge={canPurge ? setPurgeTarget : undefined}
+              onAssignDriver={canUpdate ? setAssigningDriver : undefined}
+              onHistory={setHistoryTarget}
+            />
+          </Group>
         </div>
       ),
     });
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/TrackingPage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/TrackingPage.tsx
index 958d99775..cb64d3b22 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/TrackingPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/TrackingPage.tsx
@@ -30,13 +30,17 @@ import { useToast } from "@/hooks/use-toast";
 import { useAuth } from "@/auth/useAuth";
 import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { vehiclesService } from "@/services/vehicles.service";
-import { gpsTrackingService, type GpsDevice } from "@/services/gps-tracking.service";
+import {
+  gpsTrackingService,
+  type GpsDevice,
+} from "@/services/gps-tracking.service";
 import { freightBrand } from "@/theme/freight-brand";
 
-// Same default key + env override the portal's LocationPicker uses.
-const GOOGLE_MAPS_API_KEY =
-  import.meta.env.VITE_GOOGLE_MAPS_API_KEY ||
-  "AIzaSyBg4tN31-fgvH_2Ix_TPo6VSfOA2uA5CCI";
+// Maps JavaScript API keys are public client-side keys — lock them down by
+// HTTP-referrer in the Google Cloud console. No fallback: a hardcoded default
+// used to live here and expired, turning a missing env var into a blank map
+// that read as broken GPS rather than absent configuration.
+const GOOGLE_MAPS_API_KEY = import.meta.env.VITE_GOOGLE_MAPS_API_KEY?.trim();
 const DEFAULT_CENTER = { lat: 9.03, lng: 38.74 }; // Addis Ababa
 
 const toNum = (v: number | string | null | undefined): number | null =>
@@ -55,8 +59,12 @@ const fmtTime = (iso?: string | null) => {
 
 const StatBox = ({ label, value }: { label: string; value: string }) => (
   <Box p="sm" style={{ backgroundColor: "#f8f9fa", borderRadius: 8 }}>
-    <Text size="xs" c="dimmed">{label}</Text>
-    <Text fw={600} size="sm">{value}</Text>
+    <Text size="xs" c="dimmed">
+      {label}
+    </Text>
+    <Text fw={600} size="sm">
+      {value}
+    </Text>
   </Box>
 );
 
@@ -95,11 +103,20 @@ function useAddress(lat: number, lng: number): string | null {
     if (typeof google === "undefined" || !google.maps?.Geocoder) return;
     setAddr(null);
     let cancelled = false;
-    new google.maps.Geocoder().geocode({ location: { lat, lng } }, (res, status) => {
-      if (cancelled) return;
-      setAddr(status === "OK" && res?.[0] ? res[0].formatted_address : "Unknown location");
-    });
-    return () => { cancelled = true; };
+    new google.maps.Geocoder().geocode(
+      { location: { lat, lng } },
+      (res, status) => {
+        if (cancelled) return;
+        setAddr(
+          status === "OK" && res?.[0]
+            ? res[0].formatted_address
+            : "Unknown location",
+        );
+      },
+    );
+    return () => {
+      cancelled = true;
+    };
   }, [lat, lng]);
   return addr;
 }
@@ -118,16 +135,24 @@ function HoverInfo({
 }) {
   const address = useAddress(lat, lng);
   return (
-    <InfoWindow position={{ lat, lng }} pixelOffset={[0, -46]} onCloseClick={onClose}>
+    <InfoWindow
+      position={{ lat, lng }}
+      pixelOffset={[0, -46]}
+      onCloseClick={onClose}
+    >
       <div style={{ minWidth: 190, fontSize: 13 }}>
-        <div style={{ fontWeight: 600, marginBottom: 2 }}>{deviceLabel(device)}</div>
+        <div style={{ fontWeight: 600, marginBottom: 2 }}>
+          {deviceLabel(device)}
+        </div>
         <div style={{ fontFamily: "monospace" }}>
           {lat.toFixed(5)}, {lng.toFixed(5)}
         </div>
         <div style={{ color: "#555" }}>
           {toNum(device.lastSpeed) ?? 0} km/h · {device.lastCourse ?? 0}°
         </div>
-        <div style={{ color: "#777", marginTop: 4 }}>{address ?? "Locating…"}</div>
+        <div style={{ color: "#777", marginTop: 4 }}>
+          {address ?? "Locating…"}
+        </div>
       </div>
     </InfoWindow>
   );
@@ -182,7 +207,8 @@ export function TrackingPage() {
 
   const { data: vehiclesData } = useQuery({
     queryKey: ["vehicles", "all"],
-    queryFn: async () => (await vehiclesService.getAll({ limit: 1000 })).data ?? [],
+    queryFn: async () =>
+      (await vehiclesService.getAll({ limit: 1000 })).data ?? [],
   });
   const vehicleOptions = useMemo(
     () =>
@@ -197,7 +223,10 @@ export function TrackingPage() {
     () =>
       devices
         .map((d) => ({ d, lat: toNum(d.lastLat), lng: toNum(d.lastLng) }))
-        .filter((x): x is { d: GpsDevice; lat: number; lng: number } => x.lat != null && x.lng != null),
+        .filter(
+          (x): x is { d: GpsDevice; lat: number; lng: number } =>
+            x.lat != null && x.lng != null,
+        ),
     [devices],
   );
 
@@ -207,19 +236,31 @@ export function TrackingPage() {
   // Route history for the selected device's vehicle (chronological trail).
   const { data: history = [] } = useQuery({
     queryKey: ["gps", "history", selected?.vehicleId],
-    queryFn: async () => (await gpsTrackingService.history(selected!.vehicleId!, 300)).data ?? [],
+    queryFn: async () =>
+      (await gpsTrackingService.history(selected!.vehicleId!, 300)).data ?? [],
     enabled: Boolean(selected?.vehicleId),
   });
   const trail = useMemo(
-    () => [...history].reverse().map((h) => ({ lat: Number(h.lat), lng: Number(h.lng) })),
+    () =>
+      [...history]
+        .reverse()
+        .map((h) => ({ lat: Number(h.lat), lng: Number(h.lng) })),
     [history],
   );
 
   // Teardrop pin colored by state with a white truck glyph inside.
-  const markerIcon = (d: GpsDevice, selectedFlag: boolean): google.maps.Icon | undefined => {
+  const markerIcon = (
+    d: GpsDevice,
+    selectedFlag: boolean,
+  ): google.maps.Icon | undefined => {
     // Maps API loads async — Size/Point classes may not exist yet at first render.
-    if (typeof google === "undefined" || !google.maps?.Size || !mapsReady) return undefined;
-    const color = selectedFlag ? freightBrand.primary : d.online ? "#2f80ed" : "#95a5a6";
+    if (typeof google === "undefined" || !google.maps?.Size || !mapsReady)
+      return undefined;
+    const color = selectedFlag
+      ? freightBrand.primary
+      : d.online
+        ? "#2f80ed"
+        : "#95a5a6";
     const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="40" height="48" viewBox="0 0 40 48">
       <path d="M20 2C10 2 2 10 2 20c0 12 18 26 18 26s18-14 18-26C38 10 30 2 20 2Z" fill="${color}" stroke="#ffffff" stroke-width="1.5"/>
       <g transform="translate(8,7)" fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -258,8 +299,13 @@ export function TrackingPage() {
     },
     onError: (err: unknown) => {
       const description =
-        (err as { response?: { data?: { message?: string } } })?.response?.data?.message ?? "Failed";
-      toast({ title: editDevice ? "Update failed" : "Registration failed", description, variant: "destructive" });
+        (err as { response?: { data?: { message?: string } } })?.response?.data
+          ?.message ?? "Failed";
+      toast({
+        title: editDevice ? "Update failed" : "Registration failed",
+        description,
+        variant: "destructive",
+      });
     },
   });
 
@@ -285,15 +331,25 @@ export function TrackingPage() {
 
   return (
     <Container size="xl" py="xl" px="lg">
-      <Breadcrumbs items={[{ label: "Fleet" }, { label: "Vehicle Tracking" }]} />
+      <Breadcrumbs
+        items={[{ label: "Fleet" }, { label: "Vehicle Tracking" }]}
+      />
 
       <Group justify="space-between" mb="xl">
         <div>
-          <Text fw={700} size="xl">Real-Time Vehicle Tracking</Text>
-          <Text c="dimmed" size="sm">Live GPS positions from GT06 trackers</Text>
+          <Text fw={700} size="xl">
+            Real-Time Vehicle Tracking
+          </Text>
+          <Text c="dimmed" size="sm">
+            Live GPS positions from GT06 trackers
+          </Text>
         </div>
         {canManage && (
-          <Button leftSection={<Plus size={16} />} color="edr-green" onClick={openRegister}>
+          <Button
+            leftSection={<Plus size={16} />}
+            color="edr-green"
+            onClick={openRegister}
+          >
             Register tracker
           </Button>
         )}
@@ -312,36 +368,82 @@ export function TrackingPage() {
               </Group>
             </Card.Section>
             <Card.Section p="md">
-              <Box style={{ height: 500, width: "100%", borderRadius: 8, overflow: "hidden" }}>
-                <APIProvider apiKey={GOOGLE_MAPS_API_KEY}>
-                  <GoogleMap
-                    defaultCenter={DEFAULT_CENTER}
-                    defaultZoom={7}
-                    gestureHandling="greedy"
-                    disableDefaultUI={false}
-                    style={{ width: "100%", height: "100%" }}
+              <Box
+                style={{
+                  height: 500,
+                  width: "100%",
+                  borderRadius: 8,
+                  overflow: "hidden",
+                }}
+              >
+                {!GOOGLE_MAPS_API_KEY ? (
+                  // Name the missing variable rather than showing an empty map: the
+                  // device list beside this still works, so a blank panel reads as
+                  // "no GPS fixes" instead of "no map key".
+                  <Box
+                    style={{
+                      height: "100%",
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "center",
+                      padding: 24,
+                      textAlign: "center",
+                      border: "1px solid #F0D2A8",
+                      borderRadius: 8,
+                      background: "#FFF9F0",
+                    }}
                   >
-                    <ReadyProbe onReady={() => setMapsReady(true)} />
-                    {positioned.map(({ d, lat, lng }) => (
-                      <Marker
-                        key={d.id}
-                        position={{ lat, lng }}
-                        title={`${deviceLabel(d)}\n${lat.toFixed(5)}, ${lng.toFixed(5)}`}
-                        icon={markerIcon(d, d.id === selectedId)}
-                        onClick={() => setSelectedId(d.id)}
-                        onMouseOver={() => setHoverId(d.id)}
+                    <Text fz="sm" c="#8A5A16">
+                      Map unavailable — <code>VITE_GOOGLE_MAPS_API_KEY</code> is
+                      not set. Add a Google Maps key with the Maps JavaScript
+                      API and Places API enabled to this app&apos;s{" "}
+                      <code>.env</code>, then restart the dev server. Device
+                      positions below are unaffected.
+                    </Text>
+                  </Box>
+                ) : (
+                  <APIProvider apiKey={GOOGLE_MAPS_API_KEY}>
+                    <GoogleMap
+                      defaultCenter={DEFAULT_CENTER}
+                      defaultZoom={7}
+                      gestureHandling="greedy"
+                      disableDefaultUI={false}
+                      style={{ width: "100%", height: "100%" }}
+                    >
+                      <ReadyProbe onReady={() => setMapsReady(true)} />
+                      {positioned.map(({ d, lat, lng }) => (
+                        <Marker
+                          key={d.id}
+                          position={{ lat, lng }}
+                          title={`${deviceLabel(d)}\n${lat.toFixed(5)}, ${lng.toFixed(5)}`}
+                          icon={markerIcon(d, d.id === selectedId)}
+                          onClick={() => setSelectedId(d.id)}
+                          onMouseOver={() => setHoverId(d.id)}
+                        />
+                      ))}
+                      {(() => {
+                        const h = positioned.find((p) => p.d.id === hoverId);
+                        return h ? (
+                          <HoverInfo
+                            device={h.d}
+                            lat={h.lat}
+                            lng={h.lng}
+                            onClose={() => setHoverId(null)}
+                          />
+                        ) : null;
+                      })()}
+                      <FitBounds
+                        points={positioned.map((p) => ({
+                          lat: p.lat,
+                          lng: p.lng,
+                        }))}
                       />
-                    ))}
-                    {(() => {
-                      const h = positioned.find((p) => p.d.id === hoverId);
-                      return h ? (
-                        <HoverInfo device={h.d} lat={h.lat} lng={h.lng} onClose={() => setHoverId(null)} />
-                      ) : null;
-                    })()}
-                    <FitBounds points={positioned.map((p) => ({ lat: p.lat, lng: p.lng }))} />
-                    {selected?.vehicleId && trail.length > 1 && <RouteTrail path={trail} />}
-                  </GoogleMap>
-                </APIProvider>
+                      {selected?.vehicleId && trail.length > 1 && (
+                        <RouteTrail path={trail} />
+                      )}
+                    </GoogleMap>
+                  </APIProvider>
+                )}
               </Box>
               {positioned.length === 0 && (
                 <Text size="sm" c="dimmed" ta="center" mt="sm">
@@ -361,11 +463,19 @@ export function TrackingPage() {
                   <Group justify="space-between">
                     <Text fw={500}>{deviceLabel(selected)}</Text>
                     <Group gap="xs">
-                      <Badge color={selected.online ? "edr-green" : "gray"} leftSection={<Activity size={12} />}>
+                      <Badge
+                        color={selected.online ? "edr-green" : "gray"}
+                        leftSection={<Activity size={12} />}
+                      >
                         {selected.online ? "Live" : "Offline"}
                       </Badge>
                       {canManage && (
-                        <ActionIcon variant="subtle" color="red" aria-label="Remove tracker" onClick={() => deleteMutation.mutate(selected.id)}>
+                        <ActionIcon
+                          variant="subtle"
+                          color="red"
+                          aria-label="Remove tracker"
+                          onClick={() => deleteMutation.mutate(selected.id)}
+                        >
                           <Trash2 size={16} />
                         </ActionIcon>
                       )}
@@ -373,21 +483,55 @@ export function TrackingPage() {
                   </Group>
 
                   <SimpleGrid cols={2} spacing="sm">
-                    <StatBox label="Latitude" value={toNum(selected.lastLat)?.toFixed(5) ?? "—"} />
-                    <StatBox label="Longitude" value={toNum(selected.lastLng)?.toFixed(5) ?? "—"} />
-                    <StatBox label="Speed" value={`${toNum(selected.lastSpeed) ?? 0} km/h`} />
-                    <StatBox label="Course" value={`${selected.lastCourse ?? 0}°`} />
-                    <StatBox label="Voltage" value={selected.voltageLevel != null ? `${selected.voltageLevel}/6` : "—"} />
-                    <StatBox label="GSM" value={selected.gsmLevel != null ? `${selected.gsmLevel}/4` : "—"} />
+                    <StatBox
+                      label="Latitude"
+                      value={toNum(selected.lastLat)?.toFixed(5) ?? "—"}
+                    />
+                    <StatBox
+                      label="Longitude"
+                      value={toNum(selected.lastLng)?.toFixed(5) ?? "—"}
+                    />
+                    <StatBox
+                      label="Speed"
+                      value={`${toNum(selected.lastSpeed) ?? 0} km/h`}
+                    />
+                    <StatBox
+                      label="Course"
+                      value={`${selected.lastCourse ?? 0}°`}
+                    />
+                    <StatBox
+                      label="Voltage"
+                      value={
+                        selected.voltageLevel != null
+                          ? `${selected.voltageLevel}/6`
+                          : "—"
+                      }
+                    />
+                    <StatBox
+                      label="GSM"
+                      value={
+                        selected.gsmLevel != null
+                          ? `${selected.gsmLevel}/4`
+                          : "—"
+                      }
+                    />
                   </SimpleGrid>
 
                   <div>
-                    <Text size="xs" c="dimmed">IMEI</Text>
-                    <Text fw={500} size="sm">{selected.imei}</Text>
+                    <Text size="xs" c="dimmed">
+                      IMEI
+                    </Text>
+                    <Text fw={500} size="sm">
+                      {selected.imei}
+                    </Text>
                   </div>
                   <div>
-                    <Text size="xs" c="dimmed">Last fix</Text>
-                    <Text fw={500} size="sm">{fmtTime(selected.lastFixAt)}</Text>
+                    <Text size="xs" c="dimmed">
+                      Last fix
+                    </Text>
+                    <Text fw={500} size="sm">
+                      {fmtTime(selected.lastFixAt)}
+                    </Text>
                   </div>
                   {selected.vehicleId && (
                     <Text size="xs" c="dimmed">
@@ -400,7 +544,9 @@ export function TrackingPage() {
                     placeholder="Unassigned"
                     data={vehicleOptions}
                     value={selected.vehicleId ?? null}
-                    onChange={(v) => assignMutation.mutate({ id: selected.id, vehicleId: v })}
+                    onChange={(v) =>
+                      assignMutation.mutate({ id: selected.id, vehicleId: v })
+                    }
                     disabled={!canManage}
                     searchable
                     clearable
@@ -418,24 +564,43 @@ export function TrackingPage() {
                       {devices.map((d) => (
                         <Table.Tr
                           key={d.id}
-                          style={{ cursor: "pointer", backgroundColor: d.id === selectedId ? freightBrand.mutedBg : "transparent" }}
+                          style={{
+                            cursor: "pointer",
+                            backgroundColor:
+                              d.id === selectedId
+                                ? freightBrand.mutedBg
+                                : "transparent",
+                          }}
                           onClick={() => setSelectedId(d.id)}
                         >
                           <Table.Td>
                             <Stack gap={0}>
-                              <Text size="sm" fw={600}>{deviceLabel(d)}</Text>
-                              <Text size="xs" c="dimmed">{toNum(d.lastSpeed) ?? 0} km/h · {fmtTime(d.lastFixAt)}</Text>
+                              <Text size="sm" fw={600}>
+                                {deviceLabel(d)}
+                              </Text>
+                              <Text size="xs" c="dimmed">
+                                {toNum(d.lastSpeed) ?? 0} km/h ·{" "}
+                                {fmtTime(d.lastFixAt)}
+                              </Text>
                             </Stack>
                           </Table.Td>
                           <Table.Td align="right">
                             <Group gap={6} justify="flex-end" wrap="nowrap">
-                              <Badge color={d.online ? "edr-green" : "gray"} size="sm">{d.online ? "Live" : "Offline"}</Badge>
+                              <Badge
+                                color={d.online ? "edr-green" : "gray"}
+                                size="sm"
+                              >
+                                {d.online ? "Live" : "Offline"}
+                              </Badge>
                               {canManage && (
                                 <ActionIcon
                                   variant="subtle"
                                   size="sm"
                                   aria-label="Edit tracker"
-                                  onClick={(e) => { e.stopPropagation(); openEdit(d); }}
+                                  onClick={(e) => {
+                                    e.stopPropagation();
+                                    openEdit(d);
+                                  }}
                                 >
                                   <Pencil size={15} />
                                 </ActionIcon>
@@ -447,7 +612,9 @@ export function TrackingPage() {
                       {devices.length === 0 && (
                         <Table.Tr>
                           <Table.Td colSpan={2}>
-                            <Text size="sm" c="dimmed" ta="center" py="md">No trackers registered yet.</Text>
+                            <Text size="sm" c="dimmed" ta="center" py="md">
+                              No trackers registered yet.
+                            </Text>
                           </Table.Td>
                         </Table.Tr>
                       )}
@@ -493,7 +660,9 @@ export function TrackingPage() {
             clearable
           />
           <Group justify="flex-end">
-            <Button variant="default" onClick={() => setModalOpen(false)}>Cancel</Button>
+            <Button variant="default" onClick={() => setModalOpen(false)}>
+              Cancel
+            </Button>
             <Button
               loading={saveMutation.isPending}
               disabled={!form.imei.trim()}
diff --git a/apps/edr-freight-web/backoffice/src/pages/invoices/InvoiceDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/invoices/InvoiceDetailPage.tsx
index 7bafc093e..3188509c8 100644
--- a/apps/edr-freight-web/backoffice/src/pages/invoices/InvoiceDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/invoices/InvoiceDetailPage.tsx
@@ -13,6 +13,9 @@ import {
 } from "@mantine/core";
 import { useQuery } from "@tanstack/react-query";
 import { ArrowLeft, Download } from "lucide-react";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+import { EimsFilingCard } from "@/components/invoices/EimsFilingCard";
 import { useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 
@@ -60,6 +63,8 @@ function InfoField({ label, value }: { label: string; value?: string | null }) {
 }
 
 export default function InvoiceDetailPage() {
+  const { user } = useAuth();
+  const canExport = hasPermission(user, FREIGHT_PERMS.invoices.export);
   const { id } = useParams<{ id: string }>();
   const navigate = useNavigate();
   const [downloading, setDownloading] = useState(false);
@@ -124,6 +129,7 @@ export default function InvoiceDetailPage() {
             size="lg"
             radius="md"
             aria-label="Download invoice"
+            disabled={!canExport}
             loading={downloading}
             onClick={() => void downloadDocument()}
           >
@@ -160,6 +166,8 @@ export default function InvoiceDetailPage() {
           </Stack>
         </Card>
 
+        <EimsFilingCard invoiceId={invoice.id} />
+
         <Card>
           <Stack gap="md">
             <Text fw={600} c="edr-text">
diff --git a/apps/edr-freight-web/backoffice/src/pages/invoices/UsdPaymentsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/invoices/UsdPaymentsPage.tsx
new file mode 100644
index 000000000..585abea21
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/invoices/UsdPaymentsPage.tsx
@@ -0,0 +1,426 @@
+import type { Freight } from "@edr/types";
+import {
+  ActionIcon,
+  Badge,
+  Box,
+  Button,
+  Card,
+  Group,
+  Modal,
+  SegmentedControl,
+  Stack,
+  Text,
+  TextInput,
+} from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { CheckCircle2, ExternalLink, RefreshCw, Search, X } from "lucide-react";
+import { useEffect, useMemo, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import toast from "react-hot-toast";
+
+import {
+  InvoiceStatusBadge,
+  formatMoney,
+  humanize,
+} from "@/components/customers";
+import { PhasedFileDropzone } from "@/components/contracts/PhasedFileDropzone";
+import { PageContainer, PageHeader } from "@/components/page";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+import { api } from "@/services/api";
+import type { OfflineUsdInvoice } from "@/types/invoice";
+import {
+  DataTable,
+  DataTableFooter,
+  usePagination,
+  type ColumnDef,
+} from "@edr/ui-common";
+
+/**
+ * The customer's pay window, counted down live. Finance must confirm the bank
+ * transfer before it closes — past the deadline the booking expires like any
+ * unpaid one and the API refuses the confirmation.
+ */
+function formatRemaining(deadlineMs: number, now: number): string | null {
+  const diff = deadlineMs - now;
+  if (diff <= 0) return null;
+  const total = Math.floor(diff / 1000);
+  const days = Math.floor(total / 86400);
+  const hours = Math.floor((total % 86400) / 3600);
+  const minutes = Math.floor((total % 3600) / 60);
+  const seconds = total % 60;
+  const pad = (n: number) => String(n).padStart(2, "0");
+  return days > 0
+    ? `${days}d ${pad(hours)}:${pad(minutes)}:${pad(seconds)}`
+    : `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
+}
+
+function PayWindowCell({ deadline }: { deadline: string | null }) {
+  const [now, setNow] = useState(() => Date.now());
+
+  useEffect(() => {
+    if (!deadline) return;
+    const interval = setInterval(() => setNow(Date.now()), 1000);
+    return () => clearInterval(interval);
+  }, [deadline]);
+
+  if (!deadline) {
+    return (
+      <Text size="sm" c="dimmed">
+        —
+      </Text>
+    );
+  }
+
+  const remaining = formatRemaining(new Date(deadline).getTime(), now);
+  if (!remaining) {
+    return (
+      <Badge color="red" variant="light" radius="sm">
+        Window closed
+      </Badge>
+    );
+  }
+
+  return (
+    <Text size="sm" fw={600} c="edr-text" ff="monospace">
+      {remaining}
+    </Text>
+  );
+}
+
+/** True once the pay window has closed — the API refuses confirmation then. */
+function windowClosed(row: OfflineUsdInvoice): boolean {
+  const deadline = row.booking?.paymentDeadline;
+  return Boolean(deadline && new Date(deadline).getTime() <= Date.now());
+}
+
+export default function UsdPaymentsPage() {
+  const navigate = useNavigate();
+  const { pagination, setPagination } = usePagination({ pageSize: 10 });
+  const [query, setQuery] = useState("");
+  const [debouncedQuery] = useDebouncedValue(query, 300);
+  const [statusFilter, setStatusFilter] = useState<"" | Freight.InvoiceStatus>(
+    "",
+  );
+  const [confirming, setConfirming] = useState<OfflineUsdInvoice | null>(null);
+  const [slip, setSlip] = useState<File | null>(null);
+  const [reference, setReference] = useState("");
+
+  const { user } = useAuth();
+  const canConfirm = hasPermission(
+    user,
+    FREIGHT_PERMS.invoices.confirmOffline,
+  );
+
+  const filter = useMemo(
+    () => ({
+      page: pagination.pageIndex + 1,
+      pageSize: pagination.pageSize,
+      search: debouncedQuery,
+      status: statusFilter || undefined,
+    }),
+    [pagination.pageIndex, pagination.pageSize, debouncedQuery, statusFilter],
+  );
+
+  const { data, isLoading, isError, refetch, isFetching } = useQuery(
+    api.invoices.listOfflineUsd.queryOptions({ input: { filter } }),
+  );
+
+  const confirm = useMutation(api.invoices.confirmOffline.mutationOptions());
+
+  const rows = data?.items ?? [];
+  const total = data?.total ?? 0;
+  const pageCount = Math.max(1, Math.ceil(total / pagination.pageSize));
+
+  const closeConfirm = () => {
+    setConfirming(null);
+    setSlip(null);
+    setReference("");
+  };
+
+  const submitConfirm = async () => {
+    if (!confirming || !slip) return;
+    try {
+      await confirm.mutateAsync({
+        id: confirming.id,
+        file: slip,
+        reference: reference.trim() || undefined,
+      });
+      toast.success(`${confirming.invoiceNumber} confirmed as paid`);
+      closeConfirm();
+    } catch (e) {
+      toast.error(e instanceof Error ? e.message : "Confirmation failed");
+    }
+  };
+
+  const columns: ColumnDef<OfflineUsdInvoice>[] = useMemo(
+    () => [
+      {
+        id: "invoiceNumber",
+        header: "Invoice",
+        cell: ({ row }) => (
+          <Text size="sm" fw={600} c="edr-text">
+            {row.original.invoiceNumber}
+          </Text>
+        ),
+      },
+      {
+        id: "billedTo",
+        header: "Customer",
+        cell: ({ row }) => (
+          <Text size="sm" c="edr-text">
+            {row.original.company?.name ?? "—"}
+          </Text>
+        ),
+      },
+      {
+        id: "booking",
+        header: "Booking",
+        cell: ({ row }) => {
+          const booking = row.original.booking;
+          if (!booking) {
+            return (
+              <Text size="sm" c="dimmed">
+                {humanize(row.original.source)}
+              </Text>
+            );
+          }
+          return (
+            <Button
+              variant="subtle"
+              size="compact-sm"
+              rightSection={<ExternalLink size={13} />}
+              onClick={(e) => {
+                e.stopPropagation();
+                navigate(`/dashboard/booking-requests/${booking.id}`);
+              }}
+            >
+              {booking.reference}
+            </Button>
+          );
+        },
+      },
+      {
+        id: "status",
+        header: "Status",
+        cell: ({ row }) => <InvoiceStatusBadge status={row.original.status} />,
+      },
+      {
+        id: "amount",
+        header: "Amount",
+        meta: { headerClassName: "text-right", cellClassName: "text-right" },
+        cell: ({ row }) => (
+          <Text size="sm" fw={600} c="edr-text">
+            {formatMoney(row.original.totalAmount, row.original.currency)}
+          </Text>
+        ),
+      },
+      {
+        id: "balance",
+        header: "Balance",
+        meta: { headerClassName: "text-right", cellClassName: "text-right" },
+        cell: ({ row }) => (
+          <Text size="sm" c="dimmed">
+            {formatMoney(row.original.balanceAmount, row.original.currency)}
+          </Text>
+        ),
+      },
+      {
+        id: "payWindow",
+        header: "Pay window",
+        meta: { headerClassName: "text-right", cellClassName: "text-right" },
+        cell: ({ row }) => (
+          <PayWindowCell deadline={row.original.booking?.paymentDeadline ?? null} />
+        ),
+      },
+      {
+        id: "action",
+        header: "",
+        meta: { headerClassName: "text-right", cellClassName: "text-right" },
+        cell: ({ row }) => {
+          const paid = row.original.status === "PAID";
+          if (paid || !canConfirm) return null;
+          return (
+            <Button
+              size="compact-sm"
+              color="edr-green"
+              leftSection={<CheckCircle2 size={14} />}
+              disabled={windowClosed(row.original)}
+              onClick={(e) => {
+                e.stopPropagation();
+                setConfirming(row.original);
+              }}
+            >
+              Confirm paid
+            </Button>
+          );
+        },
+      },
+    ],
+    [canConfirm, navigate],
+  );
+
+  return (
+    <PageContainer>
+      <PageHeader
+        title="USD Payments"
+        subtitle="USD invoices are paid by bank transfer. Upload the customer's slip and confirm the payment before the pay window closes."
+        action={
+          <ActionIcon
+            variant="default"
+            size="lg"
+            radius="md"
+            aria-label="Refresh"
+            loading={isFetching}
+            onClick={() => void refetch()}
+          >
+            <RefreshCw size={16} />
+          </ActionIcon>
+        }
+      />
+
+      <Card p={0}>
+        <Stack gap={0}>
+          <Box px="md" pt="md" pb="sm" w="100%">
+            <Group justify="space-between" gap="md" wrap="wrap">
+              <TextInput
+                placeholder="Search by invoice number…"
+                leftSection={<Search size={18} />}
+                value={query}
+                onChange={(e) => setQuery(e.target.value)}
+                rightSection={
+                  query ? (
+                    <ActionIcon
+                      size="sm"
+                      color="gray"
+                      radius="md"
+                      variant="transparent"
+                      onClick={() => setQuery("")}
+                    >
+                      <X size={16} />
+                    </ActionIcon>
+                  ) : null
+                }
+                style={{ flex: 1, minWidth: "240px" }}
+                radius="lg"
+              />
+              <SegmentedControl
+                size="sm"
+                radius="md"
+                value={statusFilter || "open"}
+                onChange={(v) => {
+                  setStatusFilter(
+                    v === "open" ? "" : (v as Freight.InvoiceStatus),
+                  );
+                  setPagination((prev) => ({ ...prev, pageIndex: 0 }));
+                }}
+                data={[
+                  { label: "Awaiting payment", value: "open" },
+                  { label: "Paid", value: "PAID" },
+                  { label: "Overdue", value: "OVERDUE" },
+                ]}
+              />
+              <Text size="sm" c="dimmed">
+                {total} record{total !== 1 ? "s" : ""}
+              </Text>
+            </Group>
+          </Box>
+
+          <Box style={{ overflowX: "auto" }} w="100%">
+            <Box miw={1040}>
+              <DataTable
+                columns={columns}
+                data={rows}
+                status={isLoading ? "loading" : isError ? "error" : "success"}
+                onRowClick={(row) => navigate(`/dashboard/invoices/${row.id}`)}
+                emptyMessage={
+                  debouncedQuery
+                    ? "No USD invoices match your search."
+                    : "No USD invoices awaiting confirmation."
+                }
+                error={
+                  isError
+                    ? {
+                        message: "Failed to load USD invoices.",
+                        onRetry: () => void refetch(),
+                      }
+                    : undefined
+                }
+                pagination={{
+                  pageIndex: pagination.pageIndex,
+                  pageSize: pagination.pageSize,
+                  pageCount,
+                  totalCount: total,
+                }}
+                tableOptions={{
+                  state: { pagination },
+                  onPaginationChange: setPagination,
+                  manualPagination: true,
+                  pageCount,
+                }}
+                containerClassName="border-0 shadow-none bg-transparent"
+                footer={DataTableFooter}
+              />
+            </Box>
+          </Box>
+        </Stack>
+      </Card>
+
+      <Modal
+        opened={confirming !== null}
+        onClose={closeConfirm}
+        title={
+          <Text fw={700}>Confirm bank transfer payment</Text>
+        }
+        radius="md"
+        size="md"
+      >
+        {confirming && (
+          <Stack gap="md">
+            <Text size="sm" c="dimmed">
+              Confirming settles {confirming.invoiceNumber} in full (
+              {formatMoney(confirming.balanceAmount, confirming.currency)}) and
+              marks the booking as paid. Upload the customer&apos;s bank slip
+              first — this cannot be undone.
+            </Text>
+
+            <PhasedFileDropzone
+              label="Bank payment slip"
+              description="PDF or image of the customer's transfer slip."
+              value={slip}
+              onChange={setSlip}
+            />
+
+            <TextInput
+              label="Bank reference"
+              description="Optional — the transfer reference from the slip."
+              placeholder="e.g. FT24091234567"
+              value={reference}
+              onChange={(e) => setReference(e.target.value)}
+            />
+
+            <Group justify="flex-end" gap="sm">
+              <Button
+                variant="default"
+                onClick={closeConfirm}
+                disabled={confirm.isPending}
+              >
+                Cancel
+              </Button>
+              <Button
+                color="edr-green"
+                loading={confirm.isPending}
+                disabled={!slip}
+                leftSection={<CheckCircle2 size={16} />}
+                onClick={() => void submitConfirm()}
+              >
+                Confirm as paid
+              </Button>
+            </Group>
+          </Stack>
+        )}
+      </Modal>
+    </PageContainer>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/DocumentRail.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/DocumentRail.tsx
new file mode 100644
index 000000000..a5cea78b8
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/DocumentRail.tsx
@@ -0,0 +1,163 @@
+import { ActionIcon, Box, Button, Group, Stack, Text, Tooltip } from "@mantine/core";
+import { ChevronDown, ChevronUp, Plus } from "lucide-react";
+
+export interface RailItem {
+  id: string;
+  label: string;
+  /** Renders as a small caps heading above the items that follow it. */
+  heading?: string;
+  /** Nested one level (an FAQ question under its group). */
+  indented?: boolean;
+}
+
+interface DocumentRailProps {
+  items: RailItem[];
+  selectedId: string | null;
+  onSelect: (id: string) => void;
+  onMove: (id: string, delta: number) => void;
+  /** Whether this row can move in the given direction. */
+  canMove: (id: string, delta: number) => boolean;
+  addLabel: string;
+  onAdd: () => void;
+  emptyLabel: string;
+}
+
+/**
+ * The list of pages that make up a document, and the only navigation on the
+ * tab. Replaces the accordion stack: a public officer editing the privacy
+ * policy sees fifteen page names, clicks one, and edits it — instead of
+ * scrolling a mile of open text boxes trying to find the right one.
+ *
+ * Reorder arrows appear only on the selected row, so the resting state is a
+ * clean list rather than fifteen rows of buttons.
+ */
+export function DocumentRail({
+  items,
+  selectedId,
+  onSelect,
+  onMove,
+  canMove,
+  addLabel,
+  onAdd,
+  emptyLabel,
+}: DocumentRailProps) {
+  return (
+    <Stack
+      gap={4}
+      p="sm"
+      style={{
+        width: 280,
+        flexShrink: 0,
+        alignSelf: "flex-start",
+        background: "#FFFFFF",
+        border: "1px solid var(--mantine-color-gray-2)",
+        borderRadius: "var(--mantine-radius-lg)",
+      }}
+    >
+      {items.length === 0 && (
+        <Text size="sm" c="dimmed" p="sm">
+          {emptyLabel}
+        </Text>
+      )}
+
+      {items.map((item) => {
+        const selected = item.id === selectedId;
+
+        return (
+          <Box key={item.id}>
+            {item.heading && (
+              <Text
+                size="xs"
+                fw={700}
+                c="dimmed"
+                tt="uppercase"
+                mt="sm"
+                mb={4}
+                px="xs"
+                style={{ letterSpacing: "0.04em" }}
+              >
+                {item.heading}
+              </Text>
+            )}
+
+            <Group
+              gap={4}
+              wrap="nowrap"
+              px="xs"
+              py={6}
+              ml={item.indented ? "sm" : 0}
+              onClick={() => onSelect(item.id)}
+              style={{
+                borderRadius: "var(--mantine-radius-sm)",
+                cursor: "pointer",
+                background: selected
+                  ? "var(--mantine-primary-color-light)"
+                  : "transparent",
+              }}
+            >
+              <Text
+                size="sm"
+                fw={selected ? 600 : 400}
+                truncate
+                style={{ flex: 1, minWidth: 0 }}
+              >
+                {item.label || (
+                  <Text span c="dimmed" size="sm">
+                    Untitled
+                  </Text>
+                )}
+              </Text>
+
+              {selected && (
+                <Group gap={0} wrap="nowrap">
+                  <Tooltip label="Move up">
+                    <ActionIcon
+                      size="sm"
+                      variant="subtle"
+                      color="gray"
+                      disabled={!canMove(item.id, -1)}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        onMove(item.id, -1);
+                      }}
+                    >
+                      <ChevronUp size={14} />
+                    </ActionIcon>
+                  </Tooltip>
+                  <Tooltip label="Move down">
+                    <ActionIcon
+                      size="sm"
+                      variant="subtle"
+                      color="gray"
+                      disabled={!canMove(item.id, 1)}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        onMove(item.id, 1);
+                      }}
+                    >
+                      <ChevronDown size={14} />
+                    </ActionIcon>
+                  </Tooltip>
+                </Group>
+              )}
+            </Group>
+          </Box>
+        );
+      })}
+
+      <Button
+        variant="subtle"
+        size="sm"
+        mt="xs"
+        leftSection={<Plus size={16} />}
+        onClick={onAdd}
+        styles={{ inner: { justifyContent: "flex-start" } }}
+        fullWidth
+      >
+        {addLabel}
+      </Button>
+    </Stack>
+  );
+}
+
+export default DocumentRail;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/EditorPane.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/EditorPane.tsx
new file mode 100644
index 000000000..2641fe1d1
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/EditorPane.tsx
@@ -0,0 +1,100 @@
+import { Box, Button, Group, Stack, Text, TextInput } from "@mantine/core";
+import { Trash2 } from "lucide-react";
+import type { ReactNode } from "react";
+
+interface EditorPaneProps {
+  /** Large borderless field at the top — the page's own name. */
+  title: string;
+  titlePlaceholder: string;
+  onTitleChange: (next: string) => void;
+  onRemove: () => void;
+  removeLabel: string;
+  children: ReactNode;
+}
+
+/**
+ * The open page. One title, one body, one Remove — everything else about the
+ * document lives in the rail, so this pane stays as close to a blank sheet as
+ * the feature set allows.
+ */
+export function EditorPane({
+  title,
+  titlePlaceholder,
+  onTitleChange,
+  onRemove,
+  removeLabel,
+  children,
+}: EditorPaneProps) {
+  return (
+    <Stack
+      gap="md"
+      p="xl"
+      style={{
+        // Basis keeps the editor readable; it wraps below the rail rather than
+        // being crushed when the window cannot fit both side by side.
+        flex: "1 1 480px",
+        minWidth: 0,
+        background: "#FFFFFF",
+        border: "1px solid var(--mantine-color-gray-2)",
+        borderRadius: "var(--mantine-radius-lg)",
+      }}
+    >
+      <TextInput
+        value={title}
+        placeholder={titlePlaceholder}
+        onChange={(e) => onTitleChange(e.currentTarget.value)}
+        variant="unstyled"
+        styles={{
+          input: {
+            fontSize: "1.6rem",
+            fontWeight: 700,
+            lineHeight: 1.3,
+            height: "auto",
+            padding: 0,
+          },
+        }}
+      />
+
+      <Box
+        style={{ borderTop: "1px solid var(--mantine-color-gray-2)" }}
+        pt="md"
+      >
+        {children}
+      </Box>
+
+      <Group justify="flex-end" pt="xs">
+        <Button
+          variant="subtle"
+          color="red"
+          size="compact-sm"
+          leftSection={<Trash2 size={14} />}
+          onClick={onRemove}
+        >
+          {removeLabel}
+        </Button>
+      </Group>
+    </Stack>
+  );
+}
+
+/** Shown when a document has no pages yet. */
+export function EmptyPane({ message }: { message: string }) {
+  return (
+    <Stack
+      align="center"
+      justify="center"
+      p="xl"
+      style={{
+        flex: 1,
+        minHeight: 320,
+        background: "#FFFFFF",
+        border: "1px solid var(--mantine-color-gray-2)",
+        borderRadius: "var(--mantine-radius-lg)",
+      }}
+    >
+      <Text c="dimmed">{message}</Text>
+    </Stack>
+  );
+}
+
+export default EditorPane;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/FaqWorkspace.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/FaqWorkspace.tsx
new file mode 100644
index 000000000..a6a9db56d
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/FaqWorkspace.tsx
@@ -0,0 +1,231 @@
+import type { PortalFaqContent, PortalFaqGroup } from "@edr/types";
+import { Button, Group, Stack, Text, TextInput } from "@mantine/core";
+import { Plus } from "lucide-react";
+import { useEffect, useState } from "react";
+
+import { moveAt, newId, removeAt, replaceAt } from "./array-helpers";
+import { DocumentRail, type RailItem } from "./DocumentRail";
+import { EditorPane, EmptyPane } from "./EditorPane";
+import { MarkdownEditor } from "./MarkdownEditor";
+
+interface FaqWorkspaceProps {
+  value: PortalFaqContent;
+  onChange: (next: PortalFaqContent) => void;
+  /** Reseed counter — see the `key` on the editor below. */
+  seed: number;
+}
+
+/**
+ * The FAQ is two levels deep, so the rail shows each group as a heading with
+ * its questions beneath — the same outline a customer sees on the page. Picking
+ * a question opens it; picking the group's own row renames or removes it.
+ */
+export function FaqWorkspace({
+  value,
+  onChange,
+  seed,
+}: FaqWorkspaceProps) {
+  const groups = value.groups ?? [];
+
+  const [selectedId, setSelectedId] = useState<string | null>(
+    groups[0]?.items[0]?.id ?? groups[0]?.id ?? null,
+  );
+
+  const setGroups = (next: PortalFaqGroup[]) =>
+    onChange({ ...value, groups: next });
+
+  // Every selectable row, in display order: the group's own row, then its
+  // questions. Flattening once keeps selection and reordering simple.
+  const rows: RailItem[] = groups.flatMap((group) => [
+    { id: group.id, label: group.title || "Untitled group", heading: "Group" },
+    ...group.items.map((item) => ({
+      id: item.id,
+      label: item.question,
+      indented: true,
+    })),
+  ]);
+
+  useEffect(() => {
+    if (!rows.some((row) => row.id === selectedId)) {
+      setSelectedId(rows[0]?.id ?? null);
+    }
+  }, [rows, selectedId]);
+
+  const groupIndex = groups.findIndex((group) => group.id === selectedId);
+  const selectedGroup = groupIndex >= 0 ? groups[groupIndex] : null;
+
+  const ownerIndex = groups.findIndex((group) =>
+    group.items.some((item) => item.id === selectedId),
+  );
+  const owner = ownerIndex >= 0 ? groups[ownerIndex] : null;
+  const itemIndex =
+    owner?.items.findIndex((item) => item.id === selectedId) ?? -1;
+  const selectedItem = owner && itemIndex >= 0 ? owner.items[itemIndex] : null;
+
+  const move = (id: string, delta: number) => {
+    const asGroup = groups.findIndex((group) => group.id === id);
+    if (asGroup >= 0) {
+      setGroups(moveAt(groups, asGroup, delta));
+      return;
+    }
+
+    const at = groups.findIndex((group) =>
+      group.items.some((item) => item.id === id),
+    );
+    if (at < 0) return;
+    const within = groups[at].items.findIndex((item) => item.id === id);
+    setGroups(
+      replaceAt(groups, at, {
+        ...groups[at],
+        items: moveAt(groups[at].items, within, delta),
+      }),
+    );
+  };
+
+  const canMove = (id: string, delta: number) => {
+    const asGroup = groups.findIndex((group) => group.id === id);
+    if (asGroup >= 0) {
+      const target = asGroup + delta;
+      return target >= 0 && target < groups.length;
+    }
+
+    const at = groups.findIndex((group) =>
+      group.items.some((item) => item.id === id),
+    );
+    if (at < 0) return false;
+    const within = groups[at].items.findIndex((item) => item.id === id);
+    const target = within + delta;
+    return target >= 0 && target < groups[at].items.length;
+  };
+
+  const addQuestion = () => {
+    // Add into the group the author is currently in, or the last one.
+    const target = owner ?? selectedGroup ?? groups[groups.length - 1];
+    if (!target) return;
+
+    const at = groups.findIndex((group) => group.id === target.id);
+    const question = { id: newId(), question: "", answer: "" };
+    setGroups(
+      replaceAt(groups, at, {
+        ...target,
+        items: [...target.items, question],
+      }),
+    );
+    setSelectedId(question.id);
+  };
+
+  const addGroup = () => {
+    const group = { id: newId(), title: "New group", items: [] };
+    setGroups([...groups, group]);
+    setSelectedId(group.id);
+  };
+
+  return (
+    // Wraps rather than nowrap: with a fixed 280px rail, a narrow window
+    // squeezed the editor down to ~80px and every embedded picture rendered as
+    // an unreadable sliver. Below roughly 800px the editor now drops under the
+    // list instead.
+    <Group align="flex-start" gap="lg" wrap="wrap">
+      <Stack gap="xs" style={{ flexShrink: 0 }}>
+        <DocumentRail
+          items={rows}
+          selectedId={selectedId}
+          onSelect={setSelectedId}
+          onMove={move}
+          canMove={canMove}
+          addLabel="Add a question"
+          onAdd={addQuestion}
+          emptyLabel="No groups yet — add one to start."
+        />
+        <Button
+          variant="subtle"
+          size="sm"
+          leftSection={<Plus size={16} />}
+          onClick={addGroup}
+        >
+          Add a group
+        </Button>
+      </Stack>
+
+      {selectedItem && owner ? (
+        <EditorPane
+          title={selectedItem.question}
+          titlePlaceholder="What is the customer asking?"
+          onTitleChange={(question) =>
+            setGroups(
+              replaceAt(groups, ownerIndex, {
+                ...owner,
+                items: replaceAt(owner.items, itemIndex, {
+                  ...selectedItem,
+                  question,
+                }),
+              }),
+            )
+          }
+          onRemove={() =>
+            setGroups(
+              replaceAt(groups, ownerIndex, {
+                ...owner,
+                items: removeAt(owner.items, itemIndex),
+              }),
+            )
+          }
+          removeLabel="Delete this question"
+        >
+          <MarkdownEditor
+            // MDXEditor reads `markdown` only on mount — without a key,
+            // switching questions kept the previous answer on screen.
+            key={`${seed}:${selectedItem.id}`}
+            value={selectedItem.answer}
+            onChange={(answer) =>
+              setGroups(
+                replaceAt(groups, ownerIndex, {
+                  ...owner,
+                  items: replaceAt(owner.items, itemIndex, {
+                    ...selectedItem,
+                    answer,
+                  }),
+                }),
+              )
+            }
+          />
+        </EditorPane>
+      ) : selectedGroup ? (
+        <EditorPane
+          title={selectedGroup.title}
+          titlePlaceholder="Group name"
+          onTitleChange={(title) =>
+            setGroups(replaceAt(groups, groupIndex, { ...selectedGroup, title }))
+          }
+          onRemove={() => setGroups(removeAt(groups, groupIndex))}
+          removeLabel="Delete this group and its questions"
+        >
+          <Stack gap="sm">
+            <Text size="sm" c="dimmed">
+              A group is just a heading on the FAQ page. It holds{" "}
+              {selectedGroup.items.length} question
+              {selectedGroup.items.length === 1 ? "" : "s"} — pick one on the
+              left to edit it.
+            </Text>
+            <TextInput
+              label="Group name"
+              value={selectedGroup.title}
+              onChange={(e) =>
+                setGroups(
+                  replaceAt(groups, groupIndex, {
+                    ...selectedGroup,
+                    title: e.currentTarget.value,
+                  }),
+                )
+              }
+            />
+          </Stack>
+        </EditorPane>
+      ) : (
+        <EmptyPane message="Add a group to get started." />
+      )}
+    </Group>
+  );
+}
+
+export default FaqWorkspace;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/Markdown.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/Markdown.tsx
new file mode 100644
index 000000000..3a70754a5
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/Markdown.tsx
@@ -0,0 +1,103 @@
+import { isPortalVideoSrc, PORTAL_MEDIA_URI_SCHEME } from "@edr/types";
+import { Text } from "@mantine/core";
+import { useEffect, useState } from "react";
+import ReactMarkdown, { defaultUrlTransform } from "react-markdown";
+
+import { resolvePreview } from "./MarkdownEditor";
+// Same preflight fix the editor needs — Mantine's `Typography` defines its list
+// and margin rules with `:where()`, which Tailwind's preflight outranks, so
+// bullets rendered without markers here too.
+import "./markdown-editor.css";
+
+/**
+ * Renders one embedded picture or video. Stored copy holds `minio:<key>`, so
+ * the URL has to be signed before it can be shown; until it resolves the slot
+ * stays empty rather than flashing a broken image.
+ */
+function Embed({ src, alt }: { src: string; alt?: string }) {
+  const [resolved, setResolved] = useState<string | null>(
+    src.startsWith(PORTAL_MEDIA_URI_SCHEME) ? null : src,
+  );
+
+  useEffect(() => {
+    let active = true;
+    void resolvePreview(src).then((url) => {
+      if (active) setResolved(url);
+    });
+    return () => {
+      active = false;
+    };
+  }, [src]);
+
+  if (!resolved) return null;
+
+  // Spans, not <figure>: markdown wraps an image in a paragraph, and a
+  // <figure> inside a <p> is invalid HTML the browser silently re-parents —
+  // which dropped every embed after the first.
+  return (
+    <span style={{ display: "block", margin: "1rem 0" }}>
+      {isPortalVideoSrc(resolved) ? (
+        <video
+          src={resolved}
+          controls
+          preload="metadata"
+          style={{ width: "100%", borderRadius: 8, background: "#000" }}
+        />
+      ) : (
+        <img
+          src={resolved}
+          alt={alt ?? ""}
+          style={{ width: "100%", borderRadius: 8 }}
+        />
+      )}
+      {alt && (
+        <Text component="span" display="block" size="sm" c="dimmed" mt={4}>
+          {alt}
+        </Text>
+      )}
+    </span>
+  );
+}
+
+/**
+ * Read-only markdown rendering, used by the Preview toggle and the version
+ * history. Editing goes through `MarkdownEditor` (MDXEditor).
+ *
+ * Same options as the portal's renderer — no `rehype-raw`, no custom
+ * `urlTransform` — so neither app grows an HTML-injection surface.
+ */
+/**
+ * Module scope on purpose. Declared inline, this object is rebuilt on every
+ * render, so React sees a brand-new component type for `img` and remounts
+ * `Embed` each time — which threw away the URL it had just resolved and left
+ * every uploaded picture and video permanently blank.
+ */
+const COMPONENTS = {
+  img: ({ src, alt }: { src?: string; alt?: string }) =>
+    typeof src === "string" ? <Embed src={src} alt={alt} /> : null,
+};
+
+/**
+ * Lets our own `minio:` refs through, and defers everything else to
+ * react-markdown's default vetting (which drops `javascript:` and friends).
+ *
+ * Needed because the default transform allows only http/https/mailto/tel, so
+ * an unresolved `minio:` ref was silently blanked and every uploaded picture
+ * rendered as an empty paragraph. Only the backoffice needs this: the public
+ * bundle has already had these refs replaced with signed https URLs, so the
+ * portal's renderer keeps the stock transform untouched.
+ */
+const urlTransform = (url: string) =>
+  url.startsWith(PORTAL_MEDIA_URI_SCHEME) ? url : defaultUrlTransform(url);
+
+export function Markdown({ children }: { children: string }) {
+  return (
+    <div className="edr-md-content">
+      <ReactMarkdown components={COMPONENTS} urlTransform={urlTransform}>
+        {children}
+      </ReactMarkdown>
+    </div>
+  );
+}
+
+export default Markdown;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/MarkdownEditor.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/MarkdownEditor.tsx
new file mode 100644
index 000000000..81fb78c35
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/MarkdownEditor.tsx
@@ -0,0 +1,192 @@
+import { isPortalVideoSrc, PORTAL_MEDIA_URI_SCHEME } from "@edr/types";
+import { Box, Button, Group, SegmentedControl, Stack, Text } from "@mantine/core";
+import {
+  BlockTypeSelect,
+  BoldItalicUnderlineToggles,
+  CreateLink,
+  InsertThematicBreak,
+  ListsToggle,
+  MDXEditor,
+  type MDXEditorMethods,
+  UndoRedo,
+  headingsPlugin,
+  imagePlugin,
+  linkDialogPlugin,
+  linkPlugin,
+  listsPlugin,
+  markdownShortcutPlugin,
+  quotePlugin,
+  thematicBreakPlugin,
+  toolbarPlugin,
+} from "@mdxeditor/editor";
+import { ImagePlus } from "lucide-react";
+import { useRef, useState } from "react";
+import "@mdxeditor/editor/style.css";
+
+import { portalContentService } from "@/services/portal-content.service";
+
+import { Markdown } from "./Markdown";
+import { MediaDialog } from "./MediaDialog";
+import { videoPosterDataUrl, VIDEO_PLACEHOLDER } from "./video-poster";
+// Undoes Tailwind's preflight inside the editor's content area — see the file.
+import "./markdown-editor.css";
+
+interface MarkdownEditorProps {
+  value: string;
+  onChange: (next: string) => void;
+}
+
+/**
+ * Signed URLs are per-request and short-lived, so previews are memoised for the
+ * life of the page rather than re-signed on every keystroke re-render.
+ */
+const previewCache = new Map<string, Promise<string>>();
+
+/**
+ * Inserted media is stored as `minio:<key>`, never as the signed URL the upload
+ * returns: a presigned URL expires, so persisting one would leave every
+ * embedded picture broken a few hours later. This resolves the ref back to a
+ * temporary URL purely for display.
+ */
+export function resolvePreview(url: string): Promise<string> {
+  if (!url.startsWith(PORTAL_MEDIA_URI_SCHEME)) return Promise.resolve(url);
+
+  const key = url.slice(PORTAL_MEDIA_URI_SCHEME.length);
+  let pending = previewCache.get(key);
+  if (!pending) {
+    pending = portalContentService
+      .mediaUrl(key)
+      // The editor draws every embed as an <img>, so a video src rendered as a
+      // broken box. Swap in a frame grabbed from the video itself.
+      .then((signed) =>
+        isPortalVideoSrc(key) ? videoPosterDataUrl(signed) : signed,
+      )
+      .catch(() => (isPortalVideoSrc(key) ? VIDEO_PLACEHOLDER : url));
+    previewCache.set(key, pending);
+  }
+  return pending;
+}
+
+export function MarkdownEditor({ value, onChange }: MarkdownEditorProps) {
+  const editorRef = useRef<MDXEditorMethods>(null);
+  const [mediaOpen, setMediaOpen] = useState(false);
+  const [mode, setMode] = useState<"write" | "preview">("write");
+
+  return (
+    <Stack gap="sm" style={{ flex: 1, minHeight: 0 }}>
+      <Group justify="space-between" align="center">
+        <Text size="sm" fw={600} c="dimmed">
+          Page text
+        </Text>
+        <SegmentedControl
+          size="xs"
+          value={mode}
+          onChange={(next) => setMode(next as "write" | "preview")}
+          data={[
+            { label: "Write", value: "write" },
+            { label: "Preview", value: "preview" },
+          ]}
+        />
+      </Group>
+
+      {mode === "write" ? (
+        <Box
+          style={{
+            border: "1px solid var(--mantine-color-gray-3)",
+            borderRadius: "var(--mantine-radius-md)",
+            background: "#FFFFFF",
+            overflow: "hidden",
+          }}
+        >
+          <MDXEditor
+            ref={editorRef}
+            markdown={value}
+            contentEditableClassName="edr-md-content"
+            // MDXEditor re-serialises the markdown once on mount, which differs
+            // harmlessly from what was stored (spacing, escaping). Reporting
+            // that as an edit made every tab open "unsaved" and let a Save
+            // write a no-op version, so the normalisation pass is ignored.
+            onChange={(markdown, initialMarkdownNormalize) => {
+              if (!initialMarkdownNormalize) onChange(markdown);
+            }}
+            plugins={[
+              headingsPlugin(),
+              listsPlugin(),
+              quotePlugin(),
+              linkPlugin(),
+              linkDialogPlugin(),
+              thematicBreakPlugin(),
+              // Kept for rendering existing images; its own insert button is
+              // replaced by the one below, which also handles video.
+              imagePlugin({ imagePreviewHandler: resolvePreview }),
+              markdownShortcutPlugin(),
+              toolbarPlugin({
+                toolbarContents: () => (
+                  <>
+                    <UndoRedo />
+                    {/* No underline: markdown has none, so MDXEditor emits a
+                        raw <u> tag — and the portal's renderer drops raw HTML
+                        by design, so the author's emphasis would silently
+                        vanish for the customer. */}
+                    <BoldItalicUnderlineToggles options={["Bold", "Italic"]} />
+                    <BlockTypeSelect />
+                    <ListsToggle />
+                    <CreateLink />
+                    <Button
+                      size="compact-sm"
+                      variant="subtle"
+                      leftSection={<ImagePlus size={16} />}
+                      onClick={() => setMediaOpen(true)}
+                    >
+                      Picture or video
+                    </Button>
+                    <InsertThematicBreak />
+                  </>
+                ),
+              }),
+            ]}
+          />
+        </Box>
+      ) : (
+        <Box
+          p="lg"
+          style={{
+            border: "1px solid var(--mantine-color-gray-3)",
+            borderRadius: "var(--mantine-radius-md)",
+            background: "#FFFFFF",
+            minHeight: 240,
+          }}
+        >
+          {/* The same renderer the customer gets — the only place an author can
+              watch an embedded video actually play before publishing. */}
+          <Markdown>{value || "_This page is empty._"}</Markdown>
+        </Box>
+      )}
+
+      <MediaDialog
+        opened={mediaOpen}
+        onClose={() => setMediaOpen(false)}
+        onInsert={(markdown) => {
+          editorRef.current?.insertMarkdown(`\n\n${markdown}\n\n`);
+          // Inserting through the ref bypasses onChange, so push it ourselves.
+          const next = editorRef.current?.getMarkdown();
+          if (next !== undefined) onChange(next);
+        }}
+      />
+    </Stack>
+  );
+}
+
+/** Reminder of the substitution tokens, shown once per document. */
+export function MarkdownHint() {
+  return (
+    <Text size="xs" c="dimmed">
+      Type <code>{"{{supportEmail}}"}</code>, <code>{"{{supportPhone}}"}</code>,{" "}
+      <code>{"{{supportOffice}}"}</code> or <code>{"{{supportHours}}"}</code>{" "}
+      anywhere and it fills in from the Contact tab — change it once there and
+      every page updates.
+    </Text>
+  );
+}
+
+export default MarkdownEditor;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/MediaDialog.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/MediaDialog.tsx
new file mode 100644
index 000000000..eae3c6f52
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/MediaDialog.tsx
@@ -0,0 +1,230 @@
+import { PORTAL_MEDIA_URI_SCHEME, SUPPORT_MEDIA_MAX_BYTES } from "@edr/types";
+import {
+  Box,
+  Button,
+  Group,
+  Loader,
+  Modal,
+  Progress,
+  Stack,
+  Text,
+  TextInput,
+} from "@mantine/core";
+import { Film, Image as ImageIcon, UploadCloud } from "lucide-react";
+import { useRef, useState } from "react";
+import toast from "react-hot-toast";
+
+import { portalContentService } from "@/services/portal-content.service";
+
+interface MediaDialogProps {
+  opened: boolean;
+  onClose: () => void;
+  /** Receives the markdown to drop at the cursor. */
+  onInsert: (markdown: string) => void;
+}
+
+const MAX_MB = Math.round(SUPPORT_MEDIA_MAX_BYTES / (1024 * 1024));
+
+/**
+ * Adds a picture or video to the text — drop a file, or browse for one.
+ *
+ * Replaces MDXEditor's built-in image dialog, which asks for a URL, only takes
+ * images, and leaves an author who just wants to show a screenshot with nothing
+ * to do. There is deliberately no "paste a link" field: everything lives in the
+ * platform, so nothing an editor inserts can rot because someone else's server
+ * moved a file.
+ *
+ * Uploads return an object key; the markdown stores `minio:<key>` and the API
+ * signs it fresh on every read.
+ */
+export function MediaDialog({ opened, onClose, onInsert }: MediaDialogProps) {
+  const inputRef = useRef<HTMLInputElement>(null);
+  const [uploading, setUploading] = useState(false);
+  const [progress, setProgress] = useState<number | null>(null);
+  const [dragging, setDragging] = useState(false);
+  const [uploaded, setUploaded] = useState<{
+    key: string;
+    kind: "image" | "video";
+    url: string;
+  } | null>(null);
+  const [caption, setCaption] = useState("");
+
+  const reset = () => {
+    setUploaded(null);
+    setCaption("");
+    setDragging(false);
+    if (inputRef.current) inputRef.current.value = "";
+  };
+
+  const close = () => {
+    reset();
+    onClose();
+  };
+
+  const upload = async (file: File) => {
+    if (file.size > SUPPORT_MEDIA_MAX_BYTES) {
+      toast.error(`That file is over ${MAX_MB} MB.`);
+      return;
+    }
+
+    setUploading(true);
+    setProgress(0);
+    try {
+      setUploaded(await portalContentService.uploadMedia(file, setProgress));
+    } catch (error) {
+      const err = error as {
+        code?: string;
+        response?: { data?: { message?: string } };
+      };
+      const message =
+        err.code === "ECONNABORTED"
+          ? "That upload timed out. Check your connection and try again."
+          : (err.response?.data?.message ?? "Upload failed");
+      toast.error(Array.isArray(message) ? message.join(", ") : message);
+    } finally {
+      setUploading(false);
+      setProgress(null);
+      if (inputRef.current) inputRef.current.value = "";
+    }
+  };
+
+  const insert = () => {
+    if (!uploaded) return;
+    // The caption doubles as alt text, so it is worth prompting for.
+    onInsert(`![${caption}](${PORTAL_MEDIA_URI_SCHEME}${uploaded.key})`);
+    close();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={close}
+      title="Add a picture or video"
+      size="lg"
+      centered
+    >
+      <Stack gap="md">
+        {!uploaded ? (
+          <Box
+            onDragOver={(e) => {
+              e.preventDefault();
+              setDragging(true);
+            }}
+            onDragLeave={() => setDragging(false)}
+            onDrop={(e) => {
+              e.preventDefault();
+              setDragging(false);
+              const file = e.dataTransfer.files?.[0];
+              if (file) void upload(file);
+            }}
+            onClick={() => inputRef.current?.click()}
+            style={{
+              border: `2px dashed var(--mantine-color-${dragging ? "green" : "gray"}-4)`,
+              background: dragging
+                ? "var(--mantine-color-green-0)"
+                : "var(--mantine-color-gray-0)",
+              borderRadius: "var(--mantine-radius-md)",
+              padding: "2.5rem 1.5rem",
+              textAlign: "center",
+              cursor: "pointer",
+              transition: "background 120ms, border-color 120ms",
+            }}
+          >
+            {uploading ? (
+              <Stack align="center" gap="xs">
+                <Loader size="sm" />
+                <Text size="sm" c="dimmed">
+                  {progress === null
+                    ? "Uploading…"
+                    : `Uploading… ${progress}%`}
+                </Text>
+                {progress !== null && (
+                  <Progress value={progress} w="60%" size="sm" />
+                )}
+              </Stack>
+            ) : (
+              <Stack align="center" gap="xs">
+                <UploadCloud size={32} strokeWidth={1.5} />
+                <Text fw={500}>Drop a file here, or click to browse</Text>
+                <Text size="sm" c="dimmed">
+                  Pictures (PNG, JPG, GIF) and videos (MP4, WebM) up to {MAX_MB} MB
+                </Text>
+              </Stack>
+            )}
+          </Box>
+        ) : (
+          <Stack gap="md">
+            <Box
+              style={{
+                border: "1px solid var(--mantine-color-gray-3)",
+                borderRadius: "var(--mantine-radius-md)",
+                padding: "0.75rem",
+                background: "var(--mantine-color-gray-0)",
+              }}
+            >
+              {uploaded.kind === "video" ? (
+                <video
+                  src={uploaded.url}
+                  controls
+                  style={{ width: "100%", maxHeight: 320, borderRadius: 8 }}
+                />
+              ) : (
+                <img
+                  src={uploaded.url}
+                  alt=""
+                  style={{
+                    width: "100%",
+                    maxHeight: 320,
+                    objectFit: "contain",
+                    borderRadius: 8,
+                  }}
+                />
+              )}
+            </Box>
+
+            <Group gap="xs" c="dimmed">
+              {uploaded.kind === "video" ? (
+                <Film size={16} />
+              ) : (
+                <ImageIcon size={16} />
+              )}
+              <Text size="sm">
+                {uploaded.kind === "video" ? "Video" : "Picture"} uploaded
+              </Text>
+            </Group>
+
+            <TextInput
+              label="Caption"
+              description="Shown under the picture, and read aloud by screen readers. Optional."
+              value={caption}
+              onChange={(e) => setCaption(e.currentTarget.value)}
+              autoFocus
+            />
+          </Stack>
+        )}
+
+        <input
+          ref={inputRef}
+          type="file"
+          accept="image/*,video/*"
+          hidden
+          onChange={(e) => {
+            const file = e.currentTarget.files?.[0];
+            if (file) void upload(file);
+          }}
+        />
+
+        <Group justify="space-between">
+          <Button variant="subtle" onClick={uploaded ? reset : close}>
+            {uploaded ? "Choose a different file" : "Cancel"}
+          </Button>
+          <Button onClick={insert} disabled={!uploaded}>
+            Add to the page
+          </Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+}
+
+export default MediaDialog;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/PortalContentPage.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/PortalContentPage.tsx
new file mode 100644
index 000000000..4fc51174d
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/PortalContentPage.tsx
@@ -0,0 +1,354 @@
+import type {
+  PortalFaqContent,
+  PortalHelpContent,
+  PortalLegalContent,
+  PortalSupportContact,
+  SupportDocPayload,
+  SupportDocSlug,
+} from "@edr/types";
+import {
+  Badge,
+  Button,
+  Card,
+  Group,
+  Loader,
+  Stack,
+  Tabs,
+  Text,
+  TextInput,
+} from "@mantine/core";
+import { History, RotateCcw, Save } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
+
+import { PageContainer, PageHeader } from "@/components/page";
+import {
+  usePortalDoc,
+  useUpdatePortalDoc,
+} from "@/hooks/portal-content/usePortalContentAdmin";
+
+import { FaqWorkspace } from "./FaqWorkspace";
+import { MarkdownHint } from "./MarkdownEditor";
+import { SectionWorkspace } from "./SectionWorkspace";
+import { VersionHistoryModal } from "./VersionHistoryModal";
+
+const TABS: { slug: SupportDocSlug; label: string }[] = [
+  { slug: "CONTACT", label: "Contact" },
+  { slug: "HELP", label: "Help" },
+  { slug: "FAQ", label: "FAQ" },
+  { slug: "PRIVACY", label: "Privacy" },
+  { slug: "TERMS", label: "Terms" },
+];
+
+/**
+ * Edits the copy on the freight portal's public pages — /help, /faq, /terms,
+ * /privacy — and the support contact block all four quote.
+ *
+ * Each tab is a local draft saved in one PATCH of the whole document, rather
+ * than a mutation per field. That is what makes one editorial change equal one
+ * version, which is the difference between a history you can read and a history
+ * of keystrokes.
+ */
+export default function PortalContentPage() {
+  const [active, setActive] = useState<SupportDocSlug>("CONTACT");
+
+  return (
+    <PageContainer>
+      <PageHeader
+        title="Portal content"
+        subtitle="Help, FAQ and legal copy shown to customers on the public portal pages. Body text is markdown, every save is versioned, and any version can be restored."
+      />
+
+      <Tabs
+        value={active}
+        onChange={(value) => setActive(value as SupportDocSlug)}
+        keepMounted={false}
+      >
+        <Tabs.List mb="lg">
+          {TABS.map((tab) => (
+            <Tabs.Tab key={tab.slug} value={tab.slug}>
+              {tab.label}
+            </Tabs.Tab>
+          ))}
+        </Tabs.List>
+
+        {TABS.map((tab) => (
+          <Tabs.Panel key={tab.slug} value={tab.slug}>
+            <DocumentTab slug={tab.slug} />
+          </Tabs.Panel>
+        ))}
+      </Tabs>
+    </PageContainer>
+  );
+}
+
+function DocumentTab({ slug }: { slug: SupportDocSlug }) {
+  const { data, isLoading } = usePortalDoc(slug);
+  const update = useUpdatePortalDoc(slug);
+
+  const [draft, setDraft] = useState<SupportDocPayload | null>(null);
+  const [note, setNote] = useState("");
+  const [historyOpen, setHistoryOpen] = useState(false);
+
+  /**
+   * Bumped every time the draft is replaced wholesale rather than edited —
+   * initial load, save, restore, Reset. The editors key off it to remount,
+   * because MDXEditor reads its markdown only on mount and would otherwise
+   * keep showing text the draft no longer holds.
+   */
+  const [seed, setSeed] = useState(0);
+
+  // Reseed only when the server's version number moves (load, save, restore).
+  // Keying off `data` itself would let a background refetch wipe edits that are
+  // still in progress.
+  const seededVersion = useRef<number | null>(null);
+  useEffect(() => {
+    if (data && seededVersion.current !== data.version) {
+      seededVersion.current = data.version;
+      setDraft(data.payload);
+      setNote("");
+      setSeed((n) => n + 1);
+    }
+  }, [data]);
+
+  if (isLoading || !data || !draft) return <Loader size="sm" />;
+
+  const dirty = JSON.stringify(draft) !== JSON.stringify(data.payload);
+
+  const reset = () => {
+    setDraft(data.payload);
+    setNote("");
+    setSeed((n) => n + 1);
+  };
+
+  return (
+    <Stack gap="lg">
+      {/* Sticky: these tabs are long lists, and a Save button that scrolls out
+          of reach is the fastest way to lose an edit. */}
+      <Card
+        withBorder
+        padding="sm"
+        radius="md"
+        style={{
+          position: "sticky",
+          top: 0,
+          zIndex: 2,
+          backgroundColor: "var(--mantine-color-body)",
+        }}
+      >
+        <Group justify="space-between" align="center" wrap="wrap" gap="sm">
+          <Group gap="xs">
+            <Badge variant="light" color={dirty ? "orange" : "gray"}>
+              v{data.version}
+            </Badge>
+            <Text size="sm" c={dirty ? "orange" : "dimmed"}>
+              {dirty ? "Unsaved changes" : "Saved"}
+            </Text>
+          </Group>
+
+          <Group gap="xs" align="center">
+            {dirty && (
+              <TextInput
+                size="sm"
+                placeholder="Change note (optional)"
+                value={note}
+                onChange={(e) => setNote(e.currentTarget.value)}
+                w={240}
+              />
+            )}
+            <Button
+              variant="default"
+              leftSection={<History size={16} />}
+              onClick={() => setHistoryOpen(true)}
+            >
+              History
+            </Button>
+            <Button
+              variant="subtle"
+              leftSection={<RotateCcw size={16} />}
+              disabled={!dirty}
+              onClick={reset}
+            >
+              Reset
+            </Button>
+            <Button
+              leftSection={<Save size={16} />}
+              disabled={!dirty}
+              loading={update.isPending}
+              onClick={() =>
+                update.mutate({ payload: draft, note: note || undefined })
+              }
+            >
+              Save
+            </Button>
+          </Group>
+        </Group>
+      </Card>
+
+      <DocumentEditor
+        slug={slug}
+        value={draft}
+        onChange={setDraft}
+        seed={seed}
+      />
+
+      <VersionHistoryModal
+        slug={slug}
+        opened={historyOpen}
+        onClose={() => setHistoryOpen(false)}
+        hasUnsavedChanges={dirty}
+        onRestored={reset}
+      />
+    </Stack>
+  );
+}
+
+function DocumentEditor({
+  slug,
+  value,
+  onChange,
+  seed,
+}: {
+  slug: SupportDocSlug;
+  value: SupportDocPayload;
+  onChange: (next: SupportDocPayload) => void;
+  /** Reseed counter; bumping it remounts the editors. */
+  seed: number;
+}) {
+  switch (slug) {
+    case "CONTACT":
+      return (
+        <ContactEditor
+          value={value as PortalSupportContact}
+          onChange={onChange}
+        />
+      );
+    case "FAQ":
+      return (
+        <FaqWorkspace
+          value={value as PortalFaqContent}
+          onChange={onChange}
+          seed={seed}
+        />
+      );
+    case "HELP":
+    case "PRIVACY":
+    case "TERMS": {
+      // All three are a title, a subtitle and a list of pages, so they share
+      // one workspace. `sections` is guarded because a row written before the
+      // free-form conversion has none.
+      const doc = value as PortalHelpContent | PortalLegalContent;
+      return (
+        <DocumentShell
+          value={doc}
+          onChange={onChange}
+          showLastUpdated={slug !== "HELP"}
+          seed={seed}
+        />
+      );
+    }
+  }
+}
+
+/**
+ * Title, subtitle and (for the legal documents) the "last updated" line, above
+ * the page list. These three fields describe the whole document, so they sit
+ * apart from the page being edited.
+ */
+function DocumentShell({
+  value,
+  onChange,
+  showLastUpdated,
+  seed,
+}: {
+  value: PortalHelpContent | PortalLegalContent;
+  onChange: (next: SupportDocPayload) => void;
+  showLastUpdated: boolean;
+  seed: number;
+}) {
+  const legal = value as PortalLegalContent;
+
+  return (
+    <Stack gap="lg">
+      <Card withBorder padding="lg" radius="lg" bg="#FFFFFF">
+        <Stack gap="md">
+          <Group grow align="flex-start">
+            <TextInput
+              label="Page title"
+              description="The big heading customers see"
+              value={value.title}
+              onChange={(e) =>
+                onChange({ ...value, title: e.currentTarget.value })
+              }
+            />
+            {showLastUpdated && (
+              <TextInput
+                label="Last updated"
+                description="Free text, e.g. 6 August 2026"
+                value={legal.lastUpdated}
+                onChange={(e) =>
+                  onChange({ ...legal, lastUpdated: e.currentTarget.value })
+                }
+              />
+            )}
+          </Group>
+
+          <TextInput
+            label="Intro line"
+            description="One sentence under the heading"
+            value={value.subtitle}
+            onChange={(e) =>
+              onChange({ ...value, subtitle: e.currentTarget.value })
+            }
+          />
+
+          <MarkdownHint />
+        </Stack>
+      </Card>
+
+      <SectionWorkspace
+        sections={value.sections ?? []}
+        onChange={(sections) => onChange({ ...value, sections })}
+        seed={seed}
+      />
+    </Stack>
+  );
+}
+
+/**
+ * Four fields, so no separate file. These values feed the help page's contact
+ * cards and resolve the `{{supportEmail}}`-style placeholders used throughout
+ * the FAQ and legal copy — editing them here updates every page at once.
+ */
+function ContactEditor({
+  value,
+  onChange,
+}: {
+  value: PortalSupportContact;
+  onChange: (next: PortalSupportContact) => void;
+}) {
+  return (
+    <Stack gap="md" maw={640}>
+      <TextInput
+        label="Support email"
+        value={value.email}
+        onChange={(e) => onChange({ ...value, email: e.currentTarget.value })}
+      />
+      <TextInput
+        label="Support phone"
+        description="Displayed as typed; tel: links strip the spacing automatically."
+        value={value.phone}
+        onChange={(e) => onChange({ ...value, phone: e.currentTarget.value })}
+      />
+      <TextInput
+        label="Head office"
+        value={value.office}
+        onChange={(e) => onChange({ ...value, office: e.currentTarget.value })}
+      />
+      <TextInput
+        label="Support hours"
+        value={value.hours}
+        onChange={(e) => onChange({ ...value, hours: e.currentTarget.value })}
+      />
+    </Stack>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/SectionWorkspace.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/SectionWorkspace.tsx
new file mode 100644
index 000000000..d9876391e
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/SectionWorkspace.tsx
@@ -0,0 +1,111 @@
+import type { PortalDocSection } from "@edr/types";
+import { Group, Stack } from "@mantine/core";
+import { useEffect, useState } from "react";
+
+import { moveAt, newId, removeAt, replaceAt } from "./array-helpers";
+import { DocumentRail } from "./DocumentRail";
+import { EditorPane, EmptyPane } from "./EditorPane";
+import { MarkdownEditor } from "./MarkdownEditor";
+
+interface SectionWorkspaceProps {
+  sections: PortalDocSection[];
+  onChange: (next: PortalDocSection[]) => void;
+  /** Reseed counter — see the `key` on the editor below. */
+  seed: number;
+}
+
+/**
+ * Page-at-a-time editing for any document that is a list of sections — the help
+ * page and both legal documents. The list on the left is the document's table
+ * of contents; the pane on the right is the page you are working on.
+ */
+export function SectionWorkspace({
+  sections,
+  onChange,
+  seed,
+}: SectionWorkspaceProps) {
+  const [selectedId, setSelectedId] = useState<string | null>(
+    sections[0]?.id ?? null,
+  );
+
+  // Keep a valid selection when the open page is deleted, or when the tab is
+  // reseeded after a save or a restore.
+  useEffect(() => {
+    if (!sections.some((section) => section.id === selectedId)) {
+      setSelectedId(sections[0]?.id ?? null);
+    }
+  }, [sections, selectedId]);
+
+  const index = sections.findIndex((section) => section.id === selectedId);
+  const selected = index >= 0 ? sections[index] : null;
+
+  const addSection = () => {
+    const section = { id: newId(), heading: "", body: "" };
+    onChange([...sections, section]);
+    setSelectedId(section.id);
+  };
+
+  return (
+    // Wraps rather than nowrap: with a fixed 280px rail, a narrow window
+    // squeezed the editor down to ~80px and every embedded picture rendered as
+    // an unreadable sliver. Below roughly 800px the editor now drops under the
+    // list instead.
+    <Group align="flex-start" gap="lg" wrap="wrap">
+      <DocumentRail
+        items={sections.map((section) => ({
+          id: section.id,
+          label: section.heading,
+        }))}
+        selectedId={selectedId}
+        onSelect={setSelectedId}
+        onMove={(id, delta) =>
+          onChange(
+            moveAt(
+              sections,
+              sections.findIndex((section) => section.id === id),
+              delta,
+            ),
+          )
+        }
+        canMove={(id, delta) => {
+          const at = sections.findIndex((section) => section.id === id);
+          const target = at + delta;
+          return target >= 0 && target < sections.length;
+        }}
+        addLabel="Add a page"
+        onAdd={addSection}
+        emptyLabel="This document has no pages yet."
+      />
+
+      {selected ? (
+        <EditorPane
+          title={selected.heading}
+          titlePlaceholder="Page heading"
+          onTitleChange={(heading) =>
+            onChange(replaceAt(sections, index, { ...selected, heading }))
+          }
+          onRemove={() => onChange(removeAt(sections, index))}
+          removeLabel="Delete this page"
+        >
+          <Stack gap="md">
+            <MarkdownEditor
+              // MDXEditor reads `markdown` only when it mounts, so without a
+              // key it keeps showing the previously-opened page's text. The
+              // counter is in the key too, so save, restore and Reset reseed it
+              // instead of leaving stale content on screen.
+              key={`${seed}:${selected.id}`}
+              value={selected.body}
+              onChange={(body) =>
+                onChange(replaceAt(sections, index, { ...selected, body }))
+              }
+            />
+          </Stack>
+        </EditorPane>
+      ) : (
+        <EmptyPane message="Add a page to get started." />
+      )}
+    </Group>
+  );
+}
+
+export default SectionWorkspace;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/VersionHistoryModal.tsx b/apps/edr-freight-web/backoffice/src/pages/portal_content/VersionHistoryModal.tsx
new file mode 100644
index 000000000..f9bcbb9d3
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/VersionHistoryModal.tsx
@@ -0,0 +1,198 @@
+import type { SupportDocSlug } from "@edr/types";
+import {
+  Alert,
+  Badge,
+  Button,
+  Card,
+  Group,
+  Loader,
+  Modal,
+  Stack,
+  Text,
+} from "@mantine/core";
+import { AlertTriangle } from "lucide-react";
+import { useState } from "react";
+
+import {
+  usePortalDocVersion,
+  usePortalDocVersions,
+  useRestorePortalVersion,
+} from "@/hooks/portal-content/usePortalContentAdmin";
+
+import { Markdown } from "./Markdown";
+import { summarizeVersion } from "./version-preview";
+
+interface VersionHistoryModalProps {
+  slug: SupportDocSlug;
+  opened: boolean;
+  onClose: () => void;
+  /** True when the tab holds unsaved edits a restore would discard. */
+  hasUnsavedChanges: boolean;
+  onRestored: () => void;
+}
+
+function formatSavedAt(value: string): string {
+  return new Date(value).toLocaleString("en-GB", {
+    day: "numeric",
+    month: "short",
+    year: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+}
+
+/**
+ * Version history for one document. Restoring re-saves the old payload as a new
+ * version server-side, so the list only ever grows and a restore is itself
+ * undoable — there is nothing here that can destroy history.
+ */
+export function VersionHistoryModal({
+  slug,
+  opened,
+  onClose,
+  hasUnsavedChanges,
+  onRestored,
+}: VersionHistoryModalProps) {
+  const { data: versions, isLoading } = usePortalDocVersions(slug, opened);
+  const [previewing, setPreviewing] = useState<number | null>(null);
+  const [confirming, setConfirming] = useState<number | null>(null);
+  const { data: preview } = usePortalDocVersion(slug, previewing);
+  const restore = useRestorePortalVersion(slug);
+
+  const close = () => {
+    setPreviewing(null);
+    setConfirming(null);
+    onClose();
+  };
+
+  const latest = versions?.[0]?.version;
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={close}
+      size="xl"
+      title={`Version history — ${slug}`}
+    >
+      <Stack gap="md">
+        {hasUnsavedChanges && (
+          <Alert
+            color="orange"
+            icon={<AlertTriangle size={16} />}
+            title="Unsaved changes"
+          >
+            This tab has edits that have not been saved. Restoring a version
+            discards them.
+          </Alert>
+        )}
+
+        {isLoading && <Loader size="sm" />}
+
+        {versions?.map((version) => (
+          <Card key={version.id} withBorder padding="md" radius="md">
+            <Group justify="space-between" align="flex-start" wrap="nowrap">
+              <Stack gap={2}>
+                <Group gap="xs">
+                  <Text fw={600}>v{version.version}</Text>
+                  {version.version === latest && (
+                    <Badge size="sm" variant="light">
+                      Current
+                    </Badge>
+                  )}
+                  <Text size="sm" c="dimmed">
+                    {formatSavedAt(version.createdAt)}
+                  </Text>
+                </Group>
+                {version.note && (
+                  <Text size="sm" c="dimmed">
+                    {version.note}
+                  </Text>
+                )}
+              </Stack>
+
+              {confirming === version.version ? (
+                <Group gap="xs" wrap="nowrap">
+                  <Text size="sm">Restore v{version.version}?</Text>
+                  <Button
+                    size="xs"
+                    color="red"
+                    loading={restore.isPending}
+                    onClick={() =>
+                      restore.mutate(version.version, {
+                        onSuccess: () => {
+                          onRestored();
+                          close();
+                        },
+                      })
+                    }
+                  >
+                    Confirm
+                  </Button>
+                  <Button
+                    size="xs"
+                    variant="subtle"
+                    onClick={() => setConfirming(null)}
+                  >
+                    Cancel
+                  </Button>
+                </Group>
+              ) : (
+                <Group gap="xs" wrap="nowrap">
+                  <Button
+                    size="xs"
+                    variant="light"
+                    onClick={() =>
+                      setPreviewing(
+                        previewing === version.version ? null : version.version,
+                      )
+                    }
+                  >
+                    {previewing === version.version ? "Hide" : "Preview"}
+                  </Button>
+                  <Button
+                    size="xs"
+                    variant="subtle"
+                    disabled={version.version === latest}
+                    onClick={() => {
+                      setConfirming(version.version);
+                      setPreviewing(null);
+                    }}
+                  >
+                    Restore
+                  </Button>
+                </Group>
+              )}
+            </Group>
+
+            {previewing === version.version && (
+              <Card mt="sm" withBorder padding="sm" radius="sm" bg="gray.0">
+                {preview ? (
+                  <Stack gap="sm">
+                    {summarizeVersion(slug, preview.payload).map((entry, i) => (
+                      <Stack key={`${entry.label}-${i}`} gap={2}>
+                        <Text size="sm" fw={600}>
+                          {entry.label}
+                        </Text>
+                        <Markdown>{entry.body}</Markdown>
+                      </Stack>
+                    ))}
+                  </Stack>
+                ) : (
+                  <Loader size="xs" />
+                )}
+              </Card>
+            )}
+          </Card>
+        ))}
+
+        {versions?.length === 0 && (
+          <Text size="sm" c="dimmed">
+            No history yet.
+          </Text>
+        )}
+      </Stack>
+    </Modal>
+  );
+}
+
+export default VersionHistoryModal;
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/array-helpers.ts b/apps/edr-freight-web/backoffice/src/pages/portal_content/array-helpers.ts
new file mode 100644
index 000000000..3a3ae40b0
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/array-helpers.ts
@@ -0,0 +1,24 @@
+/** Immutable list edits shared by the three payload editors. */
+
+export function replaceAt<T>(items: T[], index: number, next: T): T[] {
+  return items.map((item, i) => (i === index ? next : item));
+}
+
+export function removeAt<T>(items: T[], index: number): T[] {
+  return items.filter((_, i) => i !== index);
+}
+
+/**
+ * Swaps an item with its neighbour. Out-of-range moves return the list
+ * unchanged, so the ▲/▼ buttons need no disabled-state bookkeeping of their own.
+ */
+export function moveAt<T>(items: T[], index: number, delta: number): T[] {
+  const target = index + delta;
+  if (target < 0 || target >= items.length) return items;
+
+  const next = [...items];
+  [next[index], next[target]] = [next[target], next[index]];
+  return next;
+}
+
+export const newId = () => crypto.randomUUID();
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/markdown-editor.css b/apps/edr-freight-web/backoffice/src/pages/portal_content/markdown-editor.css
new file mode 100644
index 000000000..e5766ff1a
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/markdown-editor.css
@@ -0,0 +1,119 @@
+/*
+ * Tailwind's preflight zeroes margins on `p`, strips `list-style` from `ul`/`ol`
+ * and flattens heading sizes. MDXEditor's own stylesheet assumes browser
+ * defaults, so inside this app its content area renders as one undifferentiated
+ * block — paragraphs run together and bullets lose their markers.
+ *
+ * This restores the handful of element styles the editor needs, scoped to its
+ * content area so nothing leaks back into the rest of the backoffice. It is a
+ * deliberate alternative to pulling in @tailwindcss/typography for one widget.
+ */
+
+.edr-md-content p {
+  margin: 0 0 0.75rem;
+  line-height: 1.6;
+}
+
+.edr-md-content p:last-child {
+  margin-bottom: 0;
+}
+
+.edr-md-content ul,
+.edr-md-content ol {
+  margin: 0 0 0.75rem;
+  padding-left: 1.5rem;
+}
+
+.edr-md-content ul {
+  list-style: disc;
+}
+
+.edr-md-content ol {
+  list-style: decimal;
+}
+
+.edr-md-content li {
+  margin: 0.25rem 0;
+  line-height: 1.6;
+}
+
+/* Nested lists — the editor's indent button produces these. */
+.edr-md-content li > ul,
+.edr-md-content li > ol {
+  margin: 0.25rem 0 0;
+}
+
+.edr-md-content h1,
+.edr-md-content h2,
+.edr-md-content h3,
+.edr-md-content h4 {
+  font-weight: 700;
+  line-height: 1.3;
+  margin: 1rem 0 0.5rem;
+}
+
+.edr-md-content h1 {
+  font-size: 1.5rem;
+}
+
+.edr-md-content h2 {
+  font-size: 1.25rem;
+}
+
+.edr-md-content h3 {
+  font-size: 1.1rem;
+}
+
+.edr-md-content h4 {
+  font-size: 1rem;
+}
+
+.edr-md-content strong {
+  font-weight: 600;
+}
+
+.edr-md-content em {
+  font-style: italic;
+}
+
+.edr-md-content a {
+  color: var(--mantine-color-blue-6);
+  text-decoration: underline;
+}
+
+.edr-md-content blockquote {
+  margin: 0 0 0.75rem;
+  padding-left: 0.75rem;
+  border-left: 3px solid var(--mantine-color-gray-3);
+  color: var(--mantine-color-dimmed);
+}
+
+.edr-md-content hr {
+  border: 0;
+  border-top: 1px solid var(--mantine-color-gray-3);
+  margin: 1rem 0;
+}
+
+.edr-md-content code {
+  font-family: var(--mantine-font-family-monospace);
+  font-size: 0.875em;
+  background: var(--mantine-color-gray-1);
+  padding: 0.05rem 0.25rem;
+  border-radius: 3px;
+}
+
+/*
+ * MDXEditor renders its image node with `width="inherit" height="inherit"`
+ * attributes, which collapsed a 720px-wide picture into a ~56x124 sliver.
+ * The `!important` is aimed at those attributes rather than at another
+ * stylesheet — attribute-derived sizing otherwise wins here.
+ */
+.edr-md-content img {
+  display: block;
+  width: auto !important;
+  height: auto !important;
+  max-width: 100%;
+  max-height: 420px;
+  border-radius: 8px;
+  object-fit: contain;
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/version-preview.ts b/apps/edr-freight-web/backoffice/src/pages/portal_content/version-preview.ts
new file mode 100644
index 000000000..42e7fb8ab
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/version-preview.ts
@@ -0,0 +1,79 @@
+import type {
+  PortalFaqContent,
+  PortalHelpContent,
+  PortalLegalContent,
+  PortalSupportContact,
+  SupportDocPayload,
+  SupportDocSlug,
+} from "@edr/types";
+
+export interface PreviewEntry {
+  label: string;
+  /** Markdown, rendered read-only. */
+  body: string;
+}
+
+/**
+ * Flattens a stored payload into labelled markdown blocks for the history
+ * modal. An editor deciding whether to roll back needs to read the wording of
+ * that version — a raw JSON dump technically shows it, but not in a form
+ * anyone can compare legal prose in.
+ */
+export function summarizeVersion(
+  slug: SupportDocSlug,
+  payload: SupportDocPayload,
+): PreviewEntry[] {
+  switch (slug) {
+    case "CONTACT": {
+      const contact = payload as PortalSupportContact;
+      return [
+        { label: "Email", body: contact.email },
+        { label: "Phone", body: contact.phone },
+        { label: "Head office", body: contact.office },
+        { label: "Support hours", body: contact.hours },
+      ];
+    }
+
+    case "HELP": {
+      const help = payload as PortalHelpContent;
+      return [
+        { label: "Title", body: help.title },
+        { label: "Subtitle", body: help.subtitle },
+        // Pictures and videos live in the body, so they render in the preview
+        // alongside the text they belong to — nothing to summarise separately.
+        ...(help.sections ?? []).map((section) => ({
+          label: section.heading,
+          body: section.body,
+        })),
+      ];
+    }
+
+    case "FAQ": {
+      const faq = payload as PortalFaqContent;
+      return [
+        { label: "Title", body: faq.title },
+        ...faq.groups.flatMap((group) =>
+          group.items.map((item) => ({
+            label: `${group.title} — ${item.question}`,
+            body: item.answer,
+          })),
+        ),
+        ...(faq.footer
+          ? [{ label: faq.footer.heading, body: faq.footer.body }]
+          : []),
+      ];
+    }
+
+    case "PRIVACY":
+    case "TERMS": {
+      const legal = payload as PortalLegalContent;
+      return [
+        { label: "Last updated", body: legal.lastUpdated },
+        ...legal.sections.map((section) => ({
+          label: section.heading,
+          body: section.body,
+        })),
+      ];
+    }
+  }
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/portal_content/video-poster.ts b/apps/edr-freight-web/backoffice/src/pages/portal_content/video-poster.ts
new file mode 100644
index 000000000..646292744
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/pages/portal_content/video-poster.ts
@@ -0,0 +1,84 @@
+/**
+ * A grey card with a play triangle, used when a real frame cannot be grabbed
+ * (the object store did not send CORS headers, the codec will not decode, or
+ * the seek timed out). Better than the broken-image icon the editor showed
+ * before, and it still says "this is a video".
+ */
+export const VIDEO_PLACEHOLDER =
+  "data:image/svg+xml;charset=utf-8," +
+  encodeURIComponent(
+    `<svg xmlns="http://www.w3.org/2000/svg" width="640" height="360">
+       <rect width="640" height="360" fill="#1f2933"/>
+       <circle cx="320" cy="180" r="46" fill="#ffffff" fill-opacity="0.9"/>
+       <path d="M305 156 l40 24 -40 24 z" fill="#1f2933"/>
+       <text x="320" y="272" font-family="sans-serif" font-size="20"
+             fill="#ffffff" fill-opacity="0.75" text-anchor="middle">Video</text>
+     </svg>`,
+  );
+
+/** Give up rather than hang the editor on a file that will not decode. */
+const POSTER_TIMEOUT_MS = 8000;
+
+/**
+ * Grabs a single frame from a video URL and returns it as a data URL, so the
+ * editor can show a real thumbnail for an embedded video.
+ *
+ * Done in the browser at preview time on purpose: the alternative is
+ * generating posters server-side on upload, which means ffmpeg, a second
+ * stored object per video and a naming convention to tie them together — all
+ * to produce a picture only editors ever look at. Seeking with
+ * `preload="metadata"` makes the browser range-request just the bytes it needs
+ * rather than the whole file.
+ *
+ * `crossOrigin` is required or the canvas is tainted and `toDataURL` throws;
+ * if the object store does not allow it we fall back to the placeholder.
+ */
+export function videoPosterDataUrl(url: string): Promise<string> {
+  return new Promise((resolve) => {
+    const video = document.createElement("video");
+    let settled = false;
+
+    const finish = (result: string) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      video.removeAttribute("src");
+      video.load();
+      resolve(result);
+    };
+
+    const timer = setTimeout(() => finish(VIDEO_PLACEHOLDER), POSTER_TIMEOUT_MS);
+
+    video.crossOrigin = "anonymous";
+    video.preload = "metadata";
+    video.muted = true;
+    video.playsInline = true;
+
+    video.onloadedmetadata = () => {
+      // A frame just past the start: the very first frame of a screen
+      // recording is usually an empty desktop.
+      video.currentTime = Math.min(1, (video.duration || 2) / 2);
+    };
+
+    video.onseeked = () => {
+      try {
+        const canvas = document.createElement("canvas");
+        canvas.width = video.videoWidth;
+        canvas.height = video.videoHeight;
+        if (!canvas.width || !canvas.height) return finish(VIDEO_PLACEHOLDER);
+
+        const context = canvas.getContext("2d");
+        if (!context) return finish(VIDEO_PLACEHOLDER);
+
+        context.drawImage(video, 0, 0, canvas.width, canvas.height);
+        finish(canvas.toDataURL("image/jpeg", 0.7));
+      } catch {
+        // Tainted canvas — the object store did not send CORS headers.
+        finish(VIDEO_PLACEHOLDER);
+      }
+    };
+
+    video.onerror = () => finish(VIDEO_PLACEHOLDER);
+    video.src = url;
+  });
+}
diff --git a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/CargoTypesPage.tsx b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/CargoTypesPage.tsx
index 57c239885..2b5839a42 100644
--- a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/CargoTypesPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/CargoTypesPage.tsx
@@ -30,6 +30,7 @@ import {
 } from "lucide-react";
 
 import { useAuth } from "@/auth/useAuth";
+import { resolveLandingPath } from "@/lib/landing";
 import { canAccessRuleEngineResource } from "@/lib/permissions";
 import RuleEngineFormDialog from "@/components/ruleEngine/RuleEngineFormDialog";
 import {
@@ -54,6 +55,8 @@ interface CargoNode extends RuleEngineRecord {
   requiresDirectorApproval?: boolean;
   /** When true, bookings of this cargo type incur the flat LASHING surcharge. */
   hasLashing?: boolean;
+  /** Staff may write bulk contract templates for this cargo type (parent XOR children). */
+  hasContractTemplate?: boolean;
   /** How this cargo is measured (PER_TON / PER_ITEM); null for groups/unset. */
   unitOfMeasure?: string | null;
   /** Wagon types that can carry this bulk cargo during scheduling; empty if unset. */
@@ -111,6 +114,10 @@ const FORM_FIELDS: FormFieldDef[] = [
   // When on, every booking of this cargo type is charged the flat LASHING
   // surcharge (a rate with trigger = Lashing).
   { name: "hasLashing", label: "Charge lashing fee", type: "boolean" },
+  // Lets staff write bulk contract templates for this cargo type. The API
+  // rejects the save when the parent group (or a child) already has it on —
+  // the template must live on exactly one level.
+  { name: "hasContractTemplate", label: "Has contract template", type: "boolean" },
   { name: "isActive", label: "Active", type: "boolean" },
 ];
 
@@ -239,8 +246,8 @@ const CargoTypesPage = () => {
     [levelNodes, term],
   );
 
-  if (!config) return <Navigate to="/dashboard/overview" replace />;
-  if (!canView) return <Navigate to="/dashboard/overview" replace />;
+  if (!config) return <Navigate to={resolveLandingPath(user)} replace />;
+  if (!canView) return <Navigate to={resolveLandingPath(user)} replace />;
   // A bad/stale :id (after data loads) → fall back to the root list.
   if (!isLoading && currentId && !current) return <Navigate to={BASE_PATH} replace />;
 
@@ -575,6 +582,13 @@ function CargoRow({
                   </Badge>
                 </Tooltip>
               ) : null}
+              {node.hasContractTemplate ? (
+                <Tooltip label="Bulk contract templates are written for this cargo type" withArrow>
+                  <Badge size="xs" variant="light" color="grape" radius="sm">
+                    Contract
+                  </Badge>
+                </Tooltip>
+              ) : null}
               {node.unitOfMeasure ? (
                 <Tooltip label="How bookings measure this cargo" withArrow>
                   <Badge size="xs" variant="light" color="teal" radius="sm">
diff --git a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx
index 3a0a36ce4..3751d17a6 100644
--- a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx
@@ -1,4 +1,5 @@
 import { useAuth } from "@/auth/useAuth";
+import { resolveLandingPath } from "@/lib/landing";
 import {
     canAccessRuleEngineResource,
     canApproveRuleEngineChange,
@@ -306,34 +307,27 @@ const RuleEngineResourcePage = () => {
 
   const formFields = useMemo(() => {
     if (!config) return [];
-    // Last-mile container bands: creating uses the multi-row tier list (one
-    // rate per tier); editing an existing band row keeps the single
-    // From/To/value fields (a rate row IS one band).
+    // Last-mile bands (both modes): creating uses the multi-row tier list (one
+    // rate per tier, each tier carrying its own rate value); editing an
+    // existing band row keeps the single From/To/value fields (a rate row IS
+    // one band).
     const bandFields = config.formFields.filter((field) => {
       if (config.slug !== "rates") return true;
       if (field.type === "tierList") return !editing;
       if (editing) return true;
-      return field.name !== "minKm" && field.name !== "maxKm";
-    });
-    return bandFields.map((field) => {
-      // On create, the tier rows carry the per-band rate values — the single
-      // last-mile "Rate value" field then only applies to bulk mode.
+      // On create the tier rows carry From/To/value — drop the single fields,
+      // including the last-mile "Rate value" (the non-last-mile one keeps its
+      // own showIf).
       if (
-        config.slug === "rates" &&
-        !editing &&
         field.name === "rateValue" &&
         field.showWhen?.field === "appliesTo" &&
         field.showWhen.equals.includes("LAST_MILE")
       ) {
-        return {
-          ...field,
-          showWhen: undefined,
-          showIf: (values: Record<string, unknown>) =>
-            values.appliesTo === "LAST_MILE" && values.lastMileMode === "BULK",
-        };
+        return false;
       }
-      return field;
-    }).map((field) => {
+      return field.name !== "minKm" && field.name !== "maxKm";
+    });
+    return bandFields.map((field) => {
       if (isPriorityRules && field.name === "minWagonCount") {
         return {
           ...field,
@@ -501,7 +495,7 @@ const RuleEngineResourcePage = () => {
       header: col.header,
       meta: { headerClassName, cellClassName },
       cell: ({ row }) => {
-        const cell = formatCell(row.original[col.accessorKey], col.format);
+        const cell = formatCell(row.original[col.accessorKey], col.format, row.original);
         // On the rate column, show the proposed value under the live one — the
         // live value stays the headline because it is what still gets charged.
         if (!isRates || col.accessorKey !== "rateValue") return cell;
@@ -549,10 +543,14 @@ const RuleEngineResourcePage = () => {
               config={config}
               layout="row"
               readOnly={!canUpdateControls}
-              onEdit={(record) => {
-                setEditing(record);
-                setFormOpen(true);
-              }}
+              onEdit={
+                config.slug === "container-types"
+                  ? undefined
+                  : (record) => {
+                      setEditing(record);
+                      setFormOpen(true);
+                    }
+              }
               onDelete={setDeleteTarget}
               onViewChain={
                 config.slug === "approval-rules"
@@ -591,7 +589,7 @@ const RuleEngineResourcePage = () => {
   }
 
   if (!canView) {
-    return <Navigate to="/dashboard/overview" replace />;
+    return <Navigate to={resolveLandingPath(user)} replace />;
   }
 
   const openCreate = () => {
@@ -621,19 +619,15 @@ const RuleEngineResourcePage = () => {
         currency: isLastMile ? (values.currency ?? "ETB") : "USD",
         trigger: isSurcharge ? values.trigger : "ALWAYS",
         ...(isLastMile
-          ? lastMileMode === "BULK"
-            ? {
-                rateUnit: "PER_TON_KM",
-                containerTypeId: undefined,
-                minKm: undefined,
-                maxKm: undefined,
-              }
-            : {
-                rateUnit: "PER_KM",
-                // Empty "To km" means an open-ended band — send null so an
-                // edit can clear a previously-set ceiling.
-                maxKm: values.maxKm ?? null,
-              }
+          ? {
+              // Empty "To km" means an open-ended band — send null so an
+              // edit can clear a previously-set ceiling. On create the tier
+              // spread below overrides the band fields per tier.
+              maxKm: values.maxKm ?? null,
+              ...(lastMileMode === "BULK"
+                ? { rateUnit: "PER_TON_KM", containerTypeId: undefined }
+                : { rateUnit: "PER_KM" }),
+            }
           : {}),
       };
       // Editing a LIVE rate files a change request — the rate keeps charging
@@ -891,7 +885,9 @@ const RuleEngineResourcePage = () => {
               totalCount={totalCount}
               onPaginationChange={setPagination}
               readOnly={!canUpdate && !canDelete}
-              onEdit={canUpdate ? openEdit : undefined}
+              onEdit={
+                canUpdate && config.slug !== "container-types" ? openEdit : undefined
+              }
               onDelete={canDelete ? setDeleteTarget : undefined}
               onViewChain={
                 config.slug === "approval-rules"
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 a51b542c2..22e1046e8 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
@@ -39,6 +39,8 @@ export interface FormFieldDef {
   placeholder?: string;
   description?: string;
   disabled?: boolean;
+  /** Editable on create, locked when editing an existing record. */
+  disabledOnEdit?: boolean;
   /** Trailing unit label shown inside the input (e.g. "USD" on a rate value). */
   suffix?: string;
   /** Hide this field when another field currently equals one of these values. */
@@ -70,6 +72,8 @@ export interface FormFieldDef {
    * relation list (`wagonTypeIds` read from `record.wagonTypes`).
    */
   getInitialValue?: (record: Record<string, unknown>) => unknown;
+  /** Pre-selected value on create (no record yet) — e.g. last-mile currency = ETB. */
+  defaultValue?: string;
   /**
    * Fully derived field: its value is computed from the live form values on
    * every render and the input is locked. Used for the priority-rule min
@@ -297,8 +301,8 @@ export const rateUnitOptions = (
 };
 
 const CURRENCIES = [
+  { label: "ETB (Birr)", value: "ETB" },
   { label: "USD", value: "USD" },
-  { label: "ETB", value: "ETB" },
 ];
 
 const PRIORITY_CONFIG_TYPES = [
@@ -387,7 +391,7 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
     ],
     formFields: [
       { name: "label", label: "Label", type: "text", required: true },
-      { name: "sizeFt", label: "Size (ft)", type: "number", required: true },
+      { name: "sizeFt", label: "Size (ft)", type: "number", required: true, disabledOnEdit: true },
       // Options injected at render from useWagonTypeOptions (RuleEngineResourcePage).
       {
         name: "wagonTypeIds",
@@ -1001,7 +1005,8 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         placeholder: "0",
         description: "Band start (inclusive). Use 0 for the first band.",
         showIf: (v) =>
-          v.appliesTo === "LAST_MILE" && v.lastMileMode === "CONTAINER",
+          v.appliesTo === "LAST_MILE" &&
+          (v.lastMileMode === "CONTAINER" || v.lastMileMode === "BULK"),
       },
       {
         name: "maxKm",
@@ -1011,7 +1016,8 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         placeholder: "Leave empty for no upper limit",
         description: "Band end (exclusive) — a 0–30 band covers up to but not including 30 km.",
         showIf: (v) =>
-          v.appliesTo === "LAST_MILE" && v.lastMileMode === "CONTAINER",
+          v.appliesTo === "LAST_MILE" &&
+          (v.lastMileMode === "CONTAINER" || v.lastMileMode === "BULK"),
       },
       {
         name: "currency",
@@ -1020,6 +1026,8 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         required: true,
         options: CURRENCIES,
         showWhen: { field: "appliesTo", equals: ["LAST_MILE"] },
+        // Birr is the norm for domestic trucking; USD stays selectable.
+        defaultValue: "ETB",
         getInitialValue: (record) => String(record.currency ?? "ETB"),
       },
       // ── Distance tiers (create only — the page swaps this for the single
@@ -1031,9 +1039,10 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         type: "tierList",
         required: true,
         description:
-          "One rate per distance range. To km is exclusive (0–30 then 30+); leave the last tier's To km empty for no upper limit.",
+          "One rate per distance range — the rate value is per km (container mode) or per ton per km (bulk mode). To km is exclusive (0–30 then 30+); leave the last tier's To km empty for no upper limit.",
         showIf: (v) =>
-          v.appliesTo === "LAST_MILE" && v.lastMileMode === "CONTAINER",
+          v.appliesTo === "LAST_MILE" &&
+          (v.lastMileMode === "CONTAINER" || v.lastMileMode === "BULK"),
       },
       // ── Container type — Container freight, container-kind intercity, and
       // the empty-container return surcharge (20ft vs 40ft price differently) ─
diff --git a/apps/edr-freight-web/backoffice/src/pages/support/SupportInboxPage.tsx b/apps/edr-freight-web/backoffice/src/pages/support/SupportInboxPage.tsx
index 6b2b5df2e..e3fc0cee2 100644
--- a/apps/edr-freight-web/backoffice/src/pages/support/SupportInboxPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/support/SupportInboxPage.tsx
@@ -51,6 +51,8 @@ import {
 } from "@/features/support/useSupport";
 import { useSupportSocket } from "@/features/support/useSupportSocket";
 import { customersService } from "@/services/customers.service";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 
 type ReadFilter = "ALL" | "UNREAD";
 
@@ -401,6 +403,8 @@ function ConversationThread({
     fetchNextPage,
   } = useMessages(conversation.id);
   const send = useSendMessage(conversation.id);
+  const { user: agentUser } = useAuth();
+  const canSend = hasPermission(agentUser, FREIGHT_PERMS.support.agentSend);
   const markRead = useMarkConversationRead();
   const [draft, setDraft] = useState("");
   const [dragging, setDragging] = useState(false);
@@ -656,7 +660,7 @@ function ConversationThread({
             color="edr-green"
             variant="filled"
             loading={send.isPending}
-            disabled={!draft.trim() && attach.attachments.length === 0}
+            disabled={!canSend || (!draft.trim() && attach.attachments.length === 0)}
             onClick={submit}
           >
             <Send size={18} />
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx
index 63f45617e..5291e26f1 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx
@@ -85,9 +85,7 @@ export default function TrainBuilderDetailPage() {
   const { user } = useAuth();
   const canUpdate = canFleetAction(user, "trains", "update");
   const canDelete = canFleetAction(user, "trains", "delete");
-  const canAssign =
-    hasPermission(user, FREIGHT_PERMS.trains.assignWagons) ||
-    hasPermission(user, FREIGHT_PERMS.fleet.manage);
+  const canAssign = hasPermission(user, FREIGHT_PERMS.trains.assignWagons);
 
   const compositionQuery = useQuery(
     api.trainBuilder.composition.queryOptions({ input: { id }, enabled: Boolean(id) }),
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx
index ce6fe5353..9b32d19b6 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx
@@ -42,6 +42,8 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Link, useParams } from "react-router-dom";
 
 import { KpiStrip, PageContainer } from "@/components/page";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import {
   autoFillPlacements,
   mergePlacementsWithSaved,
@@ -102,6 +104,7 @@ const parseError = (error: unknown, fallback: string) => {
 };
 
 export default function TrainScheduleV2DetailPage() {
+  const { user: authUser } = useAuth();
   const { scheduleId } = useParams<{ scheduleId: string }>();
   const { toast } = useToast();
   const [activeStep, setActiveStep] = useState(0);
@@ -394,7 +397,9 @@ export default function TrainScheduleV2DetailPage() {
         : [];
 
   const canEditBookings = ["DRAFT", "SCHEDULED"].includes(schedule.status);
-  const canDispatch = schedule.status === "SCHEDULED";
+  const canDispatch =
+    schedule.status === "SCHEDULED" &&
+    hasPermission(authUser, FREIGHT_PERMS.trainScheduling.dispatch);
 
   // Dispatch readiness: bookings with no wagon, and wagon-loaded bookings whose
   // cargo staff never marked loaded. Both are warnings, not blockers — staff can
@@ -916,10 +921,10 @@ export default function TrainScheduleV2DetailPage() {
                   <Title order={2} fw={700} style={{ color: "#0f172a" }}>
                     {schedule.route?.name ?? "Train schedule"}
                   </Title>
-                  {schedule.trainNumber ? (
-                    <Badge variant="light" color="#F2A516" radius="sm" style={{ fontWeight: 600 }}>
-                      {schedule.trainNumber}
-                    </Badge>
+                  {schedule.train?.trainName ? (
+                    <Text fw={700} style={{ color: "#0f172a" }}>
+                      {schedule.train.trainName}
+                    </Text>
                   ) : null}
                   {schedule.train ? (
                     <Text size="xs" c="dimmed" ff="monospace">
@@ -927,6 +932,51 @@ export default function TrainScheduleV2DetailPage() {
                     </Text>
                   ) : null}
                 </Group>
+
+                {/* Voyage (train) number and trade direction — the two things
+                    operations identify a run by, so they read at a glance
+                    rather than as small badges among the rest. */}
+                <Group gap="lg" align="center" wrap="wrap">
+                  {schedule.trainNumber ? (
+                    <Box>
+                      <Text size="xs" c="dimmed" fw={600} tt="uppercase" lh={1.2}>
+                        Voyage No.
+                      </Text>
+                      <Text
+                        ff="monospace"
+                        fw={800}
+                        lh={1.1}
+                        style={{ fontSize: 32, color: "#0f172a" }}
+                      >
+                        {schedule.trainNumber}
+                      </Text>
+                    </Box>
+                  ) : null}
+                  {schedule.direction ? (
+                    <Box>
+                      <Text size="xs" c="dimmed" fw={600} tt="uppercase" lh={1.2}>
+                        Direction
+                      </Text>
+                      <Text
+                        fw={800}
+                        lh={1.1}
+                        tt="uppercase"
+                        style={{
+                          fontSize: 32,
+                          letterSpacing: 0.5,
+                          color:
+                            schedule.direction === "IMPORT"
+                              ? "#2E5B96"
+                              : schedule.direction === "EXPORT"
+                                ? "#0A6F4D"
+                                : "#0f172a",
+                        }}
+                      >
+                        {schedule.direction}
+                      </Text>
+                    </Box>
+                  ) : null}
+                </Group>
                 {(schedule.stops?.length ?? 0) >= 3 ||
                 (schedule.bookings ?? []).some(
                   (b) => b.tradeDirection === "DOMESTIC",
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2ListPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2ListPage.tsx
index 3c2244f68..c132c2534 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2ListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2ListPage.tsx
@@ -63,7 +63,7 @@ import { api } from "@/services/api";
 import { formatRouteLabel } from "@/services/routes.service";
 import { useToast } from "@/hooks/use-toast";
 import { useAuth } from "@/auth/useAuth";
-import { canCreateSchedule, canUpdateSchedule } from "@/lib/permissions";
+import { FREIGHT_PERMS, canCreateSchedule, hasPermission } from "@/lib/permissions";
 import type {
   CreateScheduleWindowRulePayload,
   FreightType,
@@ -111,7 +111,7 @@ export default function TrainScheduleV2ListPage() {
   const { toast } = useToast();
   const { user } = useAuth();
   const canCreate = canCreateSchedule(user);
-  const canUpdate = canUpdateSchedule(user);
+  const canDispatch = hasPermission(user, FREIGHT_PERMS.trainScheduling.dispatch);
   const { viewMode, setViewMode } = useFleetViewMode("train-scheduling-v2");
   const { pagination, setPagination } = usePagination({ pageSize: 10 });
   const [search, setSearch] = useState("");
@@ -491,7 +491,7 @@ export default function TrainScheduleV2ListPage() {
                   {/* Start the run. Same transition as the detail page's
                       Dispatch button — that page also shows unassigned-wagon
                       and not-loaded warnings, so it stays the fuller surface. */}
-                  {canUpdate && schedule.status === "SCHEDULED" ? (
+                  {canDispatch && schedule.status === "SCHEDULED" ? (
                     <Menu.Item
                       leftSection={<Play size={15} />}
                       onClick={() => setDispatchTarget(schedule)}
diff --git a/apps/edr-freight-web/backoffice/src/pages/wagons/WagonTransfersPage.tsx b/apps/edr-freight-web/backoffice/src/pages/wagons/WagonTransfersPage.tsx
index 58eb5a3cd..95705e964 100644
--- a/apps/edr-freight-web/backoffice/src/pages/wagons/WagonTransfersPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/wagons/WagonTransfersPage.tsx
@@ -18,7 +18,6 @@ import {
   History,
   Inbox,
   PackageCheck,
-  Plus,
   RefreshCw,
   Search,
   Send,
@@ -311,19 +310,6 @@ export default function WagonTransfersPage() {
               >
                 Refresh
               </Button>
-              {canRequest ? (
-                <Button
-                  color="edr-green"
-                  radius="md"
-                  leftSection={<Plus size={15} />}
-                  onClick={() => {
-                    setCarryOver(null);
-                    setFormOpen(true);
-                  }}
-                >
-                  New request
-                </Button>
-              ) : null}
             </Group>
           }
         />
diff --git a/apps/edr-freight-web/backoffice/src/pages/warehouses/EDRLastMileReturnsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/warehouses/EDRLastMileReturnsPage.tsx
deleted file mode 100644
index 4c38841f8..000000000
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/EDRLastMileReturnsPage.tsx
+++ /dev/null
@@ -1,406 +0,0 @@
-import { Fragment, useMemo, useState } from "react";
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import {
-  ActionIcon,
-  Alert,
-  Badge,
-  Button,
-  Group,
-  Loader,
-  Modal,
-  Stack,
-  Table,
-  Text,
-  TextInput,
-  Textarea,
-  Select,
-  Checkbox,
-} from "@mantine/core";
-import { ChevronDown, ChevronRight } from "lucide-react";
-
-import { PageContainer, PageHeader } from "@/components/page";
-import RuleEngineListFooter from "@/components/ruleEngine/RuleEngineListFooter";
-import { useListControls } from "@/hooks/useListControls";
-import { useToast } from "@/hooks/use-toast";
-import { api } from "@/services/api";
-import { warehouseService } from "@/services/warehouse.service";
-import { importOperationsService } from "@/services/importOperations.service";
-
-interface ReturnContainer {
-  containerNumber: string;
-  size: string | null;
-  type: string | null;
-  selected: boolean;
-}
-
-interface TruckReturn {
-  key: string;
-  plate: string;
-  companyName: string | null;
-  bookingRef: string;
-  bookingId: string;
-  customerId: string | null;
-  containers: ReturnContainer[];
-}
-
-
-export default function EDRLastMileReturnsPage() {
-  const { toast } = useToast();
-  const qc = useQueryClient();
-  const [expanded, setExpanded] = useState<string | null>(null);
-  const [returnModalOpen, setReturnModalOpen] = useState(false);
-  const [activeKey, setActiveKey] = useState<string | null>(null);
-
-  const { data: unloadedQueue = [], isLoading: queueLoading } = useQuery({
-    queryKey: ["import-unloaded-queue"],
-    queryFn: async () => {
-      const response = await api.warehouses.importUnloadedQueue.call();
-      return response ?? [];
-    },
-  });
-
-  const bookingIds = unloadedQueue.map((item) => item.bookingId).filter(Boolean) as string[];
-  const truckReturnsQuery = useQuery({
-    queryKey: ["edr-last-mile-returns", bookingIds],
-    queryFn: async () => {
-      const grouped = new Map<string, TruckReturn>();
-
-      for (const item of unloadedQueue) {
-        if (!item.bookingId) continue;
-
-        const edrTrucks = await warehouseService.getLastMileTrucks(item.bookingId).catch(() => []);
-        for (const truck of edrTrucks) {
-          const inventory = await api.warehouses.listInventory.call({ filter: { bookingId: item.bookingId } }).catch(() => []);
-
-          const returnContainers = inventory
-            .filter((inv: any) => inv.isReturn)
-            .map((inv: any) => ({
-              containerNumber: inv.containerNumber || "—",
-              size: inv.containerSize || null,
-              type: inv.containerType || null,
-              selected: false,
-            }));
-
-          if (returnContainers.length > 0) {
-            const key = `${item.bookingId}-${truck.vehicleId}`;
-            grouped.set(key, {
-              key,
-              plate: [truck.truckPlateNumber, truck.trailerPlateNumber].filter(Boolean).join(" + ") || "—",
-              companyName: item.customerName ?? null,
-              bookingRef: item.bookingReference ?? item.bookingId,
-              bookingId: item.bookingId,
-              customerId: item.customerId || null,
-              containers: returnContainers,
-            });
-          }
-        }
-      }
-
-      return Array.from(grouped.values());
-    },
-    enabled: bookingIds.length > 0 && !queueLoading,
-  });
-
-  const trucksWithReturns = useMemo(() => truckReturnsQuery.data ?? [], [truckReturnsQuery.data]);
-  const controls = useListControls(trucksWithReturns, {
-    searchKeys: ["plate", "companyName", "bookingRef"],
-  });
-
-  const createReturnsMutation = useMutation({
-    mutationFn: async (payload: { trucks: Array<{ bookingId: string; customerId: string | null; containers: Array<{ containerNumber: string; returnDate: string; facility: string; yard?: string; zone?: string; condition?: string; handoverNote?: string }> }> }) => {
-      const results = [];
-      for (const truck of payload.trucks) {
-        for (const container of truck.containers) {
-          const result = await importOperationsService.createEmptyReturn({
-            containerNumber: container.containerNumber,
-            returnDate: new Date(container.returnDate).toISOString(),
-            bookingId: truck.bookingId,
-            customerId: truck.customerId ?? undefined,
-            facility: container.facility,
-            yard: container.yard,
-            zone: container.zone,
-            condition: container.condition,
-            handoverNote: container.handoverNote,
-          });
-          results.push(result);
-        }
-      }
-      return results;
-    },
-    onSuccess: () => {
-      toast({ title: "Empty container returns recorded" });
-      qc.invalidateQueries({ queryKey: ["edr-last-mile-returns", bookingIds] });
-      setReturnModalOpen(false);
-      setActiveKey(null);
-    },
-    onError: (error: any) => {
-      toast({
-        variant: "destructive",
-        title: "Failed to record returns",
-        description: error?.response?.data?.message || error?.message,
-      });
-    },
-  });
-
-  const activeTruck = activeKey ? trucksWithReturns.find(t => t.key === activeKey) ?? null : null;
-
-  if (queueLoading || truckReturnsQuery.isLoading) {
-    return (
-      <PageContainer>
-        <Group justify="center" py="lg">
-          <Loader size="sm" />
-        </Group>
-      </PageContainer>
-    );
-  }
-
-  return (
-    <PageContainer>
-      <PageHeader
-        title="EDR Last Mile Returns"
-        subtitle="Empty containers returned by EDR-haulage trucks — single or bulk processing"
-      />
-
-      {trucksWithReturns.length === 0 ? (
-        <Alert color="gray">No EDR trucks with return containers found.</Alert>
-      ) : (
-        <>
-          <Table.ScrollContainer minWidth={1000}>
-            <Table highlightOnHover verticalSpacing="xs">
-              <Table.Thead>
-                <Table.Tr>
-                  <Table.Th w={40} />
-                  <Table.Th>Plate</Table.Th>
-                  <Table.Th>Company</Table.Th>
-                  <Table.Th>Booking Ref</Table.Th>
-                  <Table.Th>Return Containers</Table.Th>
-                  <Table.Th ta="right">Actions</Table.Th>
-                </Table.Tr>
-              </Table.Thead>
-              <Table.Tbody>
-                {controls.pagedRows.map((truck) => {
-                  const isOpen = expanded === truck.key;
-                  return (
-                    <Fragment key={truck.key}>
-                      <Table.Tr>
-                        <Table.Td>
-                          <ActionIcon
-                            variant="subtle"
-                            color="gray"
-                            onClick={() => setExpanded(isOpen ? null : truck.key)}
-                          >
-                            {isOpen ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
-                          </ActionIcon>
-                        </Table.Td>
-                        <Table.Td>
-                          <Text fw={600}>{truck.plate}</Text>
-                        </Table.Td>
-                        <Table.Td>{truck.companyName ?? "—"}</Table.Td>
-                        <Table.Td>{truck.bookingRef}</Table.Td>
-                        <Table.Td>
-                          <Badge>{truck.containers.length} container{truck.containers.length !== 1 ? "s" : ""}</Badge>
-                        </Table.Td>
-                        <Table.Td ta="right">
-                          <Button
-                            size="xs"
-                            variant="light"
-                            onClick={() => {
-                              setActiveKey(truck.key);
-                              setReturnModalOpen(true);
-                            }}
-                          >
-                            Process Returns
-                          </Button>
-                        </Table.Td>
-                      </Table.Tr>
-                      {isOpen && (
-                        <Table.Tr>
-                          <Table.Td colSpan={6}>
-                            <Table striped>
-                              <Table.Thead>
-                                <Table.Tr>
-                                  <Table.Th w={40}>
-                                    <Checkbox disabled />
-                                  </Table.Th>
-                                  <Table.Th>Container</Table.Th>
-                                  <Table.Th>Size</Table.Th>
-                                  <Table.Th>Type</Table.Th>
-                                </Table.Tr>
-                              </Table.Thead>
-                              <Table.Tbody>
-                                {truck.containers.map((container, idx) => (
-                                  <Table.Tr key={idx}>
-                                    <Table.Td>
-                                      <Checkbox checked={container.selected} />
-                                    </Table.Td>
-                                    <Table.Td>{container.containerNumber}</Table.Td>
-                                    <Table.Td>{container.size ?? "—"}</Table.Td>
-                                    <Table.Td>{container.type ?? "—"}</Table.Td>
-                                  </Table.Tr>
-                                ))}
-                              </Table.Tbody>
-                            </Table>
-                          </Table.Td>
-                        </Table.Tr>
-                      )}
-                    </Fragment>
-                  );
-                })}
-              </Table.Tbody>
-            </Table>
-          </Table.ScrollContainer>
-          <RuleEngineListFooter
-            pagination={controls.pagination}
-            pageCount={controls.pageCount}
-            totalCount={controls.totalCount}
-            itemLabel="trucks"
-            onPaginationChange={controls.setPagination}
-          />
-        </>
-      )}
-
-      <EmptyContainerReturnModal
-        opened={returnModalOpen}
-        onClose={() => setReturnModalOpen(false)}
-        truck={activeTruck}
-        onSubmit={(payload) => createReturnsMutation.mutate(payload)}
-        loading={createReturnsMutation.isPending}
-      />
-    </PageContainer>
-  );
-}
-
-interface EmptyContainerReturnModalProps {
-  opened: boolean;
-  onClose: () => void;
-  truck: TruckReturn | null;
-  onSubmit: (payload: any) => void;
-  loading: boolean;
-}
-
-function EmptyContainerReturnModal({ opened, onClose, truck, onSubmit, loading }: EmptyContainerReturnModalProps) {
-  const [selectedContainers, setSelectedContainers] = useState<string[]>([]);
-  const [returnDate, setReturnDate] = useState<string>(new Date().toISOString().split("T")[0]);
-  const [warehouse, setWarehouse] = useState<string | null>(null);
-  const [condition, setCondition] = useState<string>("");
-  const [handoverNote, setHandoverNote] = useState<string>("");
-
-  const { data: warehousesResponse } = useQuery({
-    queryKey: ["warehouses-list"],
-    queryFn: async () => {
-      return await warehouseService.list({});
-    },
-  });
-
-  const warehouses = (warehousesResponse as any)?.data ?? warehousesResponse ?? [];
-  const warehouseOptions = Array.isArray(warehouses) ? warehouses.map((wh: any) => ({
-    value: wh.id,
-    label: `${wh.name} ${wh.code ? `(${wh.code})` : ""}`,
-  })) : [];
-
-  const selectedWarehouse = warehouse && Array.isArray(warehouses) ? warehouses.find((wh: any) => wh.id === warehouse) : null;
-
-  const handleSubmit = () => {
-    if (!truck || !selectedContainers.length || !warehouse) return;
-
-    const containers = truck.containers
-      .filter((c) => selectedContainers.includes(c.containerNumber))
-      .map((c) => ({
-        containerNumber: c.containerNumber,
-        returnDate,
-        facility: selectedWarehouse?.name || warehouse,
-        yard: selectedWarehouse?.code || undefined,
-        zone: undefined,
-        condition: condition || undefined,
-        handoverNote: handoverNote || undefined,
-      }));
-
-    onSubmit({
-      trucks: [{
-        bookingId: truck.bookingId,
-        customerId: truck.customerId,
-        containers,
-      }],
-    });
-  };
-
-  return (
-    <Modal opened={opened} onClose={onClose} title="Process Empty Container Returns" size="lg">
-      {truck && (
-        <Stack gap="md">
-          <Group>
-            <Text fw={600}>{truck.plate}</Text>
-            <Text size="sm" c="dimmed">{truck.bookingRef}</Text>
-          </Group>
-
-          <div>
-            <Text size="sm" fw={600} mb="xs">Select containers to return:</Text>
-            <Stack gap="xs">
-              {truck.containers.map((container) => (
-                <Checkbox
-                  key={container.containerNumber}
-                  label={`${container.containerNumber} (${container.size || "bulk"})`}
-                  checked={selectedContainers.includes(container.containerNumber)}
-                  onChange={(e) => {
-                    if (e.currentTarget.checked) {
-                      setSelectedContainers([...selectedContainers, container.containerNumber]);
-                    } else {
-                      setSelectedContainers(selectedContainers.filter(c => c !== container.containerNumber));
-                    }
-                  }}
-                />
-              ))}
-            </Stack>
-          </div>
-
-          <Select
-            label="Return Warehouse"
-            placeholder="Select warehouse for container return"
-            value={warehouse}
-            onChange={setWarehouse}
-            data={warehouseOptions}
-            required
-            searchable
-          />
-
-          <TextInput
-            label="Return Date"
-            type="date"
-            value={returnDate}
-            onChange={(e) => setReturnDate(e.currentTarget.value)}
-            required
-          />
-
-          <Textarea
-            label="Condition"
-            placeholder="Damage, residue, or cleanliness notes"
-            value={condition}
-            onChange={(e) => setCondition(e.currentTarget.value)}
-            rows={3}
-          />
-
-          <Textarea
-            label="Handover Note"
-            placeholder="Consignee, trucker, or authorization notes"
-            value={handoverNote}
-            onChange={(e) => setHandoverNote(e.currentTarget.value)}
-            rows={3}
-          />
-
-          <Group justify="flex-end" gap="sm">
-            <Button variant="default" onClick={onClose} disabled={loading}>
-              Cancel
-            </Button>
-            <Button
-              onClick={handleSubmit}
-              disabled={!selectedContainers.length || !warehouse}
-              loading={loading}
-            >
-              {selectedContainers.length > 1 ? "Bulk" : "Single"} Return ({selectedContainers.length})
-            </Button>
-          </Group>
-        </Stack>
-      )}
-    </Modal>
-  );
-}
diff --git a/apps/edr-freight-web/backoffice/src/pages/warehouses/WarehouseInvoicesPage.tsx b/apps/edr-freight-web/backoffice/src/pages/warehouses/WarehouseInvoicesPage.tsx
index c8e3d111d..dc4ae4f86 100644
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/WarehouseInvoicesPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/WarehouseInvoicesPage.tsx
@@ -38,6 +38,8 @@ import {
 import { openPdfBlob } from '@/components/warehouses/pdf';
 import { buildWarehouseExitPaperPdf } from '@/components/warehouses/warehousePdf';
 import { extractErrorMessage } from '@/components/warehouses/options';
+import { useAuth } from '@/auth/useAuth';
+import { FREIGHT_PERMS, hasPermission } from '@/lib/permissions';
 
 const STATUS_COLOR: Record<WarehouseInvoiceStatus, string> = {
   DRAFT: 'gray',
@@ -171,6 +173,9 @@ export default function WarehouseInvoicesPage() {
 }
 
 function InvoiceDetailModal({ id, onClose }: { id: string | null; onClose: () => void }) {
+  const { user } = useAuth();
+  const mayRecordPayment = hasPermission(user, FREIGHT_PERMS.warehouseFeeInvoices.pay);
+  const canCancelInvoice = hasPermission(user, FREIGHT_PERMS.warehouseFeeInvoices.cancel);
   const { toast } = useToast();
   const navigate = useNavigate();
   const { data: inv, isLoading } = useQuery(
@@ -430,9 +435,11 @@ function InvoiceDetailModal({ id, onClose }: { id: string | null; onClose: () =>
                   placeholder="Optional"
                   style={{ flex: 1 }}
                 />
-                <Button leftSection={<CreditCard size={16} />} loading={payOnline.isPending} onClick={handleOnlinePay}>
-                  Pay with {gatewayMethod === 'WAAFI' ? 'Waafi' : 'Telebirr'}
-                </Button>
+                {mayRecordPayment && (
+                  <Button leftSection={<CreditCard size={16} />} loading={payOnline.isPending} onClick={handleOnlinePay}>
+                    Pay with {gatewayMethod === 'WAAFI' ? 'Waafi' : 'Telebirr'}
+                  </Button>
+                )}
               </Group>
 
               <Divider label="Record manual payment" labelPosition="left" />
@@ -456,9 +463,11 @@ function InvoiceDetailModal({ id, onClose }: { id: string | null; onClose: () =>
                   onChange={(e) => setDriverPhone(e.currentTarget.value)}
                   style={{ flex: 1 }}
                 />
-                <Button leftSection={<CreditCard size={16} />} loading={pay.isPending} onClick={handlePay}>
-                  Pay
-                </Button>
+                {mayRecordPayment && (
+                  <Button leftSection={<CreditCard size={16} />} loading={pay.isPending} onClick={handlePay}>
+                    Pay
+                  </Button>
+                )}
               </Group>
             </>
           )}
@@ -506,7 +515,7 @@ function InvoiceDetailModal({ id, onClose }: { id: string | null; onClose: () =>
                 Gate clearance & exit paper
               </Button>
             )}
-            {inv.status !== 'PAID' && inv.status !== 'CANCELLED' && (
+            {inv.status !== 'PAID' && inv.status !== 'CANCELLED' && canCancelInvoice && (
               <Button variant="light" color="red" leftSection={<Ban size={16} />} loading={cancel.isPending} onClick={handleCancel}>
                 Cancel invoice
               </Button>
diff --git a/apps/edr-freight-web/backoffice/src/record-management/common/RichTextEditor.tsx b/apps/edr-freight-web/backoffice/src/record-management/common/RichTextEditor.tsx
index 5d48b25e4..19cd96f0a 100644
--- a/apps/edr-freight-web/backoffice/src/record-management/common/RichTextEditor.tsx
+++ b/apps/edr-freight-web/backoffice/src/record-management/common/RichTextEditor.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import { Editor } from "@tinymce/tinymce-react";
 import type { Editor as TinyMCEEditor } from "tinymce";
 
@@ -34,16 +34,10 @@ export default function RichTextEditor({
   shouldClear?: boolean;
 }) {
   const editorRef = useRef<TinyMCEEditor | null>(null);
-  const [isDarkMode, setIsDarkMode] = useState(() => {
-    if (typeof window === "undefined") {
-      return false;
-    }
-
-    const root = document.documentElement;
-    return (
-      root.classList.contains("dark") || root.getAttribute("data-theme") === "dark"
-    );
-  });
+  // The app is light-only — nothing sets `dark` / data-theme on <html>, so this
+  // is a constant rather than observed state. Kept as a named flag so the
+  // TinyMCE skin/content-style branches below stay readable.
+  const isDarkMode = false;
 
   // ✅ When shouldClear becomes true → clear editor + remove draft
   useEffect(() => {
@@ -54,28 +48,6 @@ export default function RichTextEditor({
     }
   }, [shouldClear]);
 
-  useEffect(() => {
-    const root = document.documentElement;
-    const updateThemeMode = () => {
-      setIsDarkMode(
-        root.classList.contains("dark") ||
-          root.getAttribute("data-theme") === "dark",
-      );
-    };
-
-    updateThemeMode();
-
-    const observer = new MutationObserver(updateThemeMode);
-    observer.observe(root, {
-      attributes: true,
-      attributeFilter: ["class", "data-theme"],
-    });
-
-    return () => {
-      observer.disconnect();
-    };
-  }, []);
-
   const init = useMemo(
     () => ({
       // Point self-hosted TinyMCE at the static assets copied into /public/tinymce.
diff --git a/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx b/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx
index 82e716d66..ff7678856 100644
--- a/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx
+++ b/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx
@@ -21,8 +21,6 @@ import {
   Key,
   LogOut,
   LucideIcon,
-  Moon,
-  Sun,
   User,
   UserPen,
   UsersRound,
@@ -37,7 +35,6 @@ import UserApprovalDropdown from "../PendingUsersList";
 import { usePendingUsers } from "@/user-management/userManagement/hooks/usePendingUsersHook";
 import { useUserDetail } from "../hooks/useUserDetail";
 import { MeDto } from "@/shared/dto/user/meDto";
-import { useDarkMode } from "@/shared/hooks/useDarkMode";
 import {
   UI_LANGUAGE_OPTIONS,
   getUiLanguageLabel,
@@ -133,7 +130,6 @@ const Top: React.FC<HeaderProps> = ({
     logout();
   };
 
-  const { isDarkMode, toggleDarkMode } = useDarkMode();
   const { pendingUsers } = usePendingUsers({ take: 5, skip: 0 });
   const pendingUsersCount = pendingUsers?.count || 0;
 
@@ -359,21 +355,6 @@ const Top: React.FC<HeaderProps> = ({
         </div>
 
         <div className="flex max-w-[56vw] flex-shrink-0 items-center space-x-1.5 sm:max-w-none sm:space-x-2.5">
-          <Button
-            variant="ghost"
-            size="icon"
-            className="h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-10"
-            aria-label={isDarkMode ? "Light mode" : "Dark mode"}
-            onClick={toggleDarkMode}
-            title={isDarkMode ? "Switch to light mode" : "Switch to dark mode"}
-          >
-            {isDarkMode ? (
-              <Sun className="h-4 w-4 text-yellow-500" />
-            ) : (
-              <Moon className="h-4 w-4 text-gray-700 dark:text-gray-300" />
-            )}
-          </Button>
-
           {canActivateUsers && (
             <div className="relative">
               <Button
diff --git a/apps/edr-freight-web/backoffice/src/routes/RootRedirect.tsx b/apps/edr-freight-web/backoffice/src/routes/RootRedirect.tsx
index 77ad29531..48f3ce6aa 100644
--- a/apps/edr-freight-web/backoffice/src/routes/RootRedirect.tsx
+++ b/apps/edr-freight-web/backoffice/src/routes/RootRedirect.tsx
@@ -2,19 +2,15 @@ import type { ReactElement } from "react";
 import { Navigate } from "react-router-dom";
 
 import { useAuth } from "@/auth/useAuth";
+import { resolveLandingPath } from "@/lib/landing";
 
 /**
- * Root landing redirect for the vendored IAM pages. Sends super admins to the
- * user-management dashboard and everyone else to the freight overview. Minimal
- * replacement for the source app's @/routes/RootRedirect (not copied over).
+ * Root landing redirect for the vendored IAM pages. Delegates to the shared
+ * landing resolver so it cannot drift from the app's other redirect sinks.
  */
 export function RootRedirect(): ReactElement {
   const { user } = useAuth();
-  const roles = (user?.roles ?? []).map((r) => r.key).filter(Boolean);
-  if (roles.includes("super_admin")) {
-    return <Navigate to="/user-management/dashboard" replace />;
-  }
-  return <Navigate to="/dashboard/overview" replace />;
+  return <Navigate to={resolveLandingPath(user)} replace />;
 }
 
 export default RootRedirect;
diff --git a/apps/edr-freight-web/backoffice/src/services/api.ts b/apps/edr-freight-web/backoffice/src/services/api.ts
index 2aa864610..895a54070 100644
--- a/apps/edr-freight-web/backoffice/src/services/api.ts
+++ b/apps/edr-freight-web/backoffice/src/services/api.ts
@@ -41,6 +41,7 @@ import type {
   Invoice,
   InvoiceListFilter,
   PaginatedInvoices,
+  PaginatedOfflineUsdInvoices,
 } from "@/types/invoice";
 import type { IOverviewDashboard, OverviewRange } from "@/types/overview";
 import {
@@ -148,6 +149,8 @@ import {
 import { containerTypesService } from "./container-types.service";
 import { containerService, type Container } from "./containerService";
 import { customersService } from "./customers.service";
+import { eimsService } from "./eims.service";
+import type { EimsInvoiceStatusView, EimsVerifyResult } from "@/types/eims";
 import { invoicesService } from "./invoices.service";
 import { dropdownSettingsService } from "./dropdownSettings.service";
 import { fileUploadSettingsService } from "./fileUploadSettings.service";
@@ -216,6 +219,7 @@ import {
   type Wagon,
   type WagonListFilters,
   type WagonMovementRecord,
+  type WagonStatusLog,
   type WagonTransferRequest,
   type CreateTransferRequestPayload,
   type BulkFulfillResult,
@@ -1795,15 +1799,23 @@ export const api = {
     ),
 
     bulkSetStatus: endpoint<
-      { wagonIds: string[]; status: Wagon["status"] },
+      { wagonIds: string[]; status: Wagon["status"]; note?: string },
       { updated: number }
     >(
       "wagons",
       "bulkSetStatus",
-      ({ wagonIds, status }) =>
-        wagonService.bulkSetStatus(wagonIds, status).then((r) => r.data),
+      ({ wagonIds, status, note }) =>
+        wagonService.bulkSetStatus(wagonIds, status, note).then((r) => r.data),
       undefined,
-      () => [["wagons"]],
+      // The fleet desk lists wagons under the "fleet" key root, not "wagons".
+      () => [["wagons"], QUERY_KEYS.FLEET.list("wagons")],
+    ),
+
+    statusHistory: endpoint<{ id: string }, WagonStatusLog[]>(
+      "wagons",
+      "statusHistory",
+      ({ id }) => wagonService.getStatusHistory(id).then((r) => r.data),
+      ({ id }) => ["wagons", "status-history", id],
     ),
   },
 
@@ -2905,6 +2917,59 @@ export const api = {
       ({ id }) => invoicesService.getById(id),
       ({ id }) => QUERY_KEYS.INVOICES.byId(id),
     ),
+
+    listOfflineUsd: endpoint<
+      { filter: InvoiceListFilter },
+      PaginatedOfflineUsdInvoices
+    >(
+      "invoices",
+      "listOfflineUsd",
+      ({ filter }) => invoicesService.listOfflineUsd(filter),
+      ({ filter }) => QUERY_KEYS.INVOICES.offlineUsd(filter),
+    ),
+
+    confirmOffline: endpoint<
+      { id: string; file: File; reference?: string },
+      Invoice
+    >(
+      "invoices",
+      "confirmOffline",
+      ({ id, file, reference }) =>
+        invoicesService.confirmOffline(id, file, reference),
+      undefined,
+      // Settling the invoice also advances the booking, so refresh both trees.
+      () => [QUERY_KEYS.INVOICES.ROOT, QUERY_KEYS.BOOKINGS.ROOT],
+    ),
+
+    eimsStatus: endpoint<{ id: string }, EimsInvoiceStatusView>(
+      "invoices",
+      "eimsStatus",
+      ({ id }) => eimsService.status(id),
+      ({ id }) => QUERY_KEYS.INVOICES.eimsStatus(id),
+    ),
+
+    // Both mutations refresh the filing panel; register also moves the invoice's own row.
+    eimsRegister: endpoint<{ id: string }, EimsInvoiceStatusView>(
+      "invoices",
+      "eimsRegister",
+      ({ id }) => eimsService.register(id),
+      undefined,
+      ({ id }) => [QUERY_KEYS.INVOICES.eimsStatus(id), QUERY_KEYS.INVOICES.byId(id)],
+    ),
+
+    eimsVerify: endpoint<{ id: string }, EimsVerifyResult>(
+      "invoices",
+      "eimsVerify",
+      ({ id }) => eimsService.verify(id),
+    ),
+
+    eimsResolve: endpoint<{ id: string; irn?: string; discard?: boolean }, EimsInvoiceStatusView>(
+      "invoices",
+      "eimsResolve",
+      ({ id, irn, discard }) => eimsService.resolve(id, { irn, discard }),
+      undefined,
+      ({ id }) => [QUERY_KEYS.INVOICES.eimsStatus(id), QUERY_KEYS.INVOICES.byId(id)],
+    ),
   },
 
   overview: {
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 946a921b7..c1ce4e67d 100644
--- a/apps/edr-freight-web/backoffice/src/services/bookings.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/bookings.service.ts
@@ -458,6 +458,13 @@ export const bookingsService = {
     return (unwrap(response.data) ?? []) as BookingDetail[];
   },
 
+  setExportHandoverMode: async (
+    id: string,
+    exportHandoverMode: "DIRECT_TO_TRAIN" | "WAREHOUSE",
+  ): Promise<void> => {
+    await client.patch(B.EXPORT_HANDOVER_MODE(id), { exportHandoverMode });
+  },
+
   downloadCarriageAcceptanceSheet: async (id: string): Promise<Blob> => {
     const response = await client.get(B.CARRIAGE_ACCEPTANCE_SHEET(id), {
       responseType: "blob",
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
index 267ee113a..7952395b5 100644
--- a/apps/edr-freight-web/backoffice/src/services/contract-templates.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/contract-templates.service.ts
@@ -11,29 +11,33 @@ export interface ContractTemplateArticle {
 
 export interface ContractTemplate {
   id: string;
-  // Import/export split by customs clearing; intercity is domestic, crosses no
-  // border, and so has a single template.
-  code:
-    | "IMPORT_BULK_CUSTOMS"
-    | "IMPORT_BULK_NO_CUSTOMS"
-    | "EXPORT_BULK_CUSTOMS"
-    | "EXPORT_BULK_NO_CUSTOMS"
-    | "INTERCITY_BULK"
-    | "IMPORT_CONTAINER_CUSTOMS"
-    | "IMPORT_CONTAINER_NO_CUSTOMS"
-    | "EXPORT_CONTAINER_CUSTOMS"
-    | "EXPORT_CONTAINER_NO_CUSTOMS"
-    | "INTERCITY_CONTAINER";
+  // System container templates use the fixed DIRECTION_CONTAINER(_CUSTOMS)
+  // codes; staff-created bulk templates get generated BULK_<cargo>_* codes.
+  code: string;
   name: string;
   description?: string | null;
   documentTitle: string;
   whereasClauses: string[];
   articles: ContractTemplateArticle[];
   isActive: boolean;
+  /** Bulk templates only: the cargo type this template is written for. */
+  cargoTypeId?: string | null;
+  cargoType?: { id: string; cargoTypeName: string } | null;
+  /** Bulk templates only: whether this is the with-customs-clearing variant. */
+  withCustoms?: boolean | null;
+  /** The five seeded container templates — cannot be deleted. */
+  isSystem: boolean;
   createdAt: string;
   updatedAt: string;
 }
 
+export interface CreateContractTemplatePayload {
+  cargoTypeId: string;
+  withCustoms: boolean;
+  name?: string;
+  description?: string;
+}
+
 export interface UpdateContractTemplatePayload {
   name?: string;
   description?: string;
@@ -54,6 +58,15 @@ export const contractTemplatesService = {
     return data;
   },
 
+  async create(payload: CreateContractTemplatePayload): Promise<ContractTemplate> {
+    const { data } = await client.post<ContractTemplate>(BASE, payload);
+    return data;
+  },
+
+  async remove(code: string): Promise<void> {
+    await client.delete(`${BASE}/${code}`);
+  },
+
   async getByCode(code: string): Promise<ContractTemplate> {
     const { data } = await client.get<ContractTemplate>(`${BASE}/${code}`);
     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 c0a397d7f..37971cb96 100644
--- a/apps/edr-freight-web/backoffice/src/services/contracts.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/contracts.service.ts
@@ -673,8 +673,16 @@ export const contractsService = {
   validateShipment: (
     id: string,
     payload: Freight.CreateBookingUnderContractDto,
+    // Completion/resubmit preview: exclude this booking's own containers from
+    // the same-train clash check.
+    excludeBookingId?: string,
   ) =>
-    postContract<ShipmentValidation>(C.VALIDATE_SHIPMENT(id), payload),
+    postContract<ShipmentValidation>(
+      excludeBookingId
+        ? `${C.VALIDATE_SHIPMENT(id)}?bookingId=${excludeBookingId}`
+        : C.VALIDATE_SHIPMENT(id),
+      payload,
+    ),
 
   /** Remaining bookable quantity per cargo line (GENERAL draw-down cap). */
   getCapacity: async (id: string): Promise<Freight.ContractCapacityLine[]> => {
diff --git a/apps/edr-freight-web/backoffice/src/services/eims.service.ts b/apps/edr-freight-web/backoffice/src/services/eims.service.ts
new file mode 100644
index 000000000..6f99aaa3f
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/services/eims.service.ts
@@ -0,0 +1,39 @@
+import { api as apiClient } from "@/auth/http";
+import { URL_CONSTANTS } from "@/constants/URLS";
+import type { EimsInvoiceStatusView, EimsVerifyResult } from "@/types/eims";
+
+/**
+ * MoR EIMS filing actions on an invoice.
+ *
+ * Registration is irreversible at the tax authority, so these are admin actions rather than part
+ * of the ordinary invoice screen: the normal production path is the API's cron sweep.
+ */
+export const eimsService = {
+  status(invoiceId: string): Promise<EimsInvoiceStatusView> {
+    return apiClient
+      .get<EimsInvoiceStatusView>(URL_CONSTANTS.EIMS.STATUS(invoiceId))
+      .then((r) => r.data);
+  },
+
+  register(invoiceId: string): Promise<EimsInvoiceStatusView> {
+    return apiClient
+      .post<EimsInvoiceStatusView>(URL_CONSTANTS.EIMS.REGISTER(invoiceId))
+      .then((r) => r.data);
+  },
+
+  verify(invoiceId: string): Promise<EimsVerifyResult> {
+    return apiClient
+      .post<EimsVerifyResult>(URL_CONSTANTS.EIMS.VERIFY(invoiceId))
+      .then((r) => r.data);
+  },
+
+  /** Record an IRN confirmed with MoR, or discard the attempt. Clears the system-wide block. */
+  resolve(
+    invoiceId: string,
+    input: { irn?: string; discard?: boolean },
+  ): Promise<EimsInvoiceStatusView> {
+    return apiClient
+      .post<EimsInvoiceStatusView>(URL_CONSTANTS.EIMS.RESOLVE(invoiceId), input)
+      .then((r) => r.data);
+  },
+};
diff --git a/apps/edr-freight-web/backoffice/src/services/invoices.service.ts b/apps/edr-freight-web/backoffice/src/services/invoices.service.ts
index a4abc6ea2..18febdf7b 100644
--- a/apps/edr-freight-web/backoffice/src/services/invoices.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/invoices.service.ts
@@ -4,6 +4,7 @@ import type {
   Invoice,
   InvoiceListFilter,
   PaginatedInvoices,
+  PaginatedOfflineUsdInvoices,
 } from "@/types/invoice";
 
 const cleanParams = (params: object) =>
@@ -33,4 +34,25 @@ export const invoicesService = {
       responseType: "blob",
     });
   },
+
+  /** Finance worklist: USD invoices awaiting bank-transfer confirmation. */
+  listOfflineUsd(
+    filter: InvoiceListFilter,
+  ): Promise<PaginatedOfflineUsdInvoices> {
+    return apiClient
+      .get<PaginatedOfflineUsdInvoices>(URL_CONSTANTS.BILLING.OFFLINE_USD, {
+        params: cleanParams(filter),
+      })
+      .then((r) => r.data);
+  },
+
+  /** Confirm a USD invoice paid by bank transfer — the slip file is required. */
+  confirmOffline(id: string, file: File, reference?: string): Promise<Invoice> {
+    const body = new FormData();
+    body.append("file", file);
+    if (reference) body.append("reference", reference);
+    return apiClient
+      .post<Invoice>(URL_CONSTANTS.BILLING.CONFIRM_OFFLINE(id), body)
+      .then((r) => r.data);
+  },
 };
diff --git a/apps/edr-freight-web/backoffice/src/services/portal-content.service.ts b/apps/edr-freight-web/backoffice/src/services/portal-content.service.ts
new file mode 100644
index 000000000..a1bbb3260
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/services/portal-content.service.ts
@@ -0,0 +1,107 @@
+import type {
+  PortalMediaKind,
+  SupportDocPayload,
+  SupportDocSlug,
+  SupportDocumentDetail,
+  SupportDocVersionDetail,
+  SupportDocVersionSummary,
+} from "@edr/types";
+
+import { api as client } from "../auth/http";
+
+const ROOT = "/support-content";
+const BASE = `${ROOT}/documents`;
+
+/**
+ * Customer-facing help/FAQ/legal copy for the freight portal. The client's
+ * response interceptor already unwraps the `{ success, data }` envelope, so
+ * every method is a one-liner.
+ */
+export const portalContentService = {
+  async getBySlug(slug: SupportDocSlug): Promise<SupportDocumentDetail> {
+    const { data } = await client.get<SupportDocumentDetail>(`${BASE}/${slug}`);
+    return data;
+  },
+
+  /**
+   * Replaces the document's whole payload. Whole-payload rather than per-field
+   * on purpose: one Save becomes exactly one version, which is what keeps the
+   * history list readable.
+   */
+  async update(
+    slug: SupportDocSlug,
+    payload: SupportDocPayload,
+    note?: string,
+  ): Promise<SupportDocumentDetail> {
+    const { data } = await client.patch<SupportDocumentDetail>(
+      `${BASE}/${slug}`,
+      { payload, note },
+    );
+    return data;
+  },
+
+  async listVersions(slug: SupportDocSlug): Promise<SupportDocVersionSummary[]> {
+    const { data } = await client.get<SupportDocVersionSummary[]>(
+      `${BASE}/${slug}/versions`,
+    );
+    return data;
+  },
+
+  async getVersion(
+    slug: SupportDocSlug,
+    version: number,
+  ): Promise<SupportDocVersionDetail> {
+    const { data } = await client.get<SupportDocVersionDetail>(
+      `${BASE}/${slug}/versions/${version}`,
+    );
+    return data;
+  },
+
+  /**
+   * Uploads an image or video and returns its object *key*. The key is what
+   * gets saved in the document; `url` is only for showing the editor a preview
+   * right now, and expires.
+   */
+  async uploadMedia(
+    file: File,
+    onProgress?: (percent: number | null) => void,
+  ): Promise<{ key: string; kind: PortalMediaKind; url: string }> {
+    const form = new FormData();
+    form.append("file", file);
+
+    const { data } = await client.post<{
+      key: string;
+      kind: PortalMediaKind;
+      url: string;
+    }>(`${ROOT}/media`, form, {
+      // A video is big enough that a stalled connection would otherwise sit on
+      // a spinner forever with nothing to tell the author it had failed.
+      timeout: 2 * 60 * 1000,
+      onUploadProgress: (event) =>
+        onProgress?.(
+          event.total ? Math.round((event.loaded / event.total) * 100) : null,
+        ),
+    });
+    return data;
+  },
+
+  /** Resolves one stored key to a temporary URL, for editor previews. */
+  async mediaUrl(key: string): Promise<string> {
+    const { data } = await client.get<{ url: string }>(`${ROOT}/media-url`, {
+      params: { key },
+    });
+    return data.url;
+  },
+
+  /** Re-saves an old payload as a new version — never destructive. */
+  async restore(
+    slug: SupportDocSlug,
+    version: number,
+  ): Promise<SupportDocumentDetail> {
+    const { data } = await client.post<SupportDocumentDetail>(
+      `${BASE}/${slug}/versions/${version}/restore`,
+      {},
+    );
+    return 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 8d379ce44..858d26412 100644
--- a/apps/edr-freight-web/backoffice/src/services/wagon.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/wagon.service.ts
@@ -94,6 +94,17 @@ export interface WagonMovementRecord {
   wagon?: { id: string; wagonNumber?: string } | null;
 }
 
+/** One row of the wagon status audit trail. Returned newest first by the API. */
+export interface WagonStatusLog {
+  id: string;
+  wagonId: string;
+  fromStatus: Freight.WagonStatus;
+  toStatus: Freight.WagonStatus;
+  changedByUserId: string | null;
+  note: string | null;
+  createdAt: string;
+}
+
 export const wagonService = {
   /** One page ({items, meta}); 10 rows unless `pageSize` says otherwise. */
   getAll: (filters: WagonListFilters = {}) =>
@@ -128,9 +139,12 @@ export const wagonService = {
   /** Relocate many wagons to one yard in a single call (writes movement ledger). */
   bulkTransfer: (wagonIds: string[], toYardId: string) =>
     apiClient.post<{ moved: number }>('/wagons/bulk-transfer', { wagonIds, toYardId }),
-  /** Set the same status on many wagons in a single call. */
-  bulkSetStatus: (wagonIds: string[], status: Freight.WagonStatus) =>
-    apiClient.post<{ updated: number }>('/wagons/bulk-status', { wagonIds, status }),
+  /** Set the same status on many wagons in a single call (writes audit rows). */
+  bulkSetStatus: (wagonIds: string[], status: Freight.WagonStatus, note?: string) =>
+    apiClient.post<{ updated: number }>('/wagons/bulk-status', { wagonIds, status, note }),
+  /** Status audit trail for one wagon, newest first. */
+  getStatusHistory: (id: string) =>
+    apiClient.get<WagonStatusLog[]>(`/wagons/${id}/status-history`),
 };
 
 /**
diff --git a/apps/edr-freight-web/backoffice/src/shared/common/ui/sonner.tsx b/apps/edr-freight-web/backoffice/src/shared/common/ui/sonner.tsx
index beb81624d..22a2d4022 100644
--- a/apps/edr-freight-web/backoffice/src/shared/common/ui/sonner.tsx
+++ b/apps/edr-freight-web/backoffice/src/shared/common/ui/sonner.tsx
@@ -1,12 +1,13 @@
-import { useTheme } from "next-themes"
 import { Toaster as Sonner, ToasterProps } from "sonner"
 
+// Pinned to "light": the app is light-only. This previously read next-themes'
+// useTheme, which falls back to "system" when no ThemeProvider is mounted (and
+// none is) — sonner then resolves "system" against prefers-color-scheme and
+// rendered dark toasts over a light UI on any OS set to dark.
 const Toaster = ({ ...props }: ToasterProps) => {
-  const { theme = "system" } = useTheme()
-
   return (
     <Sonner
-      theme={theme as ToasterProps["theme"]}
+      theme="light"
       className="toaster group"
       toastOptions={{
         classNames: {
diff --git a/apps/edr-freight-web/backoffice/src/shared/components/login/Login.tsx b/apps/edr-freight-web/backoffice/src/shared/components/login/Login.tsx
index 459b669d1..46b1b9e56 100644
--- a/apps/edr-freight-web/backoffice/src/shared/components/login/Login.tsx
+++ b/apps/edr-freight-web/backoffice/src/shared/components/login/Login.tsx
@@ -13,8 +13,6 @@ import {
   Mail,
   Phone,
   User,
-  Moon,
-  Sun,
 } from "lucide-react";
 import { useAuthUser } from "@/shared/hooks/useAuthUser";
 import { useTenantConfig } from "@/layout/components/TenantConfig";
@@ -26,13 +24,11 @@ import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { useAuth } from "@/shared/context/AuthContext";
 import OTPModal from "./OTPModal";
-import { useDarkMode } from "@/shared/hooks/useDarkMode";
 import { getRememberMePreference } from "@/shared/utils/authPersistence";
 
 export const Login = () => {
   const { login: authLogin, isLoggingIn } = useAuthUser();
   const { config } = useTenantConfig();
-  const { isDarkMode, toggleDarkMode } = useDarkMode();
   const detectLoginMethod = (value: string): "email" | "phone" | "username" => {
     if (value.includes("@") && value.includes(".com")) return "email";
     if (/^\+?\d+$/.test(value)) return "phone";
@@ -121,19 +117,6 @@ export const Login = () => {
           </span>
         </Link>
 
-        {/* Dark Mode Toggle */}
-        <button
-          onClick={toggleDarkMode}
-          className="fixed top-4 right-4 md:top-6 md:right-6 z-50 p-2 rounded-full bg-white dark:bg-gray-800 shadow-md hover:shadow-lg transition-all duration-300 hover:scale-105 border border-gray-200 dark:border-gray-700"
-          title={isDarkMode ? "Switch to light mode" : "Switch to dark mode"}
-        >
-          {isDarkMode ? (
-            <Sun className="w-5 h-5 text-yellow-500" />
-          ) : (
-            <Moon className="w-5 h-5 text-gray-600 dark:text-gray-400" />
-          )}
-        </button>
-
         <div className="w-full max-w-6xl bg-white dark:bg-gray-800 rounded-2xl shadow-2xl overflow-hidden flex flex-col lg:flex-row">
           {/* Left Panel - Login Form */}
           <div className="lg:w-1/2 w-full p-6 sm:p-8 md:p-10 lg:p-12 xl:p-16 flex flex-col justify-center">
diff --git a/apps/edr-freight-web/backoffice/src/shared/hooks/useDarkMode.ts b/apps/edr-freight-web/backoffice/src/shared/hooks/useDarkMode.ts
deleted file mode 100644
index 273064cec..000000000
--- a/apps/edr-freight-web/backoffice/src/shared/hooks/useDarkMode.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useEffect, useState } from "react";
-
-// Same storage key/values as main.tsx and FreightDashboardLayout so the
-// vendored IAM UI toggle and the host dashboard toggle stay in sync.
-const THEME_STORAGE_KEY = "edr-theme";
-
-export const useDarkMode = () => {
-  const [isDarkMode, setIsDarkMode] = useState(() => {
-    // Initialize from localStorage or system preference
-    const savedTheme = localStorage.getItem(THEME_STORAGE_KEY);
-    if (savedTheme === "dark" || savedTheme === "light") {
-      return savedTheme === "dark";
-    }
-    return window.matchMedia("(prefers-color-scheme: dark)").matches;
-  });
-
-  useEffect(() => {
-    // Apply dark mode class on mount and when isDarkMode changes
-    if (isDarkMode) {
-      document.documentElement.classList.add("dark");
-      localStorage.setItem(THEME_STORAGE_KEY, "dark");
-    } else {
-      document.documentElement.classList.remove("dark");
-      localStorage.setItem(THEME_STORAGE_KEY, "light");
-    }
-  }, [isDarkMode]);
-
-  const toggleDarkMode = () => {
-    setIsDarkMode((prev) => !prev);
-  };
-
-  return { isDarkMode, toggleDarkMode };
-};
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/templates/components/TemplateEditor.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/templates/components/TemplateEditor.tsx
index b6de030b1..4b85ebdbd 100644
--- a/apps/edr-freight-web/backoffice/src/super-admin/components/templates/components/TemplateEditor.tsx
+++ b/apps/edr-freight-web/backoffice/src/super-admin/components/templates/components/TemplateEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState, useEffect } from "react";
+import React, { useMemo } from "react";
 import { Editor as TinyMCEEditor } from "@/record-management/common/editor/rte";
 import type { Editor as TinyMCEEditorType } from "tinymce";
 
@@ -21,18 +21,11 @@ export const TemplateEditor: React.FC<TemplateEditorProps> = ({
   placeholders,
 }) => {
   const hasPlaceholders = placeholders && placeholders.length > 0;
-  const [isDarkMode, setIsDarkMode] = useState(() => 
-    typeof window !== "undefined" && document.documentElement.classList.contains("dark")
-  );
-  
-  useEffect(() => {
-    const observer = new MutationObserver(() => {
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    });
-    observer.observe(document.documentElement, { attributes: true, attributeFilter: ["class"] });
-    return () => observer.disconnect();
-  }, []);
-  
+  // The app is light-only — nothing sets the `dark` class on <html>, so this is
+  // a constant rather than observed state. Kept as a named flag so the TinyMCE
+  // skin/content-style branches below stay readable.
+  const isDarkMode = false;
+
   const init = useMemo(() => {
     return {
       height: 600,
diff --git a/apps/edr-freight-web/backoffice/src/types/booking.ts b/apps/edr-freight-web/backoffice/src/types/booking.ts
index cf18abb27..69312e428 100644
--- a/apps/edr-freight-web/backoffice/src/types/booking.ts
+++ b/apps/edr-freight-web/backoffice/src/types/booking.ts
@@ -168,6 +168,11 @@ export interface BookingDetail {
   contractType: string;
   freightType: "CONTAINER" | "BULK";
   tradeDirection: string;
+  /**
+   * EXPORT only. DIRECT_TO_TRAIN = customer truck loads straight onto the wagon
+   * (no warehouse, no GRN). null/WAREHOUSE = received and GRN'd first.
+   */
+  exportHandoverMode?: "DIRECT_TO_TRAIN" | "WAREHOUSE" | null;
   /** What the containers carry / bulk commodity label — entered at booking time. */
   cargoFreeText?: string | null;
   cargoTotalWeightVgm: number;
diff --git a/apps/edr-freight-web/backoffice/src/types/customer.ts b/apps/edr-freight-web/backoffice/src/types/customer.ts
index ed77307f9..cd2d67842 100644
--- a/apps/edr-freight-web/backoffice/src/types/customer.ts
+++ b/apps/edr-freight-web/backoffice/src/types/customer.ts
@@ -21,6 +21,9 @@ export type CompanyStatus = "active" | "pending" | "suspended" | "blacklisted";
 /** Mirrors backend `CompanyKind` — commercial customer vs. government entity. */
 export type CompanyKind = "commercial" | "government";
 
+/** Mirrors backend `CompanyNationality`. */
+export type CompanyNationality = "ethiopian" | "foreign";
+
 /** Mirrors backend `ProfileType` (the role a company plays). */
 export type ProfileType =
   | "importer"
@@ -207,6 +210,7 @@ export interface Company {
   vatNumber?: string | null;
   fanNumber?: string | null;
   country: string;
+  nationality?: CompanyNationality | null;
   address?: string | null;
   phone?: string | null;
   email?: string | null;
diff --git a/apps/edr-freight-web/backoffice/src/types/eims.ts b/apps/edr-freight-web/backoffice/src/types/eims.ts
new file mode 100644
index 000000000..5b5a3e93d
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/types/eims.ts
@@ -0,0 +1,44 @@
+/**
+ * MoR EIMS filing state for one invoice.
+ *
+ * Mirrors `EimsInvoiceStatusView` in the freight API (`modules/eims/eims-registration.types.ts`).
+ * Kept local rather than in `@edr/types` because only the backoffice reads it.
+ */
+export type EimsInvoiceStatus =
+  | "NOT_SUBMITTED"
+  | "SUBMITTING"
+  | "REGISTERED"
+  | "FAILED"
+  | "UNKNOWN";
+
+/** Sanitized gateway failure: MoR's own error fields, never our signed envelope. */
+export interface EimsInvoiceError {
+  kind: string;
+  message: string;
+  httpStatus?: number;
+  details?: Record<string, unknown>;
+  at: string;
+}
+
+export interface EimsInvoiceStatusView {
+  invoiceId: string;
+  invoiceNumber: string;
+  eimsStatus: EimsInvoiceStatus;
+  eimsIrn: string | null;
+  eimsInvoiceCounter: number | null;
+  eimsSubmittedAt: string | null;
+  /** MoR returns a Java ZonedDateTime string, stored verbatim — display as-is. */
+  eimsAckDate: string | null;
+  eimsLastError: EimsInvoiceError | null;
+}
+
+/** `POST /v1/verify` response, echoed back from the gateway. */
+export interface EimsVerifyResult {
+  statusCode?: number;
+  message?: string;
+  body?: {
+    Irn?: string;
+    DocumentDetails?: { Type?: string; DocumentNumber?: string; Date?: string };
+    [section: string]: unknown;
+  };
+}
diff --git a/apps/edr-freight-web/backoffice/src/types/invoice.ts b/apps/edr-freight-web/backoffice/src/types/invoice.ts
index 26ecfcafa..14c99eb50 100644
--- a/apps/edr-freight-web/backoffice/src/types/invoice.ts
+++ b/apps/edr-freight-web/backoffice/src/types/invoice.ts
@@ -20,3 +20,22 @@ export interface PaginatedInvoices {
   items: Invoice[];
   total: number;
 }
+
+/**
+ * A USD invoice on Finance's offline-settlement worklist. Booking-sourced rows
+ * carry the shipment's pay-window deadline so the list can show the same
+ * countdown the customer sees — Finance must confirm before it closes.
+ */
+export interface OfflineUsdInvoice extends Invoice {
+  booking: {
+    id: string;
+    reference: string;
+    paymentDeadline: string | null;
+    paymentStatus: string;
+  } | null;
+}
+
+export interface PaginatedOfflineUsdInvoices {
+  items: OfflineUsdInvoice[];
+  total: number;
+}
diff --git a/apps/edr-freight-web/backoffice/src/types/warehouse.ts b/apps/edr-freight-web/backoffice/src/types/warehouse.ts
index 6b11d4dcd..aac7e532d 100644
--- a/apps/edr-freight-web/backoffice/src/types/warehouse.ts
+++ b/apps/edr-freight-web/backoffice/src/types/warehouse.ts
@@ -85,14 +85,15 @@ export function getNextInventoryAction(item: WarehouseInventoryItem): InventoryA
       if (isImport) return inspected ? 'ready-for-pickup' : null;
       return 'store';
     case 'STORED':
-      // Reserve is retired: a stored export item goes straight to loading prep
-      // once inspection passes. An import item parked back into storage returns
-      // to pickup — otherwise Store would strand it with no action.
+      // Reserve is retired: a stored export item goes straight to loading prep.
+      // 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;
+      return 'ready-for-loading';
     case 'RESERVED':
-      // Export loading is gated on a passed inspection.
-      return inspected ? 'ready-for-loading' : null;
+      // Export loading is not gated on inspection — inspection is tracked, but a
+      // train is never held waiting for it.
+      return 'ready-for-loading';
     case 'READY_FOR_PICKUP':
       // Issue the DO / release order first, then hand over the goods.
       return item.releaseDate ? 'deliver' : 'release';
diff --git a/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx b/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx
index ade96250d..37ab26be8 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx
@@ -40,8 +40,10 @@ export const AppLayout = () => {
           drives collapse on desktop and the Sheet drawer on mobile. */}
       <Sidebar collapsible="icon">
         <SidebarHeader className="gap-1 border-b border-sidebar-border">
+          {/* "/" resolves to the user's own landing page — an IAM-only admin
+              has no overview to go back to. */}
           <Link
-            to="/dashboard/overview"
+            to="/"
             className="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-muted-foreground transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
           >
             <ArrowLeft className="size-4 shrink-0" />
diff --git a/apps/edr-freight-web/backoffice/src/user-management/route.tsx b/apps/edr-freight-web/backoffice/src/user-management/route.tsx
index af29cdc5e..f1e2a8611 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/route.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/route.tsx
@@ -2,6 +2,7 @@ import type { ReactElement } from "react";
 import { Navigate, Outlet, Route } from "react-router-dom";
 
 import { useAuth } from "@/auth/useAuth";
+import { NO_ACCESS_PATH, resolveLandingPath } from "@/lib/landing";
 import { isSuperAdmin } from "@/lib/permissions";
 import { WithPermission } from "@/shared/hooks/useHas";
 import PendingExternalUsers from "@/super-admin/components/externalUsers/PendingExternalUsers";
@@ -85,7 +86,7 @@ function PrivateRoute({ allowedRoles }: { allowedRoles: string[] }): ReactElemen
     .filter((k): k is string => Boolean(k));
   const allowed =
     isSuperAdmin(user) || allowedRoles.some((r) => roleKeys.includes(r));
-  return allowed ? <Outlet /> : <Navigate to="/dashboard/overview" replace />;
+  return allowed ? <Outlet /> : <Navigate to={resolveLandingPath(user)} replace />;
 }
 
 export const UserManagementRedirect = () => {
@@ -100,7 +101,9 @@ export const UserManagementRedirect = () => {
     return <Navigate to="/user-management/user_management-dashboard" replace />;
   }
 
-  return <Navigate to="/" replace />; // fallback
+  // No IAM role: "/" resolves back here for anyone whose only sidebar entry is
+  // Staff, so bounce to the terminal page instead of ping-ponging.
+  return <Navigate to={NO_ACCESS_PATH} replace />;
 };
 
 /**
diff --git a/apps/edr-freight-web/portal/index.css b/apps/edr-freight-web/portal/index.css
index 856c46262..be4447f57 100644
--- a/apps/edr-freight-web/portal/index.css
+++ b/apps/edr-freight-web/portal/index.css
@@ -1,10 +1,13 @@
 @import "tailwindcss";
 @import "@edr/ui-common/theme.css" layer(theme);
 
-/* Dark mode is toggled via the `dark` class on <html>. Without this, Tailwind
-   v4 compiles `dark:` utilities to `@media (prefers-color-scheme: dark)` and
-   they follow the OS setting instead of the in-app toggle. */
-@custom-variant dark (&:where(.dark, .dark *));
+/* The portal is light-only — there is no theme toggle and nothing sets the
+   `dark` class. This override is load-bearing: without it Tailwind v4 compiles
+   `dark:` utilities to `@media (prefers-color-scheme: dark)`, so every
+   leftover `dark:` class in the tree would activate on an OS-level dark
+   setting. Binding the variant to a class that is never rendered keeps those
+   utilities inert no matter what the OS (or a stray `.dark` class) says. */
+@custom-variant dark (&:where(.edr-dark-disabled));
 
 /* Bridge the central Mantine theme into Tailwind. Mantine (createTheme) is the
    single source of truth; these just alias its generated CSS variables so
diff --git a/apps/edr-freight-web/portal/package.json b/apps/edr-freight-web/portal/package.json
index 4bb96ee4f..81800f447 100644
--- a/apps/edr-freight-web/portal/package.json
+++ b/apps/edr-freight-web/portal/package.json
@@ -33,6 +33,7 @@
     "react-dom": "19.2.6",
     "react-hook-form": "^7.76.0",
     "react-hot-toast": "^2.6.0",
+    "react-markdown": "^9.1.0",
     "react-phone-number-input": "^3.4.17",
     "react-router-dom": "^6.27.0",
     "recharts": "^3.8.1",
diff --git a/apps/edr-freight-web/portal/public/assets/cbe.png b/apps/edr-freight-web/portal/public/assets/cbe.png
new file mode 100644
index 000000000..c1da424f4
Binary files /dev/null and b/apps/edr-freight-web/portal/public/assets/cbe.png differ
diff --git a/apps/edr-freight-web/portal/public/assets/edr-portal-guide.webm b/apps/edr-freight-web/portal/public/assets/edr-portal-guide.webm
new file mode 100644
index 000000000..b28ffcdf5
Binary files /dev/null and b/apps/edr-freight-web/portal/public/assets/edr-portal-guide.webm differ
diff --git a/apps/edr-freight-web/portal/src/App.tsx b/apps/edr-freight-web/portal/src/App.tsx
index aefb94594..a8f616976 100644
--- a/apps/edr-freight-web/portal/src/App.tsx
+++ b/apps/edr-freight-web/portal/src/App.tsx
@@ -3,6 +3,7 @@ import { useDisclosure } from "@mantine/hooks";
 import {
   Home,
   Layers,
+  LifeBuoy,
   Loader2,
   // MapPin,
   Package,
@@ -58,6 +59,10 @@ import CheckPaymentPage from "./pages/payments/CheckPaymentPage";
 import PaymentFailurePage from "./pages/payments/PaymentFailurePage";
 import FaydaCallbackPage from "./pages/FaydaCallbackPage";
 import PaymentSuccessPage from "./pages/payments/PaymentSuccessPage";
+import FaqPage from "./pages/support/FaqPage";
+import HelpPage from "./pages/support/HelpPage";
+import PrivacyPolicyPage from "./pages/support/PrivacyPolicyPage";
+import TermsPage from "./pages/support/TermsPage";
 import TrackingPage from "./pages/tracking/TrackingPage";
 
 function FullScreenSpinner() {
@@ -217,6 +222,12 @@ const sidebarItems: SidebarItem[] = [
     href: "/settings",
     icon: <Settings size={18} />,
   },
+  {
+    section: "Account",
+    label: "Help & Support",
+    href: "/help",
+    icon: <LifeBuoy size={18} />,
+  },
 ];
 
 const App = () => {
@@ -273,6 +284,14 @@ const App = () => {
         <Route path="/payment/success" element={<PaymentSuccessPage />} />
         <Route path="/payment/failure" element={<PaymentFailurePage />} />
 
+        {/* Help and legal pages. Public on purpose: the auth screens link to
+          them before a session exists, so they carry their own chrome rather
+          than sitting inside the authenticated app layout. */}
+        <Route path="/help" element={<HelpPage />} />
+        <Route path="/faq" element={<FaqPage />} />
+        <Route path="/privacy" element={<PrivacyPolicyPage />} />
+        <Route path="/terms" element={<TermsPage />} />
+
         {/* Auth pages — inaccessible once logged in */}
         <Route element={<RedirectIfAuthed />}>
           <Route path="/login" element={<LoginPage />} />
@@ -298,7 +317,6 @@ const App = () => {
                   sidebarItems={sidebarItems}
                   activeHref={location.pathname}
                   onNavigate={navigate}
-                  enableThemeToggle
                   userName={displayName}
                   userEmail={userEmail}
                   companyProfiles={companyProfiles}
diff --git a/apps/edr-freight-web/portal/src/components/AppLayout.tsx b/apps/edr-freight-web/portal/src/components/AppLayout.tsx
index 6fce4ce82..126c1fe2c 100644
--- a/apps/edr-freight-web/portal/src/components/AppLayout.tsx
+++ b/apps/edr-freight-web/portal/src/components/AppLayout.tsx
@@ -15,8 +15,6 @@ import {
   Stack,
   Text,
   UnstyledButton,
-  useComputedColorScheme,
-  useMantineColorScheme,
   useMantineTheme,
 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
@@ -26,17 +24,15 @@ import {
   FileSignature,
   LogOut,
   Menu as MenuIcon,
-  Moon,
   Plus,
   RefreshCw,
   Search,
   Settings,
-  Sun,
   Upload,
   User,
   X,
 } from "lucide-react";
-import { type CSSProperties, Fragment, type ReactNode, useState } from "react";
+import { Fragment, type ReactNode, useState } from "react";
 import { PROFILE_TYPE_LABELS } from "@/constants/profileMode";
 import NotificationBellContainer from "@/features/notifications/NotificationBellContainer";
 import SupportWidget from "@/features/support/SupportWidget";
@@ -59,7 +55,6 @@ export interface AppLayoutProps {
    * to the new-booking wizard. Compatible with react-router's `navigate`.
    */
   onNavigate?: (href: string, options?: { state?: unknown }) => void;
-  enableThemeToggle?: boolean;
   userName?: string;
   userEmail?: string;
   /** Operational profiles for the company — surfaced as reference chips in the account menu. */
@@ -154,7 +149,6 @@ export function AppLayout({
   sidebarItems,
   activeHref = "",
   onNavigate,
-  enableThemeToggle = false,
   userName = "User",
   userEmail,
   companyProfiles = [],
@@ -165,9 +159,6 @@ export function AppLayout({
 }: AppLayoutProps) {
   const [mobileOpen, { toggle: toggleMobile }] = useDisclosure();
   const theme = useMantineTheme();
-  const { setColorScheme } = useMantineColorScheme();
-  const computedColorScheme = useComputedColorScheme("light");
-
   const borderColor = theme.colors["edr-border"][6];
   const mutedColor = theme.colors["edr-muted"][6];
   const textColor = theme.colors["edr-text"][6];
@@ -178,10 +169,6 @@ export function AppLayout({
   const navigate = (href: string, options?: { state?: unknown }) =>
     onNavigate?.(href, options);
 
-  const toggleTheme = () => {
-    setColorScheme(computedColorScheme === "dark" ? "light" : "dark");
-  };
-
   const initials = getInitials(userName);
   const activePage = getActivePage(sidebarItems, activePath);
 
@@ -279,20 +266,6 @@ export function AppLayout({
     activePath === item.href.toLowerCase() ||
     activePath.startsWith(item.href.toLowerCase() + "/");
 
-  // Shared header "island" styles — every control is a consistent 36px chip.
-  const islandStyle: CSSProperties = {
-    width: 36,
-    height: 36,
-    borderRadius: 999,
-    border: `1px solid ${borderColor}`,
-    backgroundColor: "#fff",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-    cursor: "pointer",
-  };
-
   return (
     <AppShell
       layout="alt"
@@ -457,20 +430,6 @@ export function AppLayout({
             {/* Notifications */}
             <NotificationBellContainer />
 
-            {enableThemeToggle && (
-              <UnstyledButton
-                onClick={toggleTheme}
-                style={islandStyle}
-                aria-label="Toggle theme"
-              >
-                {computedColorScheme === "dark" ? (
-                  <Sun size={17} color={textColor} strokeWidth={1.8} />
-                ) : (
-                  <Moon size={17} color={textColor} strokeWidth={1.8} />
-                )}
-              </UnstyledButton>
-            )}
-
             {/* Avatar pill */}
             <Menu
               width={220}
diff --git a/apps/edr-freight-web/portal/src/components/auth/AuthShell.tsx b/apps/edr-freight-web/portal/src/components/auth/AuthShell.tsx
index 439f41d19..801f60dd6 100644
--- a/apps/edr-freight-web/portal/src/components/auth/AuthShell.tsx
+++ b/apps/edr-freight-web/portal/src/components/auth/AuthShell.tsx
@@ -129,19 +129,19 @@ const FormFooter = () => (
     <span className="shrink-0">© 2026 EDR Freight</span>
     <div className="flex flex-wrap items-center justify-center gap-3 sm:justify-end sm:gap-6">
       <Link
-        to="#"
+        to="/terms"
         className="font-semibold text-gray-700 transition-colors hover:text-primary"
       >
         Terms &amp; Conditions
       </Link>
       <Link
-        to="#"
+        to="/privacy"
         className="font-semibold text-gray-700 transition-colors hover:text-primary"
       >
         Privacy Policy
       </Link>
       <Link
-        to="#"
+        to="/help"
         className="font-semibold text-gray-700 transition-colors hover:text-primary"
       >
         Help &amp; Support
diff --git a/apps/edr-freight-web/portal/src/components/onboarding/ETradeInfo.tsx b/apps/edr-freight-web/portal/src/components/onboarding/ETradeInfo.tsx
index e92b907e2..74e267a30 100644
--- a/apps/edr-freight-web/portal/src/components/onboarding/ETradeInfo.tsx
+++ b/apps/edr-freight-web/portal/src/components/onboarding/ETradeInfo.tsx
@@ -26,9 +26,22 @@ interface ETradeInfoProps {
   onStatusChange?: (status: ETradeStatus) => void;
   /** Called when the TIN changes away from the last fetched value — clear whatever it filled in. */
   onReset?: () => void;
+  /**
+   * This TIN already passed eTrade in an earlier session (the saved profile
+   * carries its registration details), so adopt it on arrival instead of
+   * re-querying. Rehydration lands the TIN after the first render, which used
+   * to look exactly like the customer typing a new one: every reopen fired a
+   * live lookup that could fail on an outage, and re-marked eTrade's fields as
+   * freshly verified so they were resubmitted on the next save. "Get Data"
+   * stays available for a deliberate re-verify.
+   */
+  alreadyVerified?: boolean;
 }
 
-const isValidTin = (tin: string) => tin.length === 10;
+// Digits, not just length: a 10-character non-numeric TIN used to fire a lookup
+// that could only fail, and the failure was then reported as "this TIN isn't
+// registered with eTrade" instead of "that isn't a TIN".
+const isValidTin = (tin: string) => /^\d{10}$/.test(tin);
 
 export default function ETradeInfo({
   tin,
@@ -37,6 +50,7 @@ export default function ETradeInfo({
   onDataLoaded,
   onStatusChange,
   onReset,
+  alreadyVerified,
 }: ETradeInfoProps) {
   const mutation = useETradeData();
   const isLoading = mutation.isPending;
@@ -63,6 +77,13 @@ export default function ETradeInfo({
   // doesn't refire the lookup the moment this mounts.
   const lastFetchedTin = useRef<string | null>(tin || null);
   useEffect(() => {
+    // A rehydrated TIN that eTrade already accepted: adopt it silently. Doing
+    // this before the change-detection below also keeps `onReset` from firing,
+    // which would wipe the very registration details that prove it passed.
+    if (alreadyVerified && lastFetchedTin.current === null && isValidTin(tin)) {
+      lastFetchedTin.current = tin;
+      return;
+    }
     if (tin !== lastFetchedTin.current) {
       // TIN moved away from whatever we last fetched — that result (verified
       // data, "taken", or an error) no longer describes this TIN. Drop it so
@@ -82,12 +103,17 @@ export default function ETradeInfo({
 
   const apiError =
     mutation.isError && mutation.error ? extractApiError(mutation.error) : null;
-  // A 400 here means eTrade simply has no record for this TIN.
-  const notFound = apiError?.statusCode === 400;
+  // A 400 here usually means eTrade has no record for this TIN — but the API
+  // also wraps its own transport failures as a 400 ("Failed to fetch company
+  // info from eTrade: …"), and reporting an outage as "this TIN isn't
+  // registered" sends the customer off to re-check a number that was fine.
+  const unreachable = /failed to fetch/i.test(apiError?.message ?? "");
+  const notFound = apiError?.statusCode === 400 && !unreachable;
   const errorMessage =
     apiError && !notFound
-      ? apiError.message ||
-      "We couldn't reach eTrade to fetch your company information. Please try again."
+      ? unreachable || !apiError.message
+        ? "We couldn't reach eTrade to fetch your company information. Please try again in a moment."
+        : apiError.message
       : null;
 
   const status: ETradeStatus = isLoading
diff --git a/apps/edr-freight-web/portal/src/constants/URLS.ts b/apps/edr-freight-web/portal/src/constants/URLS.ts
index 88b310e84..153ed5e8b 100644
--- a/apps/edr-freight-web/portal/src/constants/URLS.ts
+++ b/apps/edr-freight-web/portal/src/constants/URLS.ts
@@ -218,6 +218,11 @@ export const URL_CONSTANTS = {
     PAY_ONLINE: (id: string) => `/api/warehouse-fee-invoices/${id}/pay-online`,
   },
 
+  // Public — no session required; the sign-up screen links to these pages.
+  PORTAL_CONTENT: {
+    PUBLIC: "/api/support-content",
+  },
+
   LAST_MILE_REQUESTS: {
     BY_ID: (id: string) => `/last-mile-requests/${id}`,
     SUBMIT: (id: string) => `/last-mile-requests/${id}/submit`,
diff --git a/apps/edr-freight-web/portal/src/features/bookingWindows/useBookingWindowSocket.ts b/apps/edr-freight-web/portal/src/features/bookingWindows/useBookingWindowSocket.ts
index 6df836357..7c33f5849 100644
--- a/apps/edr-freight-web/portal/src/features/bookingWindows/useBookingWindowSocket.ts
+++ b/apps/edr-freight-web/portal/src/features/bookingWindows/useBookingWindowSocket.ts
@@ -47,6 +47,7 @@ function applyEvent(
     windowClosesAt: event.windowClosesAt,
     docReviewEndsAt: event.docReviewEndsAt,
     paymentPhaseEndsAt: event.paymentPhaseEndsAt,
+    paymentDrainEndsAt: event.paymentDrainEndsAt,
     departureDate: event.scheduledDepartureDate ?? row.departureDate,
   };
 }
diff --git a/apps/edr-freight-web/portal/src/hooks/usePortalContent.ts b/apps/edr-freight-web/portal/src/hooks/usePortalContent.ts
new file mode 100644
index 000000000..39d5d7a09
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/hooks/usePortalContent.ts
@@ -0,0 +1,39 @@
+import type { PortalContentBundle } from "@edr/types";
+import { useQuery } from "@tanstack/react-query";
+
+import { URL_CONSTANTS } from "@/constants/URLS";
+import {
+  FALLBACK_PORTAL_CONTENT,
+  withSupportVars,
+} from "@/pages/support/portal-content";
+import type { ApiResponse } from "@/types/apiResponse";
+import { client } from "@/utils/api";
+import { unwrap } from "@/utils/endpoint";
+
+/**
+ * The whole public help/FAQ/legal bundle in one request, shared by the four
+ * public pages (react-query dedupes it across the routes).
+ *
+ * The endpoint is unauthenticated and the shared axios client attaches a token
+ * only when the cookie exists, so this works for anonymous visitors as-is.
+ *
+ * `placeholderData` means `data` is never undefined: the pages render the
+ * shipped copy immediately and swap in the live copy when the fetch resolves.
+ * That is deliberate — it is what lets the four public pages skip loading and
+ * error states entirely. If the fallback is ever removed, those states are
+ * owed back.
+ */
+export function usePortalContent() {
+  return useQuery({
+    queryKey: ["portal-content"],
+    queryFn: async (): Promise<PortalContentBundle> => {
+      const response = await client.get<ApiResponse<PortalContentBundle>>(
+        URL_CONSTANTS.PORTAL_CONTENT.PUBLIC,
+      );
+      return unwrap(response.data);
+    },
+    placeholderData: FALLBACK_PORTAL_CONTENT,
+    select: withSupportVars,
+    staleTime: 5 * 60_000,
+  });
+}
diff --git a/apps/edr-freight-web/portal/src/main.tsx b/apps/edr-freight-web/portal/src/main.tsx
index 49fec0edf..b2f5896d9 100644
--- a/apps/edr-freight-web/portal/src/main.tsx
+++ b/apps/edr-freight-web/portal/src/main.tsx
@@ -48,7 +48,10 @@ if (!rootElement) {
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
     <PostHogProvider client={posthog}>
-      <MantineProvider theme={mantineTheme} defaultColorScheme="light">
+      {/* forceColorScheme (not defaultColorScheme) — the app is light-only.
+          `default` still lets Mantine flip to dark via useMantineColorScheme
+          or a persisted color-scheme value; `force` pins it. */}
+      <MantineProvider theme={mantineTheme} forceColorScheme="light">
         <QueryClientProvider client={queryClient}>
           <BrowserRouter>
             <PostHogErrorBoundary fallback={<AppErrorFallback />}>
diff --git a/apps/edr-freight-web/portal/src/pages/EDRFreightLandingPage.tsx b/apps/edr-freight-web/portal/src/pages/EDRFreightLandingPage.tsx
index 54bffc47b..b6f4787d6 100644
--- a/apps/edr-freight-web/portal/src/pages/EDRFreightLandingPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/EDRFreightLandingPage.tsx
@@ -584,7 +584,35 @@ export default function EDRFreightLandingPage() {
             </div>
           </div>
 
-          <div>© 2026 EDR Freight. All rights reserved.</div>
+          <div className="flex flex-col items-center gap-4 md:items-end">
+            <nav className="flex flex-wrap items-center justify-center gap-x-6 gap-y-2">
+              <Link
+                to="/help"
+                className="font-semibold text-foreground transition-colors hover:text-primary"
+              >
+                Help &amp; Support
+              </Link>
+              <Link
+                to="/faq"
+                className="font-semibold text-foreground transition-colors hover:text-primary"
+              >
+                FAQ
+              </Link>
+              <Link
+                to="/privacy"
+                className="font-semibold text-foreground transition-colors hover:text-primary"
+              >
+                Privacy Policy
+              </Link>
+              <Link
+                to="/terms"
+                className="font-semibold text-foreground transition-colors hover:text-primary"
+              >
+                Terms of Service
+              </Link>
+            </nav>
+            <div>© 2026 EDR Freight. All rights reserved.</div>
+          </div>
         </div>
       </footer>
     </div>
diff --git a/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts b/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts
index 962b59bcc..b33017976 100644
--- a/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts
+++ b/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts
@@ -1,5 +1,7 @@
 import type { Freight } from "@edr/types";
 
+import { isUsdOfflineBooking } from "@/pages/bookings/payments/offline-payment";
+
 /** A pending customer action surfaced on the home "needs attention" card. */
 export interface ActionItem {
   id: string;
@@ -13,6 +15,8 @@ export interface ActionItem {
   targetId: string;
   /** Highlighted as action-required in the home card. */
   urgent?: boolean;
+  /** USD booking: paid by bank transfer, no online payment modal. */
+  offlinePay?: boolean;
 }
 
 /**
@@ -60,13 +64,17 @@ export function deriveActionItems(
         ? b.status === "FULLY_EXECUTED"
         : b.status === "SELECTED_FOR_BATCH");
     if (canPay) {
+      const offlinePay = isUsdOfflineBooking(b);
       items.push({
         id: `pay-${b.id}`,
         kind: "pay",
         reference: b.reference,
-        description: "Payment due for this shipment",
+        description: offlinePay
+          ? "Payment due — pay by bank transfer and send the slip to Finance"
+          : "Payment due for this shipment",
         targetId: b.id,
         urgent: true,
+        offlinePay,
       });
     }
   }
diff --git a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx
index 4b16e132d..7e3be49c3 100644
--- a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx
+++ b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx
@@ -65,7 +65,10 @@ export function ActionNeededSection({ items: base }: ActionNeededSectionProps) {
   const handleClick = (item: ActionItem) => {
     switch (item.kind) {
       case "pay":
-        setPayItem(item);
+        // USD is paid by bank transfer — the booking page shows the countdown
+        // and the pay-by-bank instructions instead of the payment modal.
+        if (item.offlinePay) navigate(`/bookings/${item.targetId}`);
+        else setPayItem(item);
         break;
       case "sign":
         navigate(`/contracts/${item.targetId}/view`);
@@ -151,7 +154,9 @@ export function ActionNeededSection({ items: base }: ActionNeededSectionProps) {
                 leftSection={<FilePlus2 size={14} />}
               >
                 {item.kind === "pay"
-                  ? "Pay now"
+                  ? item.offlinePay
+                    ? "Pay by bank"
+                    : "Pay now"
                   : item.kind === "sign"
                     ? "Sign"
                     : "Book"}
diff --git a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/UpcomingWindowsSection.tsx b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/UpcomingWindowsSection.tsx
index 50e142708..c4bb03ed6 100644
--- a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/UpcomingWindowsSection.tsx
+++ b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/UpcomingWindowsSection.tsx
@@ -68,16 +68,29 @@ const COUNTDOWN_TEXT: Partial<
   PRE_WINDOW: { label: "Booking opens in", expiredText: "Booking opening now…" },
   OPEN: { label: "Window closes in", expiredText: "Document review starting…" },
   DOC_REVIEW: { label: "Document review ends in", expiredText: "Payment starting…" },
-  PAYMENT: { label: "Payment due in", expiredText: "Payment window closing…" },
+  PAYMENT: { label: "Payment due in", expiredText: "Finalizing payments…" },
 };
 
-function phaseCountdown(
-  w: MyBookingWindow,
-): { label: string; deadline: string; expiredText: string } | null {
+function phaseCountdown(w: MyBookingWindow): {
+  label: string;
+  deadline: string;
+  expiredText: string;
+  graceDeadline?: string | null;
+  graceLabel?: string;
+} | null {
   const state = bookingWindowUiState(w);
   const text = COUNTDOWN_TEXT[state.kind];
   if (!state.countdownTo || !text) return null;
-  return { ...text, deadline: state.countdownTo };
+  // Once the pay deadline lapses, pending payments still settle during the
+  // drain tail — count it down as "processing" instead of a stale "closing".
+  const grace =
+    state.kind === "PAYMENT" && w.paymentDrainEndsAt
+      ? {
+          graceDeadline: w.paymentDrainEndsAt,
+          graceLabel: "Payment processing — closes in",
+        }
+      : undefined;
+  return { ...text, deadline: state.countdownTo, ...grace };
 }
 
 function Pill({
@@ -336,6 +349,8 @@ export const UpcomingWindowsSection = memo(function UpcomingWindowsSection({
                         deadline={cd.deadline}
                         label={cd.label}
                         expiredText={cd.expiredText}
+                        graceDeadline={cd.graceDeadline}
+                        graceLabel={cd.graceLabel}
                         size="xs"
                       />
                     </Box>
diff --git a/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx b/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
index df3511d8f..8a2f1d12f 100644
--- a/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
@@ -70,14 +70,9 @@ function tabIncomplete(tabId: SettingsTab, profile: ProfileResponse): boolean {
       const identity = profile.identity;
       const identityIncomplete = identity
         ? (identity.faydaRequired && !identity.owner.verified) ||
-          (identity.passportRequired && !identity.owner.passportNumber)
+        (identity.passportRequired && !identity.owner.passportNumber)
         : false;
-      return (
-        !profile.companyEmail ||
-        !profile.companyPhone ||
-        !profile.companyAddress ||
-        identityIncomplete
-      );
+      return !profile.companyAddress || identityIncomplete;
     }
     case "contact":
       return !profile.contactPersonName || !profile.contactPersonPhone;
@@ -399,7 +394,11 @@ export default function SettingsPage() {
               itself, not the panel. */}
           <Tabs.Panel value="company">
             <Fieldset disabled={locked} variant="unstyled" p={0}>
-              <TabCompanyProfile mode="edit" profile={profile} user={user ?? undefined} />
+              <TabCompanyProfile
+                mode="edit"
+                profile={profile}
+                user={user ?? undefined}
+              />
             </Fieldset>
             <OperationalServicesCard profile={profile} />
           </Tabs.Panel>
@@ -476,110 +475,110 @@ function OperationalServicesCard({ profile }: { profile: ProfileResponse }) {
   return (
     <>
       <Card padding="lg" radius="lg" mt="lg">
-      <Group gap="sm" mb="md">
-        <Layers size={20} />
-        <Title order={3}>Operational Services</Title>
-      </Group>
-      <Stack gap="sm">
-        {roles.map((r) => {
-          const status = ROLE_STATUS[r.status] ?? {
-            color: "gray",
-            label: r.status,
-          };
-          return (
-            <Group
-              key={r.id}
-              justify="space-between"
-              align="flex-start"
-              wrap="nowrap"
-              py="xs"
-              style={{
-                borderTop: "1px solid var(--mantine-color-edr-border-0)",
-              }}
-            >
-              <Stack gap={4}>
-                <Group gap="xs">
-                  <Text fw={600}>{ROLE_LABELS[r.type] ?? r.type}</Text>
-                  <Badge color={status.color} variant="light" radius="sm">
-                    {status.label}
-                  </Badge>
-                  {r.reference && (
-                    <Text size="xs" c="dimmed" ff="monospace">
-                      {r.reference}
-                    </Text>
-                  )}
-                </Group>
-                {(r.status === "rejected" || r.status === "suspended") &&
-                  r.reviewNote && (
-                    <Text
-                      size="sm"
-                      c={r.status === "suspended" ? "orange.7" : "red.7"}
-                    >
-                      <strong>
-                        {r.status === "suspended"
-                          ? "Suspension reason:"
-                          : "Reviewer note:"}
-                      </strong>{" "}
-                      {r.reviewNote}
-                    </Text>
-                  )}
+        <Group gap="sm" mb="md">
+          <Layers size={20} />
+          <Title order={3}>Operational Services</Title>
+        </Group>
+        <Stack gap="sm">
+          {roles.map((r) => {
+            const status = ROLE_STATUS[r.status] ?? {
+              color: "gray",
+              label: r.status,
+            };
+            return (
+              <Group
+                key={r.id}
+                justify="space-between"
+                align="flex-start"
+                wrap="nowrap"
+                py="xs"
+                style={{
+                  borderTop: "1px solid var(--mantine-color-edr-border-0)",
+                }}
+              >
+                <Stack gap={4}>
+                  <Group gap="xs">
+                    <Text fw={600}>{ROLE_LABELS[r.type] ?? r.type}</Text>
+                    <Badge color={status.color} variant="light" radius="sm">
+                      {status.label}
+                    </Badge>
+                    {r.reference && (
+                      <Text size="xs" c="dimmed" ff="monospace">
+                        {r.reference}
+                      </Text>
+                    )}
+                  </Group>
+                  {(r.status === "rejected" || r.status === "suspended") &&
+                    r.reviewNote && (
+                      <Text
+                        size="sm"
+                        c={r.status === "suspended" ? "orange.7" : "red.7"}
+                      >
+                        <strong>
+                          {r.status === "suspended"
+                            ? "Suspension reason:"
+                            : "Reviewer note:"}
+                        </strong>{" "}
+                        {r.reviewNote}
+                      </Text>
+                    )}
 
-                {r.licenseFiles.length === 0 ? (
-                  <Text size="xs" c="edr-muted">
-                    No license document
-                  </Text>
-                ) : (
-                  <Stack gap={4}>
-                    {r.licenseFiles.map((f) => (
-                      <Group key={f.id} gap="xs" wrap="nowrap">
-                        <FileText
-                          size={14}
-                          className="text-edr-muted"
-                          style={{ flexShrink: 0 }}
-                        />
-                        <Anchor
-                          component="button"
-                          type="button"
-                          size="xs"
-                          lineClamp={1}
-                          onClick={() =>
-                            void fetchViewableFile(f.id, f.name).then(view)
-                          }
-                        >
-                          {f.name}
-                        </Anchor>
-                        {f.status !== "live" && (
-                          <Badge
+                  {r.licenseFiles.length === 0 ? (
+                    <Text size="xs" c="edr-muted">
+                      No license document
+                    </Text>
+                  ) : (
+                    <Stack gap={4}>
+                      {r.licenseFiles.map((f) => (
+                        <Group key={f.id} gap="xs" wrap="nowrap">
+                          <FileText
+                            size={14}
+                            className="text-edr-muted"
+                            style={{ flexShrink: 0 }}
+                          />
+                          <Anchor
+                            component="button"
+                            type="button"
                             size="xs"
-                            radius="sm"
-                            variant="light"
-                            color={
-                              f.status === "pending_remove" ? "red" : "yellow"
+                            lineClamp={1}
+                            onClick={() =>
+                              void fetchViewableFile(f.id, f.name).then(view)
                             }
                           >
-                            {f.status === "pending_remove"
-                              ? "Removal pending"
-                              : "Pending"}
-                          </Badge>
-                        )}
-                      </Group>
-                    ))}
-                  </Stack>
-                )}
-              </Stack>
+                            {f.name}
+                          </Anchor>
+                          {f.status !== "live" && (
+                            <Badge
+                              size="xs"
+                              radius="sm"
+                              variant="light"
+                              color={
+                                f.status === "pending_remove" ? "red" : "yellow"
+                              }
+                            >
+                              {f.status === "pending_remove"
+                                ? "Removal pending"
+                                : "Pending"}
+                            </Badge>
+                          )}
+                        </Group>
+                      ))}
+                    </Stack>
+                  )}
+                </Stack>
 
-              {r.status === "rejected" && (
-                <ResubmitService
-                  pending={resubmit.isPending}
-                  onResubmit={(files) =>
-                    resubmit.mutate({ profileId: r.id, files })
-                  }
-                />
-              )}
-            </Group>
-          );
-        })}
-      </Stack>
+                {r.status === "rejected" && (
+                  <ResubmitService
+                    pending={resubmit.isPending}
+                    onResubmit={(files) =>
+                      resubmit.mutate({ profileId: r.id, files })
+                    }
+                  />
+                )}
+              </Group>
+            );
+          })}
+        </Stack>
       </Card>
       {viewer}
     </>
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 17c88d792..21956c9a1 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx
@@ -1,14 +1,4 @@
-import {
-  Alert,
-  Button,
-  Divider,
-  Group,
-  Loader,
-  SimpleGrid,
-  Stack,
-  Text,
-  TextInput,
-} from "@mantine/core";
+import { Alert, Button, Group, Stack } from "@mantine/core";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useQuery } from "@tanstack/react-query";
 import { AlertCircle, ArrowLeft, ArrowRight } from "lucide-react";
@@ -19,16 +9,11 @@ import type { AuthUser } from "@/types/auth";
 import type { CreateCompanyPayload } from "@/services/companies.service";
 import type { ProfileResponse, UpdateProfilePayload } from "@/types/profile";
 import type { CompanyRegistrationData } from "@edr/types";
-import { ControlledPhoneField, toEthiopianE164 } from "@/components/PhoneField";
-import { SmartFileInput } from "@edr/ui-common";
+import { toEthiopianE164 } from "@/components/PhoneField";
 import { getMinFiles } from "@/types/fileUploadSettings";
 import { api } from "@/services/api";
-import RoleLicenseStep, {
-  type RoleLicenseProfile,
-} from "@/components/onboarding/RoleLicenseStep";
-import ETradeInfo, {
-  type ETradeStatus,
-} from "@/components/onboarding/ETradeInfo";
+import type { RoleLicenseProfile } from "@/components/onboarding/RoleLicenseStep";
+import type { ETradeStatus } from "@/components/onboarding/ETradeInfo";
 import {
   buildOnboardingSchema,
   type CompanyStep,
@@ -38,15 +23,20 @@ import {
 } from "./companyProfileForm/schema";
 import {
   buildPayload,
+  firstPresent,
+  firstValidEmail,
+  firstValidPhone,
+  normalizeIdentityPhones,
   stepPayload,
   toFormValues,
 } from "./companyProfileForm/helpers";
-import FaydaVerifyPanel from "@/components/FaydaVerifyPanel";
 import { verifaydaService } from "@/services/verifayda.service";
 import type { CompanyIdentityState } from "@/services/verifayda.service";
-import { LinkCheckboxCard } from "./companyProfileForm/LinkCheckboxCard";
-import ETradeCompanyCard from "./companyProfileForm/ETradeCompanyCard";
-import StepSection from "./companyProfileForm/StepSection";
+import CompanyInfoStep from "./companyProfileForm/steps/CompanyInfoStep";
+import PersonnelStep from "./companyProfileForm/steps/PersonnelStep";
+import ContactStep from "./companyProfileForm/steps/ContactStep";
+import PoaStep from "./companyProfileForm/steps/PoaStep";
+import DocumentsStep from "./companyProfileForm/steps/DocumentsStep";
 
 export default function CompanyProfileForm({
   documentSettingCode,
@@ -67,7 +57,7 @@ export default function CompanyProfileForm({
   submitError,
   uploadedDocumentKeys,
   onUploadDocuments,
-  identity,
+  identity: rawIdentity,
   onIdentityChange,
 }: {
   documentSettingCode: string;
@@ -115,6 +105,15 @@ export default function CompanyProfileForm({
    */
   onIdentityChange?: () => void;
 }) {
+  // A Fayda claim carries the phone as the national registry holds it, which is
+  // often a local number the form's E.164 validation (and the API's
+  // `@IsValidPhone()`) would reject — for a value the customer never typed and
+  // has no field to correct. Normalize once, here, so every read below is safe.
+  const identity = useMemo(
+    () => normalizeIdentityPhones(rawIdentity),
+    [rawIdentity],
+  );
+
   const [step, setStep] = useState<CompanyStep>(initialStep ?? "company");
   const [saving, setSaving] = useState(false);
   const [saveError, setSaveError] = useState<string | null>(null);
@@ -185,22 +184,27 @@ export default function CompanyProfileForm({
   // forms (plus a mandatory owner passport number).
   const verifiedIdentity = identity?.faydaRequired === true;
 
-  const {
-    register,
-    control,
-    handleSubmit,
-    trigger,
-    watch,
-    setValue,
-    formState: { errors },
-  } = useForm<FormData>({
-    resolver: zodResolver(
-      buildOnboardingSchema(identity?.passportRequired === true),
-    ),
+  // Which fields the current step renders an input for and therefore requires.
+  // Filled in further down (it depends on values this form owns), and read at
+  // validation time rather than at render time — the resolver below runs on
+  // events, always after the render that assigned it.
+  const requiredKeysRef = useRef<(keyof FormData)[]>([]);
+
+  const form = useForm<FormData>({
+    resolver: (values, context, options) =>
+      zodResolver(
+        buildOnboardingSchema(
+          identity?.passportRequired === true,
+          requiredKeysRef.current,
+        ),
+      )(values, context, options),
+    // `values` below re-seeds the form whenever the profile is refetched — and
+    // an in-page identity action (ticking "same as owner") refetches it. Without
+    // this, that reset silently throws away whatever the customer was part-way
+    // through typing on the current step.
+    resetOptions: { keepDirtyValues: true, keepErrors: true },
     defaultValues: {
       companyName: "",
-      companyEmail: "",
-      companyPhone: "",
       companyAddress: "",
       etradePhone: "",
       tinNumber: "",
@@ -234,6 +238,16 @@ export default function CompanyProfileForm({
     values: rehydrate ? toFormValues(rehydrate) : undefined,
   });
 
+  // The step components take the whole `form`; the orchestration below drives
+  // validation and persistence, so it only pulls out what it actually calls.
+  const {
+    trigger,
+    watch,
+    setValue,
+    getValues,
+    formState: { dirtyFields },
+  } = form;
+
   // The contact person's email still just seeds from the account and stays editable.
   useEffect(() => {
     if (!user?.email) return;
@@ -266,21 +280,28 @@ export default function CompanyProfileForm({
     phone: string;
   } | null>(null);
 
+  // `shouldDirty` is what marks the eTrade bundle as "re-verified this session";
+  // `stepPayload` sends those keys only when dirty, so an unchanged record is
+  // never echoed back to the API (which would make it re-query eTrade).
   const handleETradeDataLoaded = (data: CompanyRegistrationData) => {
+    const dirty = { shouldDirty: true } as const;
     if (data.companyName) {
-      setValue("companyName", data.companyName, { shouldValidate: true });
+      setValue("companyName", data.companyName, {
+        shouldValidate: true,
+        ...dirty,
+      });
     }
-    setValue("licenceNumber", data.licenceNumber);
-    setValue("statusDescription", data.statusDescription);
-    setValue("dateRegistered", data.dateRegistered);
-    setValue("renewedFrom", data.renewedFrom);
-    setValue("renewalDate", data.renewalDate);
-    setValue("renewedTo", data.renewedTo);
-    setValue("region", data.region);
-    setValue("zone", data.zone);
-    setValue("woreda", data.woreda);
-    setValue("kebele", data.kebele);
-    setValue("houseNo", data.houseNo);
+    setValue("licenceNumber", data.licenceNumber, dirty);
+    setValue("statusDescription", data.statusDescription, dirty);
+    setValue("dateRegistered", data.dateRegistered, dirty);
+    setValue("renewedFrom", data.renewedFrom, dirty);
+    setValue("renewalDate", data.renewalDate, dirty);
+    setValue("renewedTo", data.renewedTo, dirty);
+    setValue("region", data.region, dirty);
+    setValue("zone", data.zone, dirty);
+    setValue("woreda", data.woreda, dirty);
+    setValue("kebele", data.kebele, dirty);
+    setValue("houseNo", data.houseNo, dirty);
     // companyAddress is composed reactively from the address fields below, so
     // setting region/zone/woreda/kebele/houseNo above is enough — no need to
     // compose it here. companyPhone is derived below (identity → eTrade →
@@ -292,6 +313,7 @@ export default function CompanyProfileForm({
     setValue(
       "etradePhone",
       data.managerPhone || data.regularPhone || data.mobilePhone,
+      dirty,
     );
 
     setEtradeOwner({
@@ -321,29 +343,6 @@ export default function CompanyProfileForm({
     setEtradeOwner(null);
   };
 
-  // companyEmail/companyPhone are no longer typed — the Fayda-verified owner
-  // is the highest-trust source (that's the whole point of verifying), eTrade's
-  // registered number and the account email/phone are the fallbacks used
-  // before verification happens.
-  useEffect(() => {
-    setValue("companyEmail", identity?.owner.email ?? user.email ?? "", {
-      shouldValidate: true,
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [identity?.owner.email, user.email, rehydrate]);
-
-  useEffect(() => {
-    setValue(
-      "companyPhone",
-      identity?.owner.phone ??
-      etradeOwner?.phone ??
-      toEthiopianE164(user.phoneNumber) ??
-      "",
-      { shouldValidate: true },
-    );
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [identity?.owner.phone, etradeOwner?.phone, user.phoneNumber, rehydrate]);
-
   // "Same as …" links. A checked card prefills the target step's fields from the
   // source step and disables them (kept mirrored while linked); unchecking clears
   // them and re-enables editing.
@@ -352,29 +351,41 @@ export default function CompanyProfileForm({
   const [gmSameAsOwner, setGmSameAsOwner] = useState(
     identity?.gmSameAsOwner ?? false,
   );
+  // `identity` is undefined on the first render (the requirements query is still
+  // in flight), so the initial state above freezes at `false` — adopt the
+  // server's declaration the moment it lands, or a resumed draft shows an
+  // unticked box over a GM that is linked server-side.
+  const [poaSameAsOwner, setPoaSameAsOwner] = useState(
+    identity?.poaSameAsOwner ?? false,
+  );
+  const identityLoaded = useRef(false);
+  useEffect(() => {
+    if (!identity || identityLoaded.current) return;
+    identityLoaded.current = true;
+    setGmSameAsOwner(identity.gmSameAsOwner);
+    setPoaSameAsOwner(identity.poaSameAsOwner);
+  }, [identity]);
   const [contactSameAsGm, setContactSameAsGm] = useState(false);
 
-  // General Manager source. The company step's email/phone are seeded from
-  // eTrade (and the account email) but stay editable, so the link reads the
-  // CURRENT form values rather than the frozen eTrade snapshot — an edit on the
-  // company step propagates here, the same way "Same as General Manager" tracks
-  // the general manager's live values. eTrade's owner name has no editable
-  // field of its own, so it falls back to the registering user's account name.
-  const companyEmail = watch("companyEmail");
-  const companyPhone = watch("companyPhone");
-  // A Fayda-verified owner outranks eTrade's registered owner — it's the
-  // higher-trust source, and the whole point of proving identity is to stop
-  // trusting typed/looked-up data for this.
-  const gmSourceName =
-    identity?.owner.name ?? etradeOwner?.name ?? user.name?.en ?? "";
-  const gmSourceEmail =
-    identity?.owner.email ?? (companyEmail || user.email || "");
-  const gmSourcePhone =
-    identity?.owner.phone ??
-    companyPhone ??
-    etradeOwner?.phone ??
-    toEthiopianE164(user.phoneNumber) ??
-    "";
+  // Where the owner's details come from when they are copied onto someone else
+  // — the GM, or the representative. A Fayda-verified owner outranks eTrade's
+  // registered owner: it's the higher-trust source, and the whole point of
+  // proving identity is to stop trusting typed/looked-up data for this.
+  const ownerSourceName = firstPresent(
+    identity?.owner.name,
+    etradeOwner?.name,
+    user.name?.en,
+  );
+
+  const ownerSourceEmail = firstValidEmail(identity?.owner.email, user.email);
+  // Same reason as `derivedPhone`: this value is written into
+  // `generalManagerPhone` / `poaPhone`, which the API validates with
+  // `@IsValidPhone()`, so an unusable eTrade number here 400s the step instead.
+  const ownerSourcePhone = firstValidPhone(
+    identity?.owner.phone,
+    etradeOwner?.phone,
+    user.phoneNumber,
+  );
 
   useEffect(() => {
     if (!gmSameAsOwner) return;
@@ -382,13 +393,30 @@ export default function CompanyProfileForm({
     // `identity.gm`; mirroring it into form fields here would send typed
     // values for something the API already owns.
     if (identity?.owner.verified) return;
-    setValue("generalManagerName", gmSourceName, { shouldValidate: true });
-    setValue("generalManagerEmail", gmSourceEmail, { shouldValidate: true });
-    setValue("generalManagerPhone", gmSourcePhone, {
+    setValue("generalManagerName", ownerSourceName, { shouldValidate: true });
+    setValue("generalManagerEmail", ownerSourceEmail, { shouldValidate: true });
+    setValue("generalManagerPhone", ownerSourcePhone, {
       shouldValidate: true,
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [gmSameAsOwner, gmSourceName, gmSourceEmail, gmSourcePhone]);
+  }, [gmSameAsOwner, ownerSourceName, ownerSourceEmail, ownerSourcePhone]);
+
+  // The representative's half of the same copy. A verified owner's identity is
+  // copied server-side and read back from `identity.poa`, so only an owner
+  // backed by a typed passport is mirrored into form fields here — the same
+  // split the GM makes above, for the same reason.
+  //
+  // Only non-empty sources are written. A source the owner does not have is a
+  // gap the step renders an input for (see `poaGaps`), and this effect re-runs
+  // whenever any *other* source changes — so blanking here would wipe what the
+  // customer is typing into that input the moment an eTrade lookup lands.
+  useEffect(() => {
+    if (!poaSameAsOwner || identity?.owner.verified) return;
+    if (ownerSourceName) setValue("poaName", ownerSourceName, { shouldValidate: true });
+    if (ownerSourceEmail) setValue("poaEmail", ownerSourceEmail, { shouldValidate: true });
+    if (ownerSourcePhone) setValue("poaPhone", ownerSourcePhone, { shouldValidate: true });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [poaSameAsOwner, ownerSourceName, ownerSourceEmail, ownerSourcePhone]);
 
   /**
    * "Same as owner" has two meanings depending on what backs the owner.
@@ -424,25 +452,69 @@ export default function CompanyProfileForm({
       setSaveError(
         (err as { response?: { data?: { message?: string } } })?.response?.data
           ?.message ??
-          (err instanceof Error ? err.message : "Could not update the general manager"),
+        (err instanceof Error
+          ? err.message
+          : "Could not update the general manager"),
       );
     } finally {
       setGmLinkPending(false);
     }
   };
 
+  /**
+   * The representative is the owner. Unlike the GM's card this always goes to
+   * the API, whichever backs the owner: the declaration itself is what waives
+   * the DARS delegation paper, so it has to be recorded server-side even when
+   * there is no proven identity to copy and the details are mirrored locally.
+   */
+  const [poaLinkPending, setPoaLinkPending] = useState(false);
+  const togglePoaSameAsOwner = async (checked: boolean) => {
+    setSaveError(null);
+    setPoaSameAsOwner(checked);
+    setPoaLinkPending(true);
+    try {
+      if (checked) await verifaydaService.setPoaSameAsOwner();
+      else {
+        await verifaydaService.clearPoaSameAsOwner();
+        // Only the locally mirrored values are ours to clear; a copied identity
+        // is cleared by the call above.
+        if (!identity?.owner.verified) {
+          setValue("poaName", "");
+          setValue("poaEmail", "");
+          setValue("poaPhone", "");
+        }
+      }
+      onIdentityChange?.();
+    } catch (err) {
+      setPoaSameAsOwner(!checked);
+      setSaveError(
+        (err as { response?: { data?: { message?: string } } })?.response?.data
+          ?.message ??
+        (err instanceof Error
+          ? err.message
+          : "Could not update the Power of Attorney"),
+      );
+    } finally {
+      setPoaLinkPending(false);
+    }
+  };
+
   // Where the GM's details come from depends on how they were established: a
   // Fayda verification (or a "same as owner" declaration) owns them outright,
   // and only a company that may still type them falls back to form state.
+  // A verified GM's identity wins, but Fayda's email and phone claims are
+  // optional: what the verification did not supply is typed on this step, and
+  // the API deliberately does not read those back onto the identity (they are
+  // not proven), so the form value is the only place they exist.
   const gmVerified = identity?.gm.verified ?? false;
   const gmName = gmVerified
-    ? (identity?.gm.name ?? "")
+    ? firstPresent(identity?.gm.name, watch("generalManagerName"))
     : watch("generalManagerName");
   const gmEmail = gmVerified
-    ? (identity?.gm.email ?? "")
+    ? firstPresent(identity?.gm.email, watch("generalManagerEmail"))
     : watch("generalManagerEmail");
   const gmPhone = gmVerified
-    ? (identity?.gm.phone ?? "")
+    ? firstPresent(identity?.gm.phone, watch("generalManagerPhone"))
     : watch("generalManagerPhone");
 
   /**
@@ -450,18 +522,78 @@ export default function CompanyProfileForm({
    * "same as owner" declaration, or (only where Fayda is optional) by typing.
    * Fayda is an Ethiopian national ID, so a foreign company's GM may hold none.
    */
+  // Matches what the API actually demands (`REQUIRED_COMPANY_INFO`): a name and
+  // a phone. The email is collected but optional — a manager proved through
+  // Fayda may have no email claim, and the notify resolver no longer needs one.
   const gmTyped = Boolean(
     watch("generalManagerName")?.trim() &&
-      watch("generalManagerEmail")?.trim() &&
-      watch("generalManagerPhone")?.trim(),
+    watch("generalManagerPhone")?.trim(),
   );
   const gmEstablished =
     gmVerified || (identity ? !identity.faydaRequired && gmTyped : gmTyped);
 
-  /** Same rule for the representative: verified, or typed where Fayda is optional. */
+  /**
+   * Same rule for the representative: verified, or entered where Fayda is
+   * optional.
+   *
+   * Matches the API's own rule (`REQUIRED_POA_FIELDS`): a typed representative
+   * counts once they have a name, an email and a phone. The step now renders
+   * inputs for all three, so this is something the customer can actually
+   * satisfy — previously it gated on `poaName`, for which no input existed
+   * anywhere, leaving a foreign freight forwarder permanently stuck.
+   */
+  const poaTyped = Boolean(
+    watch("poaName")?.trim() &&
+    watch("poaEmail")?.trim() &&
+    watch("poaPhone")?.trim(),
+  );
   const poaEstablished =
     (identity?.poa.verified ?? false) ||
-    (identity ? !identity.faydaRequired && Boolean(watch("poaName")?.trim()) : false);
+    (identity ? !identity.faydaRequired && poaTyped : false);
+
+  /**
+   * Drop an optional representative the company no longer wants.
+   *
+   * Verifying a PoA is one click on a step that calls itself optional, and it
+   * is not reversible from the form: the verification owns the fields (so
+   * blanking them is refused), and its mere existence makes the DARS paper due
+   * — which then blocks the submit AND clamps the resume back to this step. The
+   * settings page has the same escape hatch, but `/settings` is off-limits
+   * until onboarding finishes, so without this the customer is stuck.
+   *
+   * Not offered to a freight forwarder: the API refuses (they must have one).
+   */
+  const [poaRemovePending, setPoaRemovePending] = useState(false);
+  const removePoa = async () => {
+    setSaveError(null);
+    setPoaRemovePending(true);
+    try {
+      await verifaydaService.removePoa();
+      for (const key of [
+        "poaName",
+        "poaEmail",
+        "poaPhone",
+        "poaAddress",
+        "poaLocation",
+      ] as const) {
+        setValue(key, "", { shouldDirty: false });
+      }
+      // The paper is deleted server-side with the identity; a copy still
+      // sitting in the picker would be re-uploaded on the documents step.
+      setDocumentFiles({ ...documentFiles, [POA_DELEGATION_FILE_KEY]: null });
+      onIdentityChange?.();
+    } catch (err) {
+      setSaveError(
+        (err as { response?: { data?: { message?: string } } })?.response?.data
+          ?.message ??
+        (err instanceof Error
+          ? err.message
+          : "Could not remove the Power of Attorney"),
+      );
+    } finally {
+      setPoaRemovePending(false);
+    }
+  };
 
   // While linked, mirror the source values into the (disabled) target fields so
   // the copy stays current even if the user goes back and edits the source.
@@ -611,13 +743,40 @@ export default function CompanyProfileForm({
   // delegated, so it's required the moment a PoA exists. The API enforces the
   // same rule on save, so skipping it here only costs the customer a
   // round-trip.
-  // A PoA exists exactly when one has been verified — the details are the
-  // verification's output, so there is nothing else that could stand for one.
-  // Until then the upload is hidden: there is no representative for the paper
-  // to authorise, and a freight forwarder is held on the verification gate
-  // below rather than on a file field it cannot yet fill.
-  const poaProvided = identity?.poa.verified ?? false;
-  const delegationRequired = poaProvided;
+  //
+  // "Exists" is the API's own test (`POA_ATTRIBUTES.some(...)`): ANY detail,
+  // verified or typed. Requiring a complete typed representative here instead
+  // hid the upload from a customer who had entered only a name — for whom the
+  // API still demands the paper, and whose resume would then be clamped back to
+  // this step with nothing on it to fill.
+  const poaAnyDetail = [
+    identity?.poa.name,
+    identity?.poa.email,
+    identity?.poa.phone,
+    identity?.poa.address,
+    watch("poaName"),
+    watch("poaEmail"),
+    watch("poaPhone"),
+    watch("poaLocation"),
+  ].some((v) => v?.trim());
+  const poaProvided = (identity?.poa.verified ?? false) || poaAnyDetail;
+  // A freight forwarder owes the paper whether or not its representative could
+  // verify with Fayda — the API demands it at completion either way. Keying
+  // this on the verification alone hid the upload from a foreign forwarder and
+  // then failed them on submit for a file they were never shown.
+  //
+  // Unless the owner represents the company themselves: nobody delegates to
+  // themselves, so there is no delegation to evidence. Mirrors the API's own
+  // waiver in `assertPoaDelegationSatisfied` — the two must agree, or this
+  // demands a file the server would accept the submission without.
+  //
+  // Split from `poaDue` — "there is a representative, so their details are
+  // owed" — because a self-PoA keeps the second while dropping the first. The
+  // API draws the same line (`poaDue` / `delegationDue` in
+  // getOnboardingRequirements); anything that is about the *details* must key
+  // on `poaDue`, only the paper keys on this.
+  const poaDue = poaProvided || requirePoa;
+  const delegationRequired = poaDue && !poaSameAsOwner;
   const delegationPresent =
     (uploadedDocumentKeys ?? []).includes(POA_DELEGATION_FILE_KEY) ||
     (() => {
@@ -625,15 +784,149 @@ export default function CompanyProfileForm({
       return Array.isArray(v) ? v.length > 0 : v != null;
     })();
 
+  /**
+   * What a Fayda verification did NOT supply, per person.
+   *
+   * Fayda's email, phone and address claims are optional and routinely come
+   * back empty, so a *verified* person can still be missing details the API
+   * demands (`REQUIRED_POA_FIELDS`, `REQUIRED_COMPANY_INFO`). Those gaps are
+   * typed instead — the API keeps exactly the keys a claim left empty typeable,
+   * since a claim that returned nothing owns no value to protect.
+   *
+   * Computed here, once, and handed to both the step (which renders an input
+   * per gap) and the schema (which requires exactly those) — a field is
+   * required if and only if there is an input on screen to fix it in.
+   */
+  // Where Fayda is mandatory an unverified representative must verify rather
+  // than be typed, so nothing is offered until the verification lands.
+  const poaTypedAllowed =
+    !identity || identity.poa.verified || !identity.faydaRequired;
+  // A representative the verification never proved holds only typed details —
+  // the API leaves those unlocked, so the inputs stay on screen and stay
+  // editable. Only a *verified* PoA hides the fields their claim did fill,
+  // which is also the only case the API refuses to let anyone overwrite.
+  const poaGap = (v?: string | null) =>
+    poaTypedAllowed && (!identity?.poa.verified || !v?.trim());
+  /**
+   * "Same as owner" answers each field only as far as the owner actually has
+   * one. Fayda's name, email and phone claims are all optional, the account and
+   * eTrade fallbacks can be empty or unusable, and `REQUIRED_POA_FIELDS` still
+   * demands a name, an email and a phone — so anything the copy could not
+   * supply stays askable. Assuming the copy filled everything is what dead-ends
+   * the submit on "Add your poa phone" with no input anywhere to satisfy it.
+   *
+   * Keyed on the *source*, never on the field's current value: an input that
+   * disappears the moment the first character is typed into it is unusable.
+   * A verified owner's identity is copied server-side, so `identity.poa` is the
+   * source there; otherwise it is the same owner-derived values the mirror
+   * effect writes.
+   */
+  const poaCopyGap = (copied?: string | null, mirrored?: string | null) =>
+    identity?.owner.verified ? !copied?.trim() : !mirrored?.trim();
+  const poaGaps = poaSameAsOwner
+    ? {
+      name: poaCopyGap(identity?.poa.name, ownerSourceName),
+      email: poaCopyGap(identity?.poa.email, ownerSourceEmail),
+      phone: poaCopyGap(identity?.poa.phone, ownerSourcePhone),
+      // The location is the one detail the API never demands, so a blank one
+      // dead-ends nothing — and asking for the owner's city under a card that
+      // says "same as owner" reads as a contradiction.
+      address: false,
+    }
+    : {
+      name: poaGap(identity?.poa.name),
+      email: poaGap(identity?.poa.email),
+      phone: poaGap(identity?.poa.phone),
+      address: poaGap(identity?.poa.address),
+    };
+  // The GM's own verification never falls back to the signed-in account — that
+  // account is the person onboarding, not necessarily the manager — so a GM
+  // verified with no email claim has nowhere else for one to come from. The
+  // name claim is optional too, and `REQUIRED_COMPANY_INFO` demands it, so it
+  // gets the same treatment rather than dead-ending the submit.
+  // "Same as owner" is exempt: the API copies the owner's (account-backed)
+  // contact details across, so there is no gap and no input.
+  const gmGaps = {
+    name: !gmSameAsOwner && gmVerified && !identity?.gm.name?.trim(),
+    email: !gmSameAsOwner && gmVerified && !identity?.gm.email?.trim(),
+    phone: !gmSameAsOwner && gmVerified && !identity?.gm.phone?.trim(),
+  };
+
+  const requiredKeys: (keyof FormData)[] = [];
+  if (step === "personnel") {
+    // The manager's email is offered but not demanded: the API dropped it from
+    // `REQUIRED_COMPANY_INFO` once the notify resolver stopped depending on it.
+    // The name and phone are still required there, so they are still required
+    // here.
+    if (gmGaps.name) requiredKeys.push("generalManagerName");
+    if (gmGaps.phone) requiredKeys.push("generalManagerPhone");
+  } else if (step === "poa" && poaDue) {
+    // Only once a PoA is required or provided: an untouched optional PoA is
+    // still a step the customer may walk straight past.
+    //
+    // `poaDue`, NOT `delegationRequired`: the paper is waived for a self-PoA
+    // but `REQUIRED_POA_FIELDS` is not, and the API reports every one of them
+    // missing (`missingPoaFields` keys on its own `poaDue`) — which fails the
+    // submit and clamps the resume back here. Keying this on the paper let the
+    // customer walk past an input this step had already put on screen.
+    if (poaGaps.name) requiredKeys.push("poaName");
+    if (poaGaps.email) requiredKeys.push("poaEmail");
+    if (poaGaps.phone) requiredKeys.push("poaPhone");
+  }
+  requiredKeysRef.current = requiredKeys;
+
+  /**
+   * Collect the messages for a set of fields into one sentence.
+   *
+   * A failed `trigger()` used to return silently, so Continue simply did
+   * nothing — and every field whose input is conditionally rendered (or derived
+   * and never rendered at all) turned into an invisible dead end. Naming the
+   * failures is the whole point: the ones worth reporting are exactly the ones
+   * with no error text on screen to read.
+   */
+  const describeErrors = (fields: (keyof FormData)[]): string => {
+    // Re-parse rather than read `errors`: that's the render-time snapshot, and
+    // this runs immediately after an `await trigger()` that has not re-rendered
+    // yet, so the closure would still be holding the previous attempt's state.
+    const parsed = buildOnboardingSchema(
+      identity?.passportRequired === true,
+      requiredKeys,
+    ).safeParse(getValues());
+    const wanted = new Set<string>(fields as string[]);
+    const messages = parsed.success
+      ? []
+      : parsed.error.issues
+        .filter((i) => wanted.has(String(i.path[0])))
+        .map((i) => i.message);
+    return messages.length > 0
+      ? `Please fix: ${[...new Set(messages)].join(", ")}.`
+      : "Some details on this step are incomplete. Please review the fields above.";
+  };
+
+  /**
+   * The fields this step actually validates. `stepFields` covers what the step
+   * always renders; the company step additionally exposes company email/phone
+   * as inputs when nothing could be derived for them, and a field is validated
+   * exactly when the customer can see and fix it.
+   */
+  const fieldsForStep = (s: CompanyStep): (keyof FormData)[] => {
+    if (s !== "company" || !identity) return stepFields[s];
+    return [...stepFields.company];
+  };
+
   /** Validate + persist the current step, returning whether we may advance. */
   const saveCurrentStep = async (): Promise<boolean> => {
     setSaveError(null);
-    const isValid = await trigger(stepFields[step]);
-    if (!isValid) return false;
+    const fields = fieldsForStep(step);
+    const isValid = await trigger(fields);
+    if (!isValid) {
+      setSaveError(describeErrors(fields));
+      return false;
+    }
     if (!onSaveStep) return true;
     setSaving(true);
     try {
-      const res = await onSaveStep(stepPayload(step, watch()));
+      const res = await onSaveStep(stepPayload(step, getValues(), dirtyFields));
       if (!res.ok) {
         setSaveError(res.error);
         return false;
@@ -676,7 +969,14 @@ export default function CompanyProfileForm({
       }
 
       setSaveError(null);
-      handleSubmit((data) => onSubmit(buildPayload(data, user)))();
+      // Deliberately NOT `handleSubmit`: that re-validated all 34 schema fields
+      // — including every field belonging to a step that isn't on screen — and
+      // on failure did nothing at all, no alert and no navigation, which is the
+      // "Submit for review" button that appears dead. Each step has already
+      // validated and saved its own fields, and the API's `markOnboardingComplete`
+      // is the authority on what is still outstanding; its message reaches the
+      // customer through `submitError`.
+      onSubmit(buildPayload(getValues(), user));
       return;
     }
     // The TIN must resolve to a real eTrade record before anything else on
@@ -699,8 +999,14 @@ export default function CompanyProfileForm({
     // saveCurrentStep()'s trigger() below catches that; checking the stale
     // server-side identity.owner.passportNumber here would block a value the
     // user just typed but hasn't saved yet.
-    if (step === "company" && identity?.faydaRequired && !identity.owner.verified) {
-      setSaveError("Verify the company owner's identity with Fayda before continuing.");
+    if (
+      step === "company" &&
+      identity?.faydaRequired &&
+      !identity.owner.verified
+    ) {
+      setSaveError(
+        "Verify the company owner's identity with Fayda before continuing.",
+      );
       return;
     }
     // The GM is established through Fayda now, so the step gates on the
@@ -728,15 +1034,42 @@ export default function CompanyProfileForm({
       setDocumentFieldErrors({
         [POA_DELEGATION_FILE_KEY]: "DARS delegation paper is required",
       });
+      // Validate the text fields too, so every problem shows at once.
+      const fieldsOk = await trigger(stepFields.poa);
       setSaveError(
-        requirePoa
-          ? "Freight forwarders must provide Power of Attorney details and the DARS delegation paper."
-          : "Upload the DARS delegation paper for the Power of Attorney you entered, or clear the PoA details to skip.",
+        [
+          requirePoa
+            ? "Freight forwarders must provide Power of Attorney details and the DARS delegation paper."
+            : "Upload the DARS delegation paper for the Power of Attorney you entered, or clear the PoA details to skip.",
+          fieldsOk ? null : describeErrors(stepFields.poa),
+        ]
+          .filter(Boolean)
+          .join(" "),
       );
-      // Fall through to validate the text fields too, so every problem shows at once.
-      await trigger(stepFields.poa);
       return;
     }
+    // The API will not accept the PoA's details until the paper evidencing the
+    // delegation is actually on file, so the selection made on this step has to
+    // be uploaded before the save — not held back until the documents step,
+    // which is unreachable while this save keeps failing.
+    if (step === "poa" && delegationRequired && onUploadDocuments) {
+      const pending = documentFiles[POA_DELEGATION_FILE_KEY];
+      const hasPending = Array.isArray(pending)
+        ? pending.length > 0
+        : pending != null;
+      if (hasPending) {
+        setSaving(true);
+        try {
+          const res = await onUploadDocuments();
+          if (!res.ok) {
+            setSaveError(res.error);
+            return;
+          }
+        } finally {
+          setSaving(false);
+        }
+      }
+    }
     // Field steps validate + save before advancing.
     const ok = await saveCurrentStep();
     if (!ok) return;
@@ -755,291 +1088,75 @@ export default function CompanyProfileForm({
       <form onSubmit={(e) => e.preventDefault()}>
         <Stack gap="md">
           {step === "company" && (
-            <Stack gap="xl">
-              <StepSection
-                index={1}
-                title="VAT number"
-                status={
-                  watch("vatNumber")?.length === 10 && !errors.vatNumber
-                    ? "done"
-                    : "todo"
-                }
-              >
-                <TextInput
-                  aria-label="VAT Number"
-                  placeholder="0012345678"
-                  maxLength={10}
-                  error={errors.vatNumber?.message}
-                  {...register("vatNumber")}
-                />
-              </StepSection>
-
-              <StepSection
-                index={2}
-                title="Owner identity"
-                subtitle={
-                  !identity?.owner.verified && !verifiedIdentity
-                    ? "Provide the company owner's passport number."
-                    : undefined
-                }
-                status={
-                  verifiedIdentity
-                    ? identity?.owner.verified
-                      ? "done"
-                      : identity?.faydaRequired
-                        ? "blocked"
-                        : "todo"
-                    : (watch("ownerPassportNumber")?.trim()?.length ?? 0) > 0
-                      ? "done"
-                      : identity?.passportRequired
-                        ? "blocked"
-                        : "todo"
-                }
-              >
-                {identity && (
-                  <>
-                    <FaydaVerifyPanel
-                      subject="owner"
-                      title="Owner"
-                      state={identity.owner}
-                      required={identity.faydaRequired}
-                    />
-                    {identity.passportRequired && (
-                      <TextInput
-                        label="Owner Passport Number"
-                        placeholder="P1234567"
-                        error={errors.ownerPassportNumber?.message}
-                        {...register("ownerPassportNumber")}
-                      />
-                    )}
-                  </>
-                )}
-              </StepSection>
-
-              <StepSection
-                index={3}
-                title="Company TIN"
-                subtitle="We'll pull your registration straight from eTrade — nothing to type by hand once it's found."
-                status={
-                  tinVerified
-                    ? "done"
-                    : tinStatus === "taken"
-                      ? "blocked"
-                      : "todo"
-                }
-              >
-                <ETradeInfo
-                  tin={watch("tinNumber")}
-                  register={register("tinNumber")}
-                  error={errors.tinNumber?.message}
-                  onDataLoaded={handleETradeDataLoaded}
-                  onStatusChange={setTinStatus}
-                  onReset={handleETradeReset}
-                />
-                {tinVerified && (
-                  <ETradeCompanyCard
-                    tin={watch("tinNumber")}
-                    register={register}
-                    watch={watch}
-                    errors={errors}
-                    control={control}
-                  />
-                )}
-              </StepSection>
-            </Stack>
+            <CompanyInfoStep
+              form={form}
+              identity={identity}
+              verifiedIdentity={verifiedIdentity}
+              tinStatus={tinStatus}
+              tinVerified={tinVerified}
+              hasRegistrationDetails={hasRegistrationDetails}
+              onETradeDataLoaded={handleETradeDataLoaded}
+              onETradeStatusChange={setTinStatus}
+              onETradeReset={handleETradeReset}
+            />
           )}
 
           {step === "personnel" && (
-            <>
-              <Text fw={600} size="sm" c="edr-text">
-                General Manager
-              </Text>
-              {/* The GM is very often the owner. Where the owner is
-                  Fayda-verified this reuses that proven identity outright
-                  rather than making the same human verify twice; where the
-                  owner is backed by a typed passport there is nothing proven
-                  to copy, so it stays a local prefill. */}
-              <LinkCheckboxCard
-                checked={gmSameAsOwner}
-                onToggle={toggleGmSameAsOwner}
-                title={
-                  identity?.owner.verified
-                    ? "Same as verified owner"
-                    : "Same as business owner"
-                }
-                description={
-                  identity?.owner.verified
-                    ? "Reuse the Fayda-verified owner's identity for the general manager. Uncheck to verify a different person."
-                    : etradeOwner
-                      ? "Reuse the eTrade-registered owner's name, plus the company email and phone as you entered them. Uncheck to enter different details."
-                      : "Reuse your account's name and the company email and phone as you entered them. Uncheck to enter different details."
-                }
-              />
-
-              {/* Verifying a second person is only meaningful when the GM is
-                  someone other than the owner. */}
-              {!gmSameAsOwner && identity && (
-                <FaydaVerifyPanel
-                  subject="gm"
-                  title="General Manager"
-                  state={identity.gm}
-                  required={identity.faydaRequired}
-                  disabled={gmLinkPending}
-                />
-              )}
-
-              {/* Typed details survive only where Fayda cannot be required —
-                  a foreign company's manager may hold no Fayda ID. Once
-                  verified the API owns these fields, so they go away. */}
-              {!gmSameAsOwner && !gmVerified && !identity?.faydaRequired && (
-                <>
-                  <TextInput
-                    label="Name"
-                    placeholder="Abebe Bikila"
-                    error={errors.generalManagerName?.message}
-                    {...register("generalManagerName")}
-                  />
-                  <SimpleGrid cols={2} spacing="md">
-                    <TextInput
-                      label="Email"
-                      type="email"
-                      placeholder="gm@company.com"
-                      error={errors.generalManagerEmail?.message}
-                      {...register("generalManagerEmail")}
-                    />
-                    <ControlledPhoneField
-                      control={control}
-                      name="generalManagerPhone"
-                      label="Phone"
-                      required
-                    />
-                  </SimpleGrid>
-                </>
-              )}
-            </>
+            <PersonnelStep
+              form={form}
+              identity={identity}
+              etradeOwner={etradeOwner}
+              gmSameAsOwner={gmSameAsOwner}
+              onToggleGmSameAsOwner={toggleGmSameAsOwner}
+              gmLinkPending={gmLinkPending}
+              gmVerified={gmVerified}
+              gaps={gmGaps}
+            />
           )}
 
           {step === "contact" && (
-            <>
-              <Text fw={600} size="sm" c="edr-text">
-                Contact Person
-              </Text>
-              {watch("generalManagerName") && (
-                <LinkCheckboxCard
-                  checked={contactSameAsGm}
-                  onToggle={toggleContactSameAsGm}
-                  title="Same as General Manager"
-                  description="Reuse the general manager's name, email and phone. Uncheck to enter different details."
-                />
-              )}
-              <SimpleGrid cols={2} spacing="md">
-                <TextInput
-                  label="Name"
-                  placeholder="Jane Smith"
-                  error={errors.contactPersonName?.message}
-                  {...register("contactPersonName")}
-                />
-                <TextInput
-                  label="Position (Optional)"
-                  placeholder="Operations Lead"
-                  error={errors.contactPersonPosition?.message}
-                  {...register("contactPersonPosition")}
-                />
-              </SimpleGrid>
-              <SimpleGrid cols={2} spacing="md">
-                <TextInput
-                  label="Email (Optional)"
-                  type="email"
-                  placeholder="contact@company.com"
-                  error={errors.contactPersonEmail?.message}
-                  {...register("contactPersonEmail")}
-                />
-                <ControlledPhoneField
-                  control={control}
-                  name="contactPersonPhone"
-                  label="Phone"
-                  required
-                />
-              </SimpleGrid>
-            </>
+            <ContactStep
+              form={form}
+              gmName={gmName}
+              contactSameAsGm={contactSameAsGm}
+              onToggleContactSameAsGm={toggleContactSameAsGm}
+            />
           )}
 
           {step === "poa" && (
-            <>
-              <Text size="sm" c="edr-muted">
-                {requirePoa
-                  ? "As a freight forwarder you act on other companies' behalf, so Power of Attorney details and the DARS delegation paper are required."
-                  : "Power of Attorney details are optional. Fill them in if you have them, or skip to continue. If you do enter a representative, upload the delegation paper authenticated by DARS."}
-              </Text>
-              {/* A representative acts for the company inside Ethiopia
-                  whoever owns it, so the PoA is proven with Fayda regardless of
-                  nationality — their name, email, phone and address all come
-                  from the verification and are never typed here. */}
-              {identity && (
-                <FaydaVerifyPanel
-                  subject="poa"
-                  title="Power of Attorney"
-                  state={identity.poa}
-                  required={requirePoa}
-                />
-              )}
-              {/* The address comes from the Fayda claim along with the name,
-                  so it is shown on the panel rather than typed. Only a company
-                  whose representative may hold no Fayda ID still types it. */}
-              {!identity?.poa.verified && !identity?.faydaRequired && (
-                <TextInput
-                  label="PoA Location"
-                  placeholder="City, Country"
-                  error={errors.poaLocation?.message}
-                  {...register("poaLocation")}
-                />
-              )}
-
-              {/* The paper authorises the representative the verification
-                  named, so it only has meaning once one exists. */}
-              {poaProvided && poaDocumentSetting && (
-                <>
-                  <Divider my="sm" />
-                  <SmartFileInput
-                    file={poaDocumentSetting}
-                    value={documentFiles}
-                    uploadedKeys={uploadedDocumentKeys}
-                    errors={documentFieldErrors}
-                    onChange={handleDocumentFilesChange}
-                  />
-                </>
-              )}
-            </>
+            <PoaStep
+              form={form}
+              identity={identity}
+              requirePoa={requirePoa}
+              poaSameAsOwner={poaSameAsOwner}
+              onTogglePoaSameAsOwner={togglePoaSameAsOwner}
+              poaLinkPending={poaLinkPending}
+              etradeOwner={etradeOwner}
+              gaps={poaGaps}
+              onRemovePoa={removePoa}
+              removePending={poaRemovePending}
+              delegationRequired={delegationRequired}
+              poaDocumentSetting={poaDocumentSetting}
+              documentFiles={documentFiles}
+              uploadedDocumentKeys={uploadedDocumentKeys}
+              documentFieldErrors={documentFieldErrors}
+              onDocumentFilesChange={handleDocumentFilesChange}
+            />
           )}
 
           {step === "documents" && (
-            <>
-              {loadingDocuments ? (
-                <Group justify="center" py="xl">
-                  <Loader size="sm" color="edr-green" />
-                </Group>
-              ) : !documentsSetting ? (
-                <Text size="sm" c="edr-muted" ta="center" py="md">
-                  No document requirements found for your account type.
-                </Text>
-              ) : (
-                <SmartFileInput
-                  file={documentsSetting}
-                  value={documentFiles}
-                  uploadedKeys={uploadedDocumentKeys}
-                  errors={documentFieldErrors}
-                  containerClassName="lg:grid grid-cols-2 items-stretch"
-                  onChange={handleDocumentFilesChange}
-                />
-              )}
-
-              <RoleLicenseStep
-                profiles={roleProfiles ?? []}
-                value={licenseFiles ?? {}}
-                onChange={handleLicenseFilesChange}
-                errors={licenseFieldErrors}
-              />
-            </>
+            <DocumentsStep
+              loadingDocuments={loadingDocuments}
+              documentsSetting={documentsSetting}
+              documentFiles={documentFiles}
+              uploadedDocumentKeys={uploadedDocumentKeys}
+              documentFieldErrors={documentFieldErrors}
+              onDocumentFilesChange={handleDocumentFilesChange}
+              roleProfiles={roleProfiles}
+              licenseFiles={licenseFiles}
+              licenseFieldErrors={licenseFieldErrors}
+              onLicenseFilesChange={handleLicenseFilesChange}
+            />
           )}
 
           {saveError && (
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/DjiboutiAgentForm.tsx b/apps/edr-freight-web/portal/src/pages/accounts/DjiboutiAgentForm.tsx
deleted file mode 100644
index 89570c545..000000000
--- a/apps/edr-freight-web/portal/src/pages/accounts/DjiboutiAgentForm.tsx
+++ /dev/null
@@ -1,328 +0,0 @@
-import { Box, Button, Group, Loader, SimpleGrid, Stack, Text, TextInput, ThemeIcon } from "@mantine/core";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useQuery } from "@tanstack/react-query";
-import {
-  ArrowLeft,
-  ArrowRight,
-  Building2,
-  CheckCircle2,
-  ChevronLeft,
-  UploadCloud,
-  UserRound,
-} from "lucide-react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-
-import type { AuthUser } from "@/types/auth";
-import type { CreateCompanyPayload } from "@/services/companies.service";
-import { ControlledPhoneField, isValidPhone } from "@/components/PhoneField";
-import { SmartFileInput } from "@edr/ui-common";
-import { api } from "@/services/api";
-
-type DjiboutiStep = "company" | "representative" | "documents" | "confirm";
-
-const djiboutiSchema = z.object({
-  companyName: z.string().min(1, "Company name is required"),
-  companyEmail: z.string().email("Invalid email address"),
-  companyPhone: z
-    .string()
-    .min(1, "Company phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-  companyLocation: z.string().min(1, "Location / Country is required"),
-  companyAddress: z.string().min(1, "Address is required"),
-  repName: z.string().min(1, "Representative name is required"),
-  repEmail: z.string().email("Invalid representative email"),
-  repPhone: z
-    .string()
-    .min(1, "Representative phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-});
-
-type FormData = z.infer<typeof djiboutiSchema>;
-
-const stepFields: Record<DjiboutiStep, (keyof FormData)[]> = {
-  company: ["companyName", "companyEmail", "companyPhone", "companyLocation", "companyAddress"],
-  representative: ["repName", "repEmail", "repPhone"],
-  documents: [],
-  confirm: [],
-};
-
-function buildPayload(data: FormData, _user: AuthUser): CreateCompanyPayload {
-  return {
-    companyName: data.companyName,
-    companyEmail: data.companyEmail,
-    companyPhone: data.companyPhone,
-    companyLocation: data.companyLocation,
-    companyAddress: data.companyAddress,
-    tin: "",
-    vatNumber: "",
-    fanNumber: "",
-    attributes: {
-      repName: data.repName,
-      repEmail: data.repEmail,
-      repPhone: data.repPhone,
-    },
-  };
-}
-
-export default function DjiboutiAgentForm({
-  documentSettingCode,
-  documentFiles: controlledFiles,
-  onDocumentFilesChange,
-  user,
-  onSubmit,
-  isPending,
-  onBack,
-}: {
-  documentSettingCode: string;
-  documentFiles?: Record<string, File | File[] | null>;
-  onDocumentFilesChange?: (files: Record<string, File | File[] | null>) => void;
-  user: AuthUser;
-  onSubmit: (data: CreateCompanyPayload) => void;
-  isPending: boolean;
-  onBack: () => void;
-}) {
-  const [step, setStep] = useState<DjiboutiStep>("company");
-  const [internalFiles, setInternalFiles] = useState<Record<string, File | File[] | null>>({});
-  const documentFiles = controlledFiles ?? internalFiles;
-  const setDocumentFiles = onDocumentFilesChange ?? setInternalFiles;
-
-  const { data: uploadSetting, isLoading: loadingDocuments } = useQuery(
-    api.fileUploadSettings.getByCode.queryOptions({ input: { code: documentSettingCode }, refetchOnMount: false }),
-  );
-
-  const { register, control, handleSubmit, trigger, watch, formState: { errors } } = useForm<FormData>({
-    resolver: zodResolver(djiboutiSchema),
-    defaultValues: {
-      companyName: "", companyEmail: "", companyPhone: "",
-      companyLocation: "", companyAddress: "", repName: "", repEmail: "", repPhone: "",
-    },
-  });
-
-  const formValues = watch();
-  const hasDocuments = Boolean(uploadSetting?.fields?.length);
-  const totalSteps = 4;
-
-  const nextStep = async () => {
-    if (step === "representative") { setStep("documents"); return; }
-    if (step === "documents") { setStep("confirm"); return; }
-    if (step === "confirm") { handleSubmit((data) => onSubmit(buildPayload(data, user)))(); return; }
-    const isValid = await trigger(stepFields[step]);
-    if (!isValid) return;
-    setStep("representative");
-  };
-
-  const skipDocuments = () => setStep("confirm");
-
-  const prevStep = () => {
-    if (step === "company") onBack();
-    else if (step === "representative") setStep("company");
-    else if (step === "documents") setStep("representative");
-    else setStep("documents");
-  };
-
-  const STEPS: { key: DjiboutiStep; icon: React.ReactNode }[] = [
-    { key: "company", icon: <Building2 size={18} /> },
-    { key: "representative", icon: <UserRound size={18} /> },
-    { key: "documents", icon: <UploadCloud size={18} /> },
-    { key: "confirm", icon: <CheckCircle2 size={18} /> },
-  ];
-
-  const STEP_LABELS: Record<DjiboutiStep, string> = {
-    company: `Step 1 of ${totalSteps} — Company Information`,
-    representative: `Step 2 of ${totalSteps} — Representative Details`,
-    documents: `Step 3 of ${totalSteps} — Upload Documents (Optional)`,
-    confirm: `Step 4 of ${totalSteps} — Review & Confirm`,
-  };
-
-  const stepOrder: DjiboutiStep[] = ["company", "representative", "documents", "confirm"];
-  const currentIdx = stepOrder.indexOf(step);
-
-  return (
-    <>
-      <Box mb="xl">
-        <Button
-          variant="subtle"
-          c="edr-muted"
-          size="sm"
-          mb="sm"
-          leftSection={<ChevronLeft size={16} />}
-          onClick={prevStep}
-        >
-          Change account type
-        </Button>
-
-        <Group justify="space-between" align="center" className="relative max-w-lg mx-auto px-2">
-          <Box className="absolute top-1/2 left-2 right-2 h-0.5 bg-edr-border -translate-y-1/2 z-0" />
-          {STEPS.map(({ key, icon }, i) => {
-            const done = i < currentIdx;
-            const active = i === currentIdx;
-            return done || active ? (
-              <ThemeIcon key={key} size={40} radius="xl" variant="filled" color="edr-green" className="relative z-10">
-                {done ? <CheckCircle2 size={18} /> : icon}
-              </ThemeIcon>
-            ) : (
-              <Box
-                key={key}
-                w={40}
-                h={40}
-                c="edr-slate"
-                className="relative z-10 flex items-center justify-center rounded-full border-2 border-edr-border bg-edr-card"
-              >
-                {icon}
-              </Box>
-            );
-          })}
-        </Group>
-
-        <Text size="sm" c="edr-muted" ta="center" mt="sm">
-          {STEP_LABELS[step]}
-        </Text>
-      </Box>
-
-      <form onSubmit={(e) => e.preventDefault()}>
-        <Stack gap="md">
-          {step === "company" && (
-            <>
-              <TextInput
-                label="Company Name"
-                placeholder="Djibouti Logistics SARL"
-                error={errors.companyName?.message}
-                {...register("companyName")}
-              />
-              <SimpleGrid cols={2} spacing="md">
-                <TextInput
-                  label="Company Email"
-                  type="email"
-                  placeholder="info@djib-logistics.dj"
-                  error={errors.companyEmail?.message}
-                  {...register("companyEmail")}
-                />
-                <ControlledPhoneField
-                  control={control}
-                  name="companyPhone"
-                  label="Company Phone"
-                  required
-                />
-              </SimpleGrid>
-              <SimpleGrid cols={2} spacing="md">
-                <TextInput
-                  label="Location / Country"
-                  placeholder="Djibouti City, Djibouti"
-                  error={errors.companyLocation?.message}
-                  {...register("companyLocation")}
-                />
-                <TextInput
-                  label="Address"
-                  placeholder="Boulevard de la République"
-                  error={errors.companyAddress?.message}
-                  {...register("companyAddress")}
-                />
-              </SimpleGrid>
-            </>
-          )}
-
-          {step === "representative" && (
-            <>
-              <Text size="sm" c="edr-muted">
-                Provide the company representative details for this account.
-              </Text>
-              <TextInput
-                label="Representative Name"
-                placeholder="Ahmed Hassan"
-                error={errors.repName?.message}
-                {...register("repName")}
-              />
-              <SimpleGrid cols={2} spacing="md">
-                <TextInput
-                  label="Representative Email"
-                  type="email"
-                  placeholder="ahmed@company.dj"
-                  error={errors.repEmail?.message}
-                  {...register("repEmail")}
-                />
-                <ControlledPhoneField
-                  control={control}
-                  name="repPhone"
-                  label="Representative Phone"
-                  required
-                />
-              </SimpleGrid>
-            </>
-          )}
-
-          {step === "documents" && (
-            <>
-              {loadingDocuments ? (
-                <Group justify="center" py="xl">
-                  <Loader size="sm" color="edr-green" />
-                </Group>
-              ) : !uploadSetting ? (
-                <Text size="sm" c="edr-muted" ta="center" py="md">
-                  No document requirements found for your account type.
-                </Text>
-              ) : (
-                <SmartFileInput file={uploadSetting} value={documentFiles} onChange={setDocumentFiles} />
-              )}
-            </>
-          )}
-
-          {step === "confirm" && (
-            <Box p={16} className="rounded-2xl border border-edr-border bg-edr-card">
-              <Text fw={600} c="edr-text">Review your registration</Text>
-              <Text size="sm" c="edr-muted" mt={4} mb="md">
-                Confirm the company details below before saving.
-              </Text>
-              <SimpleGrid cols={2} spacing="sm">
-                <ReviewRow label="Company name" value={formValues.companyName} />
-                <ReviewRow label="Company email" value={formValues.companyEmail} />
-                <ReviewRow label="Company phone" value={formValues.companyPhone} />
-                <ReviewRow label="Location" value={formValues.companyLocation} />
-                <ReviewRow label="Address" value={formValues.companyAddress} />
-                <ReviewRow label="Rep. name" value={formValues.repName} />
-                <ReviewRow label="Rep. email" value={formValues.repEmail} />
-                <ReviewRow label="Rep. phone" value={formValues.repPhone} />
-              </SimpleGrid>
-            </Box>
-          )}
-
-          <Group justify="space-between" pt="xs">
-            <Button variant="default" onClick={prevStep} leftSection={<ArrowLeft size={16} />}>
-              {step === "company" ? "Change Type" : step === "confirm" ? "Back to Documents" : "Back"}
-            </Button>
-            <Group gap="sm">
-              {step === "documents" && (
-                <Button variant="default" onClick={skipDocuments} disabled={isPending}>
-                  Skip for now
-                </Button>
-              )}
-              <Button
-                color="edr-green"
-                onClick={step === "confirm" ? handleSubmit((data) => onSubmit(buildPayload(data, user))) : nextStep}
-                disabled={isPending || (step === "documents" && !hasDocuments && loadingDocuments)}
-                loading={isPending}
-                rightSection={!isPending && step !== "confirm" && step !== "documents" ? <ArrowRight size={16} /> : undefined}
-              >
-                {step === "documents" ? "Continue" : step === "confirm" ? "Submit Registration" : "Next Step"}
-              </Button>
-            </Group>
-          </Group>
-        </Stack>
-      </form>
-    </>
-  );
-}
-
-function ReviewRow({ label, value }: { label: string; value?: string | null }) {
-  return (
-    <Box p={12} className="rounded-xl bg-edr-bg">
-      <Text size="xs" fw={600} c="edr-muted" className="uppercase tracking-wide">
-        {label}
-      </Text>
-      <Text size="sm" fw={500} c={value?.trim() ? "edr-text" : "edr-muted"} mt={4}>
-        {value?.trim() ? value : "Not provided"}
-      </Text>
-    </Box>
-  );
-}
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/TransporterForm.tsx b/apps/edr-freight-web/portal/src/pages/accounts/TransporterForm.tsx
index ef6f894fd..1e365ab7d 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/TransporterForm.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/TransporterForm.tsx
@@ -1,4 +1,16 @@
-import { Box, Button, Divider, Group, Loader, Select, SimpleGrid, Stack, Text, TextInput, ThemeIcon } from "@mantine/core";
+import {
+  Box,
+  Button,
+  Divider,
+  Group,
+  Loader,
+  Select,
+  SimpleGrid,
+  Stack,
+  Text,
+  TextInput,
+  ThemeIcon,
+} from "@mantine/core";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useQuery } from "@tanstack/react-query";
 import {
@@ -18,7 +30,13 @@ import type { CreateCompanyPayload } from "@/services/companies.service";
 import { SmartFileInput } from "@edr/ui-common";
 import { api } from "@/services/api";
 
-const TRUCK_TYPES = ["Casoni", "Truck Trailer", "High Bed", "Low Bed", "Others"] as const;
+const TRUCK_TYPES = [
+  "Casoni",
+  "Truck Trailer",
+  "High Bed",
+  "Low Bed",
+  "Others",
+] as const;
 
 type TransporterStep = "vehicle" | "documents" | "confirm";
 
@@ -36,7 +54,10 @@ const transporterSchema = z
       .regex(/^\d{4}$/, "Enter a valid year (e.g. 2023)"),
   })
   .superRefine((data, ctx) => {
-    if (data.truckType === "Casoni" && (!data.plateNumber2 || data.plateNumber2.trim().length === 0)) {
+    if (
+      data.truckType === "Casoni" &&
+      (!data.plateNumber2 || data.plateNumber2.trim().length === 0)
+    ) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         path: ["plateNumber2"],
@@ -50,8 +71,6 @@ type FormData = z.infer<typeof transporterSchema>;
 function buildPayload(data: FormData, user: AuthUser): CreateCompanyPayload {
   return {
     companyName: user.name?.en ?? "",
-    companyEmail: user.email,
-    companyPhone: user.phoneNumber,
     companyLocation: "",
     companyAddress: "",
     tin: data.tinNumber,
@@ -85,18 +104,36 @@ export default function TransporterForm({
   onBack: () => void;
 }) {
   const [step, setStep] = useState<TransporterStep>("vehicle");
-  const [internalFiles, setInternalFiles] = useState<Record<string, File | File[] | null>>({});
+  const [internalFiles, setInternalFiles] = useState<
+    Record<string, File | File[] | null>
+  >({});
   const documentFiles = controlledFiles ?? internalFiles;
   const setDocumentFiles = onDocumentFilesChange ?? setInternalFiles;
 
   const { data: uploadSetting, isLoading: loadingDocuments } = useQuery(
-    api.fileUploadSettings.getByCode.queryOptions({ input: { code: documentSettingCode }, refetchOnMount: false }),
+    api.fileUploadSettings.getByCode.queryOptions({
+      input: { code: documentSettingCode },
+      refetchOnMount: false,
+    }),
   );
 
-  const { register, handleSubmit, trigger, watch, control, formState: { errors } } = useForm<FormData>({
+  const {
+    register,
+    handleSubmit,
+    trigger,
+    watch,
+    control,
+    formState: { errors },
+  } = useForm<FormData>({
     resolver: zodResolver(transporterSchema),
     defaultValues: {
-      tinNumber: "", fanNumber: "", truckType: "", plateNumber: "", plateNumber2: "", vehicleModel: "", yearOfManufacturing: "",
+      tinNumber: "",
+      fanNumber: "",
+      truckType: "",
+      plateNumber: "",
+      plateNumber2: "",
+      vehicleModel: "",
+      yearOfManufacturing: "",
     },
   });
 
@@ -107,9 +144,22 @@ export default function TransporterForm({
   const totalSteps = 3;
 
   const nextStep = async () => {
-    if (step === "documents") { setStep("confirm"); return; }
-    if (step === "confirm") { handleSubmit((data) => onSubmit(buildPayload(data, user)))(); return; }
-    const fields: (keyof FormData)[] = ["tinNumber", "fanNumber", "truckType", "plateNumber", "vehicleModel", "yearOfManufacturing"];
+    if (step === "documents") {
+      setStep("confirm");
+      return;
+    }
+    if (step === "confirm") {
+      handleSubmit((data) => onSubmit(buildPayload(data, user)))();
+      return;
+    }
+    const fields: (keyof FormData)[] = [
+      "tinNumber",
+      "fanNumber",
+      "truckType",
+      "plateNumber",
+      "vehicleModel",
+      "yearOfManufacturing",
+    ];
     const isValid = await trigger(fields);
     if (!isValid) return;
     setStep("documents");
@@ -152,13 +202,24 @@ export default function TransporterForm({
           Change account type
         </Button>
 
-        <Group justify="space-between" align="center" className="relative max-w-lg mx-auto px-2">
+        <Group
+          justify="space-between"
+          align="center"
+          className="relative max-w-lg mx-auto px-2"
+        >
           <Box className="absolute top-1/2 left-2 right-2 h-0.5 bg-edr-border -translate-y-1/2 z-0" />
           {STEPS.map(({ key, icon }, i) => {
             const done = i < currentIdx;
             const active = i === currentIdx;
             return done || active ? (
-              <ThemeIcon key={key} size={40} radius="xl" variant="filled" color="edr-green" className="relative z-10">
+              <ThemeIcon
+                key={key}
+                size={40}
+                radius="xl"
+                variant="filled"
+                color="edr-green"
+                className="relative z-10"
+              >
                 {done ? <CheckCircle2 size={18} /> : icon}
               </ThemeIcon>
             ) : (
@@ -203,7 +264,9 @@ export default function TransporterForm({
 
               <Divider color="edr-border" />
 
-              <Text fw={600} size="sm" c="edr-text">Vehicle / Truck Information</Text>
+              <Text fw={600} size="sm" c="edr-text">
+                Vehicle / Truck Information
+              </Text>
 
               <Controller
                 name="truckType"
@@ -276,14 +339,23 @@ export default function TransporterForm({
                   No document requirements found for your account type.
                 </Text>
               ) : (
-                <SmartFileInput file={uploadSetting} value={documentFiles} onChange={setDocumentFiles} />
+                <SmartFileInput
+                  file={uploadSetting}
+                  value={documentFiles}
+                  onChange={setDocumentFiles}
+                />
               )}
             </>
           )}
 
           {step === "confirm" && (
-            <Box p={16} className="rounded-2xl border border-edr-border bg-edr-card">
-              <Text fw={600} c="edr-text">Review your registration</Text>
+            <Box
+              p={16}
+              className="rounded-2xl border border-edr-border bg-edr-card"
+            >
+              <Text fw={600} c="edr-text">
+                Review your registration
+              </Text>
               <Text size="sm" c="edr-muted" mt={4} mb="md">
                 Confirm the details below before saving.
               </Text>
@@ -291,32 +363,73 @@ export default function TransporterForm({
                 <ReviewRow label="TIN Number" value={formValues.tinNumber} />
                 <ReviewRow label="FAN Number" value={formValues.fanNumber} />
                 <ReviewRow label="Truck Type" value={formValues.truckType} />
-                <ReviewRow label="Plate Number" value={formValues.plateNumber} />
-                {formValues.plateNumber2 && <ReviewRow label="Plate (Trailer)" value={formValues.plateNumber2} />}
-                <ReviewRow label="Vehicle Model" value={formValues.vehicleModel} />
-                <ReviewRow label="Year" value={formValues.yearOfManufacturing} />
+                <ReviewRow
+                  label="Plate Number"
+                  value={formValues.plateNumber}
+                />
+                {formValues.plateNumber2 && (
+                  <ReviewRow
+                    label="Plate (Trailer)"
+                    value={formValues.plateNumber2}
+                  />
+                )}
+                <ReviewRow
+                  label="Vehicle Model"
+                  value={formValues.vehicleModel}
+                />
+                <ReviewRow
+                  label="Year"
+                  value={formValues.yearOfManufacturing}
+                />
               </SimpleGrid>
             </Box>
           )}
 
           <Group justify="space-between" pt="xs">
-            <Button variant="default" onClick={prevStep} leftSection={<ArrowLeft size={16} />}>
-              {step === "vehicle" ? "Change Type" : step === "confirm" ? "Back to Documents" : "Back"}
+            <Button
+              variant="default"
+              onClick={prevStep}
+              leftSection={<ArrowLeft size={16} />}
+            >
+              {step === "vehicle"
+                ? "Change Type"
+                : step === "confirm"
+                  ? "Back to Documents"
+                  : "Back"}
             </Button>
             <Group gap="sm">
               {step === "documents" && (
-                <Button variant="default" onClick={skipDocuments} disabled={isPending}>
+                <Button
+                  variant="default"
+                  onClick={skipDocuments}
+                  disabled={isPending}
+                >
                   Skip for now
                 </Button>
               )}
               <Button
                 color="edr-green"
-                onClick={step === "confirm" ? handleSubmit((data) => onSubmit(buildPayload(data, user))) : nextStep}
-                disabled={isPending || (step === "documents" && !hasDocuments && loadingDocuments)}
+                onClick={
+                  step === "confirm"
+                    ? handleSubmit((data) => onSubmit(buildPayload(data, user)))
+                    : nextStep
+                }
+                disabled={
+                  isPending ||
+                  (step === "documents" && !hasDocuments && loadingDocuments)
+                }
                 loading={isPending}
-                rightSection={!isPending && step !== "confirm" && step !== "documents" ? <ArrowRight size={16} /> : undefined}
+                rightSection={
+                  !isPending && step !== "confirm" && step !== "documents" ? (
+                    <ArrowRight size={16} />
+                  ) : undefined
+                }
               >
-                {step === "documents" ? "Continue" : step === "confirm" ? "Submit Registration" : "Next Step"}
+                {step === "documents"
+                  ? "Continue"
+                  : step === "confirm"
+                    ? "Submit Registration"
+                    : "Next Step"}
               </Button>
             </Group>
           </Group>
@@ -329,10 +442,20 @@ export default function TransporterForm({
 function ReviewRow({ label, value }: { label: string; value?: string | null }) {
   return (
     <Box p={12} className="rounded-xl border border-edr-border bg-edr-card">
-      <Text size="xs" fw={600} c="edr-muted" className="uppercase tracking-wide">
+      <Text
+        size="xs"
+        fw={600}
+        c="edr-muted"
+        className="uppercase tracking-wide"
+      >
         {label}
       </Text>
-      <Text size="sm" fw={500} c={value?.trim() ? "edr-text" : "edr-muted"} mt={4}>
+      <Text
+        size="sm"
+        fw={500}
+        c={value?.trim() ? "edr-text" : "edr-muted"}
+        mt={4}
+      >
         {value?.trim() ? value : "Not provided"}
       </Text>
     </Box>
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/ETradeCompanyCard.tsx b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/ETradeCompanyCard.tsx
index 1127a205d..2634fed0d 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/ETradeCompanyCard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/ETradeCompanyCard.tsx
@@ -17,6 +17,11 @@ import { ReadOnlyField } from "./ReadOnlyField";
  * supplied a value, but falls back to an editable input when eTrade left it
  * blank — otherwise a gap in eTrade's own data would leave the field
  * permanently empty and the user stuck (zod requires all of these).
+ *
+ * A value that fails validation unlocks the same way. eTrade (or a row saved
+ * before the current rules) can supply something the schema rejects, and a
+ * rejected value rendered read-only is a step that can never be completed and
+ * never says why.
  */
 function LockedField({
   label,
@@ -32,7 +37,7 @@ function LockedField({
   errors: FieldErrors<FormData>;
 }) {
   const value = watch(name) as string | undefined;
-  if (value && value.trim()) {
+  if (value && value.trim() && !errors[name]) {
     return <ReadOnlyField label={label} value={value} />;
   }
   return (
@@ -96,7 +101,12 @@ export default function ETradeCompanyCard({
         <ReadOnlyField label="Renewal Date" value={watch("renewalDate")} />
         <ReadOnlyField label="Renewed From" value={watch("renewedFrom")} />
         <ReadOnlyField label="Renewed To" value={watch("renewedTo")} />
-        {region && region.trim() ? (
+        {/* Membership of the catalog, not mere presence: eTrade's normalizer
+            returns null for a region it doesn't recognise, and older rows can
+            hold a spelling that isn't in the list. Showing such a value
+            read-only left the customer with a required field they could not
+            correct. */}
+        {(ETHIOPIAN_REGIONS as readonly string[]).includes(region ?? "") ? (
           <ReadOnlyField label="Region" value={region} />
         ) : (
           <Controller
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/LinkCheckboxCard.tsx b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/LinkCheckboxCard.tsx
index da0dd6254..d7721d208 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/LinkCheckboxCard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/LinkCheckboxCard.tsx
@@ -10,20 +10,27 @@ export function LinkCheckboxCard({
   onToggle,
   title,
   description,
+  disabled = false,
 }: {
   checked: boolean;
   onToggle: (checked: boolean) => void;
   title: string;
   description: string;
+  /** Greys the card out and refuses the toggle — the link is not available yet. */
+  disabled?: boolean;
 }) {
   return (
     <UnstyledButton
-      onClick={() => onToggle(!checked)}
+      onClick={() => !disabled && onToggle(!checked)}
       role="checkbox"
       aria-checked={checked}
-      className={`w-full rounded-lg border! p-3! text-left transition-colors! ${checked
+      aria-disabled={disabled}
+      className={`w-full rounded-lg border! p-3! text-left transition-colors! ${disabled ? "cursor-not-allowed! opacity-60!" : ""
+        } ${checked
           ? "border-[var(--mantine-color-edr-green-6)]! bg-[var(--mantine-color-edr-green-0)]!"
-          : "border-[var(--mantine-color-gray-3)]! hover:border-[var(--mantine-color-edr-green-4)]! hover:bg-[var(--mantine-color-edr-green-0)]!"
+          : disabled
+            ? "border-[var(--mantine-color-gray-3)]!"
+            : "border-[var(--mantine-color-gray-3)]! hover:border-[var(--mantine-color-edr-green-4)]! hover:bg-[var(--mantine-color-edr-green-0)]!"
         }`}
     >
       <Group gap="sm" wrap="nowrap" align="flex-start">
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/helpers.ts b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/helpers.ts
index a3aad0ee2..36c0072fb 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/helpers.ts
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/helpers.ts
@@ -1,8 +1,77 @@
 import type { AuthUser } from "@/types/auth";
 import type { CreateCompanyPayload } from "@/services/companies.service";
 import type { ProfileResponse, UpdateProfilePayload } from "@/types/profile";
+import type { CompanyIdentityState } from "@/services/verifayda.service";
+import { isValidPhone, toEthiopianE164 } from "@/components/PhoneField";
 
-import type { CompanyStep, FormData } from "./schema";
+import {
+  ETRADE_BUNDLE_FIELDS,
+  type CompanyStep,
+  type FormData,
+} from "./schema";
+
+/**
+ * First value that is actually present.
+ *
+ * `??` is wrong for these: an identity claim Fayda returned as an empty string
+ * is not a value, but it isn't null either, so `??` would stop there and hand
+ * the form a blank it has no input to fix.
+ */
+export const firstPresent = (
+  ...values: (string | null | undefined)[]
+): string => values.find((v) => v && v.trim())?.trim() ?? "";
+
+/**
+ * First candidate that is actually a usable phone number, normalized to E.164.
+ *
+ * Presence is not enough here. eTrade's registered phone is free text and comes
+ * back as things like `"09        "`, which normalizes to `+2519` — non-empty,
+ * so a "first present" pick would take it, hand it to a field with no input,
+ * and have the API reject the whole save with
+ * "companyPhone must be a valid international phone number" for something the
+ * customer never typed. Skip a source that cannot produce a valid number and
+ * fall through to the next one.
+ */
+export const firstValidPhone = (
+  ...values: (string | null | undefined)[]
+): string => {
+  for (const raw of values) {
+    if (!raw || !raw.trim()) continue;
+    const e164 = toEthiopianE164(raw);
+    if (e164 && isValidPhone(e164)) return e164;
+  }
+  return "";
+};
+
+/** Same idea for email: a malformed claim must not become an unfixable field. */
+export const firstValidEmail = (
+  ...values: (string | null | undefined)[]
+): string => {
+  const ok = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return values.find((v) => v && ok.test(v.trim()))?.trim() ?? "";
+};
+
+/**
+ * Fayda reports a person's phone as the national registry holds it, which is
+ * routinely a local number ("0911223344"). Every phone the forms validate and
+ * submit is E.164, so normalize on the way in — the API now stores new
+ * verifications normalized, but rows verified before that still hold raw claims.
+ */
+export function normalizeIdentityPhones(
+  identity?: CompanyIdentityState,
+): CompanyIdentityState | undefined {
+  if (!identity) return identity;
+  const fix = <T extends { phone: string | null }>(person: T): T => ({
+    ...person,
+    phone: person.phone ? toEthiopianE164(person.phone) : person.phone,
+  });
+  return {
+    ...identity,
+    owner: fix(identity.owner),
+    poa: fix(identity.poa),
+    gm: fix(identity.gm),
+  };
+}
 
 /** Last 9 digits (Ethiopian national significant number) for tolerant compare. */
 export const phoneDigits = (p?: string | null) =>
@@ -23,8 +92,6 @@ export function buildPayload(
 ): CreateCompanyPayload {
   return {
     companyName: data.companyName,
-    companyEmail: data.companyEmail,
-    companyPhone: data.companyPhone,
     companyAddress: data.companyAddress,
     tin: data.tinNumber,
     vatNumber: data.vatNumber,
@@ -44,39 +111,44 @@ export function buildPayload(
   };
 }
 
-/** Map one wizard step's form values to the profile-update payload it saves. */
+/**
+ * Map one wizard step's form values to the profile-update payload it saves.
+ *
+ * `dirty` is react-hook-form's `dirtyFields`. The eTrade-owned keys (and the
+ * TIN) ride along only when the customer actually changed them this session —
+ * see `ETRADE_BUNDLE_FIELDS`. Everything else is unconditional: the API treats
+ * an absent key as "untouched", so omitting a field never clears it.
+ */
 export function stepPayload(
   step: CompanyStep,
   d: FormData,
+  dirty: Partial<Record<keyof FormData, unknown>> = {},
 ): Partial<UpdateProfilePayload> {
   switch (step) {
-    case "company":
+    case "company": {
+      const etrade: Partial<UpdateProfilePayload> = {};
+      for (const key of ETRADE_BUNDLE_FIELDS) {
+        if (dirty[key]) (etrade as Record<string, unknown>)[key] = d[key];
+      }
+      if (dirty.tinNumber) etrade.tin = d.tinNumber;
       return {
-        companyName: d.companyName,
-        companyEmail: d.companyEmail,
-        companyPhone: d.companyPhone,
         companyAddress: d.companyAddress,
-        tin: d.tinNumber,
         vatNumber: d.vatNumber,
         ownerPassportNumber: d.ownerPassportNumber || undefined,
-        licenceNumber: d.licenceNumber,
-        statusDescription: d.statusDescription,
-        dateRegistered: d.dateRegistered,
-        renewedFrom: d.renewedFrom,
-        renewalDate: d.renewalDate,
-        renewedTo: d.renewedTo,
-        region: d.region,
-        zone: d.zone,
-        woreda: d.woreda,
-        kebele: d.kebele,
-        houseNo: d.houseNo,
-        etradePhone: d.etradePhone,
+        ...etrade,
       };
+    }
     case "personnel":
+      // `|| undefined`, never "": the DTO's `@IsOptional()` only skips null and
+      // undefined, so an empty string is validated and 400s with
+      // "generalManagerEmail must be an email". An Ethiopian company never types
+      // these — the GM comes from the Fayda verification (or the "same as owner"
+      // declaration), so the form fields are legitimately blank and would fail a
+      // step that has no input to fix.
       return {
-        generalManagerName: d.generalManagerName,
-        generalManagerEmail: d.generalManagerEmail,
-        generalManagerPhone: d.generalManagerPhone,
+        generalManagerName: d.generalManagerName || undefined,
+        generalManagerEmail: d.generalManagerEmail || undefined,
+        generalManagerPhone: d.generalManagerPhone || undefined,
       };
     case "contact":
       return {
@@ -86,7 +158,12 @@ export function stepPayload(
         contactPersonPhone: d.contactPersonPhone,
       };
     case "poa":
-      return { poaLocation: d.poaLocation || undefined };
+      return {
+        poaName: d.poaName || undefined,
+        poaEmail: d.poaEmail || undefined,
+        poaPhone: d.poaPhone || undefined,
+        poaLocation: d.poaLocation || undefined,
+      };
     default:
       return {};
   }
@@ -98,8 +175,6 @@ export function toFormValues(p: ProfileResponse): FormData {
   const tin = p.tinNumber && !p.tinNumber.startsWith("D") ? p.tinNumber : "";
   return {
     companyName: p.companyName ?? "",
-    companyEmail: p.companyEmail ?? "",
-    companyPhone: p.companyPhone ?? "",
     companyAddress: p.companyAddress ?? "",
     etradePhone: p.etradePhone ?? "",
     tinNumber: tin,
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/schema.test.ts b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/schema.test.ts
new file mode 100644
index 000000000..f38d54432
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/schema.test.ts
@@ -0,0 +1,285 @@
+import { describe, expect, it } from "vitest";
+
+import { buildOnboardingSchema, onboardingSchema, stepFields } from "./schema";
+import {
+  firstPresent,
+  firstValidEmail,
+  firstValidPhone,
+  normalizeIdentityPhones,
+  stepPayload,
+} from "./helpers";
+import type { FormData } from "./schema";
+import type { CompanyIdentityState } from "@/services/verifayda.service";
+
+/** A minimally-valid form, so each case can vary one field at a time. */
+const values = (over: Partial<FormData> = {}): FormData =>
+  ({
+    companyName: "Acme PLC",
+    companyAddress: "1, Bole, Bole, Addis Ababa",
+    etradePhone: "+251911223344",
+    tinNumber: "0012345678",
+    vatNumber: "0012345678",
+    ownerPassportNumber: "",
+    licenceNumber: "LIC-1",
+    statusDescription: "Active",
+    dateRegistered: "2020-01-01",
+    renewedFrom: "",
+    renewalDate: "",
+    renewedTo: "",
+    region: "Addis Ababa",
+    zone: "Bole",
+    woreda: "03",
+    kebele: "07",
+    houseNo: "1",
+    contactPersonName: "Jane Smith",
+    contactPersonPosition: "",
+    contactPersonEmail: "",
+    contactPersonPhone: "+251911223344",
+    generalManagerName: "",
+    generalManagerEmail: "",
+    generalManagerPhone: "",
+    poaName: "",
+    poaPhone: "",
+    poaAddress: "",
+    poaEmail: "",
+    poaLocation: "",
+    ...over,
+  }) as FormData;
+
+const errorFor = (data: FormData, field: keyof FormData) => {
+  const parsed = onboardingSchema.safeParse(data);
+  if (parsed.success) return undefined;
+  return parsed.error.issues.find((i) => i.path[0] === field)?.message;
+};
+
+describe("VAT number", () => {
+  it("accepts exactly ten digits", () => {
+    expect(
+      errorFor(values({ vatNumber: "0012345678" }), "vatNumber"),
+    ).toBeUndefined();
+  });
+
+  // `.length(10)` used to pass this, so a ten-letter string reached the API.
+  it("rejects ten non-digits", () => {
+    expect(errorFor(values({ vatNumber: "ABCDEFGHIJ" }), "vatNumber")).toBe(
+      "VAT number must be exactly 10 digits",
+    );
+  });
+
+  it("rejects blank", () => {
+    expect(errorFor(values({ vatNumber: "" }), "vatNumber")).toBe(
+      "VAT number is required",
+    );
+  });
+});
+
+describe("region", () => {
+  it("rejects a spelling outside the catalog", () => {
+    expect(errorFor(values({ region: "Addis Abeba City" }), "region")).toBe(
+      "Region is required",
+    );
+  });
+});
+
+describe("stepFields", () => {
+  // The regression this whole change exists to prevent: a step must not gate on
+  // a field it renders no input for, or Continue fails with the error attached
+  // to nothing on screen.
+  it("never gates the company step on a derived or read-only field", () => {
+    const unreachable = [
+      "etradePhone",
+      "licenceNumber",
+      "statusDescription",
+      "dateRegistered",
+      "renewedFrom",
+      "renewalDate",
+      "renewedTo",
+    ];
+    expect(stepFields.company.filter((f) => unreachable.includes(f))).toEqual(
+      [],
+    );
+  });
+});
+
+describe("buildOnboardingSchema (conditionally required fields)", () => {
+  const issuesFor = (
+    data: FormData,
+    required: (keyof FormData)[],
+  ): (keyof FormData)[] => {
+    const parsed = buildOnboardingSchema(false, required).safeParse(data);
+    return parsed.success
+      ? []
+      : (parsed.error.issues.map((i) => i.path[0]) as (keyof FormData)[]);
+  };
+
+  // Fayda's email/phone claims are optional: the step renders an input for what
+  // the verification did not supply, and requires exactly those. Nothing else —
+  // a field with no input on screen must never fail Continue.
+  it("requires only the keys it is handed", () => {
+    const issues = issuesFor(values(), [
+      "generalManagerEmail",
+      "generalManagerPhone",
+    ]);
+    expect(issues).toEqual(["generalManagerEmail", "generalManagerPhone"]);
+  });
+
+  it("passes once those keys are filled", () => {
+    expect(
+      issuesFor(
+        values({
+          generalManagerEmail: "gm@example.com",
+          generalManagerPhone: "+251911223344",
+        }),
+        ["generalManagerEmail", "generalManagerPhone"],
+      ),
+    ).toEqual([]);
+  });
+
+  it("leaves the same blank fields alone when nothing is required", () => {
+    expect(issuesFor(values(), [])).toEqual([]);
+  });
+
+  it("names the field in the message, so it reads under its own input", () => {
+    const parsed = buildOnboardingSchema(false, ["poaEmail"]).safeParse(
+      values(),
+    );
+    expect(parsed.success).toBe(false);
+    if (parsed.success) return;
+    expect(parsed.error.issues[0]?.message).toBe(
+      "Representative's email is required",
+    );
+  });
+});
+
+describe("stepPayload (company)", () => {
+  it("omits the eTrade bundle when nothing was re-verified", () => {
+    const payload = stepPayload("company", values(), {});
+    expect(payload.tin).toBeUndefined();
+    expect(payload.region).toBeUndefined();
+    expect(payload.licenceNumber).toBeUndefined();
+    // The customer's own fields still save.
+    expect(payload.vatNumber).toBe("0012345678");
+  });
+
+  it("includes the bundle and the TIN once they are dirty", () => {
+    const payload = stepPayload("company", values(), {
+      tinNumber: true,
+      region: true,
+    });
+    expect(payload.tin).toBe("0012345678");
+    expect(payload.region).toBe("Addis Ababa");
+    // Still only the dirty ones.
+    expect(payload.licenceNumber).toBeUndefined();
+  });
+});
+
+describe("stepPayload (personnel)", () => {
+  // An Ethiopian company never types the GM — Fayda (or "same as owner") owns
+  // those fields — so the form holds "". `@IsOptional()` on the DTO skips only
+  // null/undefined, so an empty string is validated and comes back as
+  // "generalManagerEmail must be an email", on a step that renders no input.
+  it("omits blank GM fields instead of sending empty strings", () => {
+    const payload = stepPayload(
+      "personnel",
+      values({
+        generalManagerName: "",
+        generalManagerEmail: "",
+        generalManagerPhone: "",
+      }),
+    );
+    expect(payload.generalManagerName).toBeUndefined();
+    expect(payload.generalManagerEmail).toBeUndefined();
+    expect(payload.generalManagerPhone).toBeUndefined();
+  });
+
+  it("still sends typed GM details (foreign company)", () => {
+    const payload = stepPayload(
+      "personnel",
+      values({
+        generalManagerName: "Abebe Bikila",
+        generalManagerEmail: "gm@example.com",
+        generalManagerPhone: "+251911223344",
+      }),
+    );
+    expect(payload.generalManagerName).toBe("Abebe Bikila");
+    expect(payload.generalManagerEmail).toBe("gm@example.com");
+    expect(payload.generalManagerPhone).toBe("+251911223344");
+  });
+});
+
+describe("firstPresent", () => {
+  it("skips empty strings rather than stopping at them", () => {
+    expect(firstPresent("", "  ", "second@example.com")).toBe(
+      "second@example.com",
+    );
+    expect(firstPresent(null, undefined, "")).toBe("");
+  });
+});
+
+describe("firstValidPhone", () => {
+  // Observed live: eTrade returned "09        " for a real TIN. It normalizes to
+  // "+2519", which is non-empty — so a presence check took it, put it in a field
+  // with no input, and the API rejected the whole step.
+  it("skips an eTrade number that cannot make a valid E.164", () => {
+    expect(firstValidPhone("09        ", "+251911223344")).toBe(
+      "+251911223344",
+    );
+  });
+
+  it("normalizes a local number it can use", () => {
+    expect(firstValidPhone("0911223344")).toBe("+251911223344");
+  });
+
+  it("returns empty when no source is usable, so the field falls back to an input", () => {
+    expect(firstValidPhone("09        ", "", null)).toBe("");
+  });
+});
+
+describe("firstValidEmail", () => {
+  it("skips a malformed claim", () => {
+    expect(firstValidEmail("not-an-email", "real@example.com")).toBe(
+      "real@example.com",
+    );
+  });
+});
+
+describe("normalizeIdentityPhones", () => {
+  it("converts a local Fayda phone claim to E.164", () => {
+    const identity = {
+      faydaRequired: true,
+      passportRequired: false,
+      owner: {
+        verified: true,
+        name: "A",
+        phone: "0911223344",
+        email: null,
+        address: null,
+        verifiedAt: null,
+        passportNumber: null,
+      },
+      poa: {
+        verified: false,
+        name: null,
+        phone: null,
+        email: null,
+        address: null,
+        verifiedAt: null,
+      },
+      gm: {
+        verified: false,
+        name: null,
+        phone: "251911223344",
+        email: null,
+        address: null,
+        verifiedAt: null,
+      },
+      gmSameAsOwner: false,
+      complete: false,
+    } as CompanyIdentityState;
+
+    const fixed = normalizeIdentityPhones(identity)!;
+    expect(fixed.owner.phone).toBe("+251911223344");
+    expect(fixed.gm.phone).toBe("+251911223344");
+    expect(fixed.poa.phone).toBeNull();
+  });
+});
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/schema.ts b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/schema.ts
index ff404ebe3..37f92e05e 100644
--- a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/schema.ts
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/schema.ts
@@ -13,11 +13,6 @@ export type CompanyStep =
 
 export const onboardingSchema = z.object({
   companyName: z.string().min(1, "Company name is required"),
-  companyEmail: z.string().email("Invalid email address"),
-  companyPhone: z
-    .string()
-    .min(1, "Company phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
   // Derived from the eTrade address parts (kebele/woreda/zone/region); no
   // standalone input — the granular fields live in the registration section.
   companyAddress: z.string().optional(),
@@ -26,10 +21,11 @@ export const onboardingSchema = z.object({
   // can diverge without the backend's eTrade-authenticity check misfiring.
   etradePhone: z.string().optional(),
   tinNumber: z.string().regex(/^\d{10}$/, "TIN must be exactly 10 digits"),
+  // `.length(10)` alone accepted "ABCDEFGHIJ" — the check has to be on digits.
   vatNumber: z
     .string()
     .min(1, "VAT number is required")
-    .length(10, "VAT number must be exactly 10 digits"),
+    .regex(/^\d{10}$/, "VAT number must be exactly 10 digits"),
   // The owner's passport number — the foreign-company identity credential
   // (Fayda is an Ethiopian national ID). Required only for a foreign company;
   // enforced in buildOnboardingSchema since that depends on `nationality`.
@@ -108,48 +104,99 @@ export type FormData = z.infer<typeof onboardingSchema>;
 /** fileKey of the delegation letter uploaded on the Power of Attorney step. */
 export const POA_DELEGATION_FILE_KEY = "poa_delegation_letter";
 
+/**
+ * Labels for the fields a Fayda verification may or may not have supplied. Which
+ * of them are mandatory is decided per render (see `requiredKeys` below), so the
+ * message has to be built here rather than attached to the base schema.
+ */
+const CONDITIONAL_LABELS: Partial<Record<keyof FormData, string>> = {
+  poaName: "Representative's name",
+  poaEmail: "Representative's email",
+  poaPhone: "Representative's phone",
+  generalManagerName: "General manager's name",
+  generalManagerEmail: "General manager's email",
+  generalManagerPhone: "General manager's phone",
+};
 
 /**
- * The PoA's identifying fields are never typed — they come from the Fayda
- * verification, whatever the company's nationality — so nothing here requires
- * them. A freight forwarder's mandatory PoA is gated on the verification
- * itself, and its delegation letter alongside it, both in CompanyProfileForm
- * (files live outside form state).
+ * The PoA's and GM's identifying fields normally come from their Fayda
+ * verification, so nothing in the base schema requires them. But Fayda's email
+ * and phone claims are optional and routinely come back empty, and the steps
+ * render an input for whatever the verification did not supply — so those
+ * fields become mandatory exactly then.
  *
- * That leaves the owner's passport number as the only conditional field.
+ * `requiredKeys` is that decision, made by CompanyProfileForm from the same
+ * state that drives the rendering: a field is required iff an input exists for
+ * it. Passing it in (rather than deriving it here) is what keeps the two from
+ * drifting into a Continue button that fails on a field nobody can see.
  */
 export function buildOnboardingSchema(
   /** True for a foreign company: the owner's passport number is mandatory. */
   passportRequired = false,
+  /** Fields the current step renders an input for and must not leave blank. */
+  requiredKeys: readonly (keyof FormData)[] = [],
 ) {
-  if (!passportRequired) return onboardingSchema;
+  if (!passportRequired && requiredKeys.length === 0) return onboardingSchema;
   return onboardingSchema.superRefine((d, ctx) => {
-    if (!d.ownerPassportNumber?.trim()) {
+    if (passportRequired && !d.ownerPassportNumber?.trim()) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         path: ["ownerPassportNumber"],
         message: "The owner's passport number is required",
       });
     }
+    for (const key of requiredKeys) {
+      if (d[key]?.trim()) continue;
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: [key],
+        message: `${CONDITIONAL_LABELS[key] ?? key} is required`,
+      });
+    }
   });
 }
 
+/**
+ * The keys eTrade owns. They are only resent when the customer actually
+ * re-verified the TIN this session: the API reacts to *any* of them by issuing
+ * a live eTrade lookup (`applyEtradeSourcedFields`) whose transport failures
+ * come back as a 400, so echoing unchanged values back would let an eTrade
+ * outage block a save the customer never made.
+ */
+export const ETRADE_BUNDLE_FIELDS = [
+  "companyName",
+  "licenceNumber",
+  "statusDescription",
+  "dateRegistered",
+  "renewedFrom",
+  "renewalDate",
+  "renewedTo",
+  "region",
+  "zone",
+  "woreda",
+  "kebele",
+  "houseNo",
+  "etradePhone",
+] as const satisfies readonly (keyof FormData)[];
+
+/**
+ * What each step validates before it may advance.
+ *
+ * Hard rule: a key belongs here only if that step renders an input the customer
+ * can actually correct it in. `companyEmail`/`companyPhone` are derived from the
+ * Fayda identity / eTrade / the account and have no input of their own, and the
+ * read-only eTrade fields cannot be edited at all — listing them meant a value
+ * the customer never typed could fail zod with its error message attached to
+ * nothing on screen, which reads as a Continue button that silently does
+ * nothing. The server still enforces its own required-field list at submit
+ * (`REQUIRED_COMPANY_INFO`), and reports it with a message.
+ */
 export const stepFields: Record<CompanyStep, (keyof FormData)[]> = {
   company: [
     "companyName",
-    "companyEmail",
-    "companyPhone",
-    "companyAddress",
-    "etradePhone",
     "tinNumber",
     "vatNumber",
     "ownerPassportNumber",
-    "licenceNumber",
-    "statusDescription",
-    "dateRegistered",
-    "renewedFrom",
-    "renewalDate",
-    "renewedTo",
     "region",
     "zone",
     "woreda",
@@ -167,7 +214,11 @@ export const stepFields: Record<CompanyStep, (keyof FormData)[]> = {
     "contactPersonEmail",
     "contactPersonPhone",
   ],
-  poa: ["poaLocation"],
+  // The API requires poaName/poaEmail/poaPhone from a freight forwarder
+  // (`REQUIRED_POA_FIELDS`), so the step has to offer them wherever the
+  // representative isn't proven by Fayda — otherwise the save is rejected
+  // naming fields the form never rendered.
+  poa: ["poaName", "poaEmail", "poaPhone", "poaLocation"],
   documents: [],
   additional: [],
 };
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/CompanyInfoStep.tsx b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/CompanyInfoStep.tsx
new file mode 100644
index 000000000..3f37506a4
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/CompanyInfoStep.tsx
@@ -0,0 +1,139 @@
+import { Stack, TextInput } from "@mantine/core";
+import type { UseFormReturn } from "react-hook-form";
+
+import type { CompanyRegistrationData } from "@edr/types";
+import FaydaVerifyPanel from "@/components/FaydaVerifyPanel";
+import ETradeInfo, {
+  type ETradeStatus,
+} from "@/components/onboarding/ETradeInfo";
+import type { CompanyIdentityState } from "@/services/verifayda.service";
+
+import type { FormData } from "../schema";
+import ETradeCompanyCard from "../ETradeCompanyCard";
+import StepSection from "../StepSection";
+
+export interface CompanyInfoStepProps {
+  form: UseFormReturn<FormData>;
+  /** Fayda verification state, phone-normalized by the parent. */
+  identity?: CompanyIdentityState;
+  /** True when Fayda (not a passport) is what this company must prove with. */
+  verifiedIdentity: boolean;
+  tinStatus: ETradeStatus;
+  tinVerified: boolean;
+  /** Registration fields are already populated (a lookup passed, now or earlier). */
+  hasRegistrationDetails: boolean;
+  onETradeDataLoaded: (data: CompanyRegistrationData) => void;
+  onETradeStatusChange: (status: ETradeStatus) => void;
+  onETradeReset: () => void;
+}
+
+export default function CompanyInfoStep({
+  form,
+  identity,
+  verifiedIdentity,
+  tinStatus,
+  tinVerified,
+  hasRegistrationDetails,
+  onETradeDataLoaded,
+  onETradeStatusChange,
+  onETradeReset,
+}: CompanyInfoStepProps) {
+  const {
+    register,
+    control,
+    watch,
+    formState: { errors },
+  } = form;
+
+  return (
+    <Stack gap="xl">
+      <StepSection
+        index={1}
+        title="VAT number"
+        status={
+          watch("vatNumber")?.length === 10 && !errors.vatNumber
+            ? "done"
+            : "todo"
+        }
+      >
+        <TextInput
+          aria-label="VAT Number"
+          placeholder="0012345678"
+          maxLength={10}
+          error={errors.vatNumber?.message}
+          {...register("vatNumber")}
+        />
+      </StepSection>
+
+      <StepSection
+        index={2}
+        title="Owner identity"
+        subtitle={
+          !identity?.owner.verified && !verifiedIdentity
+            ? "Provide the company owner's passport number."
+            : undefined
+        }
+        status={
+          verifiedIdentity
+            ? identity?.owner.verified
+              ? "done"
+              : identity?.faydaRequired
+                ? "blocked"
+                : "todo"
+            : (watch("ownerPassportNumber")?.trim()?.length ?? 0) > 0
+              ? "done"
+              : identity?.passportRequired
+                ? "blocked"
+                : "todo"
+        }
+      >
+        {identity && (
+          <>
+            <FaydaVerifyPanel
+              subject="owner"
+              title="Owner"
+              state={identity.owner}
+              required={identity.faydaRequired}
+            />
+            {identity.passportRequired && (
+              <TextInput
+                label="Owner Passport Number"
+                placeholder="P1234567"
+                error={errors.ownerPassportNumber?.message}
+                {...register("ownerPassportNumber")}
+              />
+            )}
+          </>
+        )}
+      </StepSection>
+
+      <StepSection
+        index={3}
+        title="Company TIN"
+        subtitle="We'll pull your registration straight from eTrade — nothing to type by hand once it's found."
+        status={
+          tinVerified ? "done" : tinStatus === "taken" ? "blocked" : "todo"
+        }
+      >
+        <ETradeInfo
+          tin={watch("tinNumber")}
+          register={register("tinNumber")}
+          error={errors.tinNumber?.message}
+          onDataLoaded={onETradeDataLoaded}
+          onStatusChange={onETradeStatusChange}
+          onReset={onETradeReset}
+          alreadyVerified={hasRegistrationDetails}
+        />
+        {tinVerified && (
+          <ETradeCompanyCard
+            tin={watch("tinNumber")}
+            register={register}
+            watch={watch}
+            errors={errors}
+            control={control}
+          />
+        )}
+      </StepSection>
+    </Stack>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/ContactStep.tsx b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/ContactStep.tsx
new file mode 100644
index 000000000..e5d16ea5f
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/ContactStep.tsx
@@ -0,0 +1,79 @@
+import { SimpleGrid, Text, TextInput } from "@mantine/core";
+import type { UseFormReturn } from "react-hook-form";
+
+import { ControlledPhoneField } from "@/components/PhoneField";
+
+import type { FormData } from "../schema";
+import { LinkCheckboxCard } from "../LinkCheckboxCard";
+
+export interface ContactStepProps {
+  form: UseFormReturn<FormData>;
+  /**
+   * The GM's name from whichever source established them (verification or form)
+   * — the "same as GM" card only makes sense once there is a GM.
+   */
+  gmName?: string;
+  contactSameAsGm: boolean;
+  onToggleContactSameAsGm: (checked: boolean) => void;
+}
+
+export default function ContactStep({
+  form,
+  gmName,
+  contactSameAsGm,
+  onToggleContactSameAsGm,
+}: ContactStepProps) {
+  const {
+    register,
+    control,
+    formState: { errors },
+  } = form;
+
+  return (
+    <>
+      <Text fw={600} size="sm" c="edr-text">
+        Contact Person
+      </Text>
+      {/* `gmName`, not the raw form field: a Fayda-verified GM never
+          fills `generalManagerName`, so gating on it hid this card from
+          every Ethiopian company — the majority case. */}
+      {gmName && (
+        <LinkCheckboxCard
+          checked={contactSameAsGm}
+          onToggle={onToggleContactSameAsGm}
+          title="Same as General Manager"
+          description="Reuse the general manager's name, email and phone. Uncheck to enter different details."
+        />
+      )}
+      <SimpleGrid cols={2} spacing="md">
+        <TextInput
+          label="Name"
+          placeholder="Jane Smith"
+          error={errors.contactPersonName?.message}
+          {...register("contactPersonName")}
+        />
+        <TextInput
+          label="Position (Optional)"
+          placeholder="Operations Lead"
+          error={errors.contactPersonPosition?.message}
+          {...register("contactPersonPosition")}
+        />
+      </SimpleGrid>
+      <SimpleGrid cols={2} spacing="md">
+        <TextInput
+          label="Email (Optional)"
+          type="email"
+          placeholder="contact@company.com"
+          error={errors.contactPersonEmail?.message}
+          {...register("contactPersonEmail")}
+        />
+        <ControlledPhoneField
+          control={control}
+          name="contactPersonPhone"
+          label="Phone"
+          required
+        />
+      </SimpleGrid>
+    </>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/DocumentsStep.tsx b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/DocumentsStep.tsx
new file mode 100644
index 000000000..162e46af8
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/DocumentsStep.tsx
@@ -0,0 +1,64 @@
+import { Group, Loader, Text } from "@mantine/core";
+
+import { SmartFileInput } from "@edr/ui-common";
+import RoleLicenseStep, {
+  type RoleLicenseProfile,
+} from "@/components/onboarding/RoleLicenseStep";
+import type { FileUploadSetting } from "@/types/fileUploadSettings";
+
+export interface DocumentsStepProps {
+  loadingDocuments: boolean;
+  /** Nationality document set, minus the PoA delegation letter (its own step). */
+  documentsSetting?: FileUploadSetting;
+  documentFiles: Record<string, File | File[] | null>;
+  uploadedDocumentKeys?: string[];
+  documentFieldErrors: Record<string, string>;
+  onDocumentFilesChange: (next: Record<string, File | File[] | null>) => void;
+  roleProfiles?: RoleLicenseProfile[];
+  licenseFiles?: Record<string, File[]>;
+  licenseFieldErrors: Record<string, string>;
+  onLicenseFilesChange: (next: Record<string, File[]>) => void;
+}
+
+export default function DocumentsStep({
+  loadingDocuments,
+  documentsSetting,
+  documentFiles,
+  uploadedDocumentKeys,
+  documentFieldErrors,
+  onDocumentFilesChange,
+  roleProfiles,
+  licenseFiles,
+  licenseFieldErrors,
+  onLicenseFilesChange,
+}: DocumentsStepProps) {
+  return (
+    <>
+      {loadingDocuments ? (
+        <Group justify="center" py="xl">
+          <Loader size="sm" color="edr-green" />
+        </Group>
+      ) : !documentsSetting ? (
+        <Text size="sm" c="edr-muted" ta="center" py="md">
+          No document requirements found for your account type.
+        </Text>
+      ) : (
+        <SmartFileInput
+          file={documentsSetting}
+          value={documentFiles}
+          uploadedKeys={uploadedDocumentKeys}
+          errors={documentFieldErrors}
+          containerClassName="lg:grid grid-cols-2 items-stretch"
+          onChange={onDocumentFilesChange}
+        />
+      )}
+
+      <RoleLicenseStep
+        profiles={roleProfiles ?? []}
+        value={licenseFiles ?? {}}
+        onChange={onLicenseFilesChange}
+        errors={licenseFieldErrors}
+      />
+    </>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/PersonnelStep.tsx b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/PersonnelStep.tsx
new file mode 100644
index 000000000..d3324e0a7
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/PersonnelStep.tsx
@@ -0,0 +1,150 @@
+import { SimpleGrid, Text, TextInput } from "@mantine/core";
+import type { UseFormReturn } from "react-hook-form";
+
+import { ControlledPhoneField } from "@/components/PhoneField";
+import FaydaVerifyPanel from "@/components/FaydaVerifyPanel";
+import type { CompanyIdentityState } from "@/services/verifayda.service";
+
+import type { FormData } from "../schema";
+import { LinkCheckboxCard } from "../LinkCheckboxCard";
+
+export interface PersonnelStepProps {
+  form: UseFormReturn<FormData>;
+  identity?: CompanyIdentityState;
+  /** eTrade-registered owner, once a TIN lookup has succeeded. */
+  etradeOwner: { name: string; phone: string } | null;
+  gmSameAsOwner: boolean;
+  onToggleGmSameAsOwner: (checked: boolean) => void;
+  /** A server-side "same as owner" declaration is in flight. */
+  gmLinkPending: boolean;
+  gmVerified: boolean;
+  /**
+   * Which of the manager's contact details their Fayda verification did not
+   * supply, and are therefore typed here. Computed by CompanyProfileForm, which
+   * requires exactly these in the schema.
+   */
+  gaps: { name: boolean; email: boolean; phone: boolean };
+}
+
+export default function PersonnelStep({
+  form,
+  identity,
+  etradeOwner,
+  gmSameAsOwner,
+  onToggleGmSameAsOwner,
+  gmLinkPending,
+  gmVerified,
+  gaps,
+}: PersonnelStepProps) {
+  const {
+    register,
+    control,
+    formState: { errors },
+  } = form;
+
+  return (
+    <>
+      <Text fw={600} size="sm" c="edr-text">
+        General Manager
+      </Text>
+      {/* The GM is very often the owner. Where the owner is
+          Fayda-verified this reuses that proven identity outright
+          rather than making the same human verify twice; where the
+          owner is backed by a typed passport there is nothing proven
+          to copy, so it stays a local prefill. */}
+      <LinkCheckboxCard
+        checked={gmSameAsOwner}
+        onToggle={onToggleGmSameAsOwner}
+        title={
+          identity?.owner.verified
+            ? "Same as verified owner"
+            : "Same as business owner"
+        }
+        description={
+          identity?.owner.verified
+            ? "Reuse the Fayda-verified owner's identity for the general manager. Uncheck to verify a different person."
+            : etradeOwner
+              ? "Reuse the eTrade-registered owner's name, plus the company email and phone as you entered them. Uncheck to enter different details."
+              : "Reuse your account's name and the company email and phone as you entered them. Uncheck to enter different details."
+        }
+      />
+
+      {/* Verifying a second person is only meaningful when the GM is
+          someone other than the owner. */}
+      {!gmSameAsOwner && identity && (
+        <FaydaVerifyPanel
+          subject="gm"
+          title="General Manager"
+          state={identity.gm}
+          required={identity.faydaRequired}
+          disabled={gmLinkPending}
+        />
+      )}
+
+      {/* Fayda's name, email and phone claims are all optional, and the
+          manager's own verification has no account to fall back on the way the
+          owner's does — the person onboarding is not necessarily the manager.
+          Whatever the verification left empty is typed here, and required:
+          without it the submit fails on "Add your general manager name" with no
+          field anywhere to satisfy it. */}
+      {gaps.name && (
+        <TextInput
+          label="Name"
+          placeholder="Abebe Bikila"
+          error={errors.generalManagerName?.message}
+          {...register("generalManagerName")}
+        />
+      )}
+      {(gaps.email || gaps.phone) && (
+        <SimpleGrid cols={gaps.email && gaps.phone ? 2 : 1} spacing="md">
+          {gaps.email && (
+            <TextInput
+              label="Email"
+              type="email"
+              placeholder="gm@company.com"
+              error={errors.generalManagerEmail?.message}
+              {...register("generalManagerEmail")}
+            />
+          )}
+          {gaps.phone && (
+            <ControlledPhoneField
+              control={control}
+              name="generalManagerPhone"
+              label="Phone"
+              required
+            />
+          )}
+        </SimpleGrid>
+      )}
+
+      {/* Typed details survive only where Fayda cannot be required —
+          a foreign company's manager may hold no Fayda ID. Once
+          verified the API owns these fields, so they go away. */}
+      {!gmSameAsOwner && !gmVerified && !identity?.faydaRequired && (
+        <>
+          <TextInput
+            label="Name"
+            placeholder="Abebe Bikila"
+            error={errors.generalManagerName?.message}
+            {...register("generalManagerName")}
+          />
+          <SimpleGrid cols={2} spacing="md">
+            <TextInput
+              label="Email"
+              type="email"
+              placeholder="gm@company.com"
+              error={errors.generalManagerEmail?.message}
+              {...register("generalManagerEmail")}
+            />
+            <ControlledPhoneField
+              control={control}
+              name="generalManagerPhone"
+              label="Phone"
+              required
+            />
+          </SimpleGrid>
+        </>
+      )}
+    </>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/PoaStep.tsx b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/PoaStep.tsx
new file mode 100644
index 000000000..efece363b
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/accounts/companyProfileForm/steps/PoaStep.tsx
@@ -0,0 +1,217 @@
+import { Button, Divider, Group, SimpleGrid, Text, TextInput } from "@mantine/core";
+import { Trash2 } from "lucide-react";
+import type { UseFormReturn } from "react-hook-form";
+
+import { SmartFileInput } from "@edr/ui-common";
+import { ControlledPhoneField } from "@/components/PhoneField";
+import FaydaVerifyPanel from "@/components/FaydaVerifyPanel";
+import type { FileUploadSetting } from "@/types/fileUploadSettings";
+import type { CompanyIdentityState } from "@/services/verifayda.service";
+
+import type { FormData } from "../schema";
+import { LinkCheckboxCard } from "../LinkCheckboxCard";
+
+export interface PoaStepProps {
+  form: UseFormReturn<FormData>;
+  identity?: CompanyIdentityState;
+  /** This company holds a freight-forwarder profile, so the PoA is mandatory. */
+  requirePoa: boolean;
+  /** The owner represents the company themselves. */
+  poaSameAsOwner: boolean;
+  onTogglePoaSameAsOwner: (checked: boolean) => void;
+  /** A server-side "same as owner" declaration is in flight. */
+  poaLinkPending: boolean;
+  /** eTrade-registered owner, once a TIN lookup has succeeded. */
+  etradeOwner: { name: string; phone: string } | null;
+  /**
+   * Which of the representative's details the Fayda verification did not
+   * supply, and are therefore typed here. Computed by CompanyProfileForm, which
+   * requires exactly these in the schema — so every input rendered below is one
+   * the customer is actually asked to fill.
+   */
+  gaps: { name: boolean; email: boolean; phone: boolean; address: boolean };
+  /** Drop a verified representative the company decided against. */
+  onRemovePoa: () => void;
+  removePending: boolean;
+  /** The DARS delegation paper is owed (a PoA exists, or the company forwards). */
+  delegationRequired: boolean;
+  /** Single-field upload setting carrying just the delegation letter. */
+  poaDocumentSetting?: FileUploadSetting;
+  documentFiles: Record<string, File | File[] | null>;
+  uploadedDocumentKeys?: string[];
+  documentFieldErrors: Record<string, string>;
+  onDocumentFilesChange: (next: Record<string, File | File[] | null>) => void;
+}
+
+export default function PoaStep({
+  form,
+  identity,
+  requirePoa,
+  poaSameAsOwner,
+  onTogglePoaSameAsOwner,
+  poaLinkPending,
+  etradeOwner,
+  gaps,
+  onRemovePoa,
+  removePending,
+  delegationRequired,
+  poaDocumentSetting,
+  documentFiles,
+  uploadedDocumentKeys,
+  documentFieldErrors,
+  onDocumentFilesChange,
+}: PoaStepProps) {
+  const {
+    register,
+    control,
+    formState: { errors },
+  } = form;
+
+  // Fayda's email/phone/address claims are optional and routinely come back
+  // empty, so a *verified* representative can still be missing the email and
+  // phone the API demands from a freight forwarder (`REQUIRED_POA_FIELDS`) —
+  // and the panel above renders no input for them, which dead-ends the step on
+  // "Add the poa email first". `gaps` is exactly what the verification did not
+  // supply: the API keeps those keys typeable, since a claim that returned
+  // nothing owns no value to protect (`faydaOwnedKeys`).
+  const needsEmail = gaps.email;
+  const needsPhone = gaps.phone;
+
+  // Fayda is mandatory for an Ethiopian company's representative, so there the
+  // link can only reuse a proven owner — with none there would be nothing to
+  // copy and the declaration could never satisfy the gate. A foreign company's
+  // owner is backed by a typed passport, so it prefills instead.
+  const linkNeedsVerifiedOwner =
+    (identity?.faydaRequired ?? false) && !identity?.owner.verified;
+
+  return (
+    <>
+      <Text size="sm" c="edr-muted">
+        {requirePoa
+          ? "As a freight forwarder you act on other companies' behalf, so Power of Attorney details are required."
+          : "Power of Attorney details are optional. Fill them in if you have them, or skip to continue."}{" "}
+        {poaSameAsOwner
+          ? "You represent the company yourself, so no delegation paper is needed."
+          : "If the representative is someone other than the owner, upload the delegation paper authenticated by DARS."}
+      </Text>
+
+      {/* An owner who represents their own company is the ordinary
+          small-business case. Where the owner is Fayda-verified this reuses
+          that proven identity outright rather than sending the same human
+          through Fayda twice; where they are backed by a typed passport there
+          is nothing proven to copy, so it stays a local prefill. Either way it
+          is the declaration that waives the DARS paper. */}
+      {identity && (
+        <LinkCheckboxCard
+          checked={poaSameAsOwner}
+          onToggle={onTogglePoaSameAsOwner}
+          disabled={poaLinkPending || (linkNeedsVerifiedOwner && !poaSameAsOwner)}
+          title={
+            identity.owner.verified
+              ? "Same as verified owner"
+              : "Same as business owner"
+          }
+          description={
+            linkNeedsVerifiedOwner
+              ? "Verify the company owner with Fayda first — then you can reuse that identity here."
+              : identity.owner.verified
+                ? "You represent the company yourself. Reuses the Fayda-verified owner's identity, and no DARS delegation paper is needed. Uncheck to name someone else."
+                : etradeOwner
+                  ? "You represent the company yourself. Reuses the eTrade-registered owner's name plus the company email and phone as you entered them, and no DARS delegation paper is needed. Uncheck to name someone else."
+                  : "You represent the company yourself. Reuses your account's name, email and phone, and no DARS delegation paper is needed. Uncheck to name someone else."
+          }
+        />
+      )}
+
+      {/* A representative acts for the company inside Ethiopia
+          whoever owns it, so the PoA is proven with Fayda regardless of
+          nationality — their name, email, phone and address all come
+          from the verification and are never typed here. Verifying a second
+          person is only meaningful when the representative is not the owner. */}
+      {identity && !poaSameAsOwner && (
+        <FaydaVerifyPanel
+          subject="poa"
+          title="Power of Attorney"
+          state={identity.poa}
+          required={requirePoa}
+          disabled={poaLinkPending}
+        />
+      )}
+      {/* A verification cannot be undone by clearing the form — it owns those
+          fields — and its mere existence makes the delegation paper due, which
+          then blocks the submit. So an optional representative needs a way
+          back out, here rather than only in settings (unreachable until
+          onboarding finishes). */}
+      {identity?.poa.verified && !requirePoa && !poaSameAsOwner && (
+        <Group justify="flex-end">
+          <Button
+            type="button"
+            variant="subtle"
+            color="red"
+            size="xs"
+            loading={removePending}
+            leftSection={<Trash2 size={14} />}
+            onClick={onRemovePoa}
+          >
+            Remove this representative
+          </Button>
+        </Group>
+      )}
+      {/* Whatever the Fayda claim did carry is shown on the panel above and
+          is never typed here — the verification owns it. */}
+      {gaps.name && (
+        <TextInput
+          label="Representative's Name"
+          placeholder="Abebe Bikila"
+          error={errors.poaName?.message}
+          {...register("poaName")}
+        />
+      )}
+      {(needsEmail || needsPhone) && (
+        <SimpleGrid cols={needsEmail && needsPhone ? 2 : 1} spacing="md">
+          {needsEmail && (
+            <TextInput
+              label="Representative's Email"
+              type="email"
+              placeholder="poa@company.com"
+              error={errors.poaEmail?.message}
+              {...register("poaEmail")}
+            />
+          )}
+          {needsPhone && (
+            <ControlledPhoneField
+              control={control}
+              name="poaPhone"
+              label="Representative's Phone"
+            />
+          )}
+        </SimpleGrid>
+      )}
+      {gaps.address && (
+        <TextInput
+          label="PoA Location"
+          placeholder="City, Country"
+          error={errors.poaLocation?.message}
+          {...register("poaLocation")}
+        />
+      )}
+
+      {/* The paper authorises the representative, so it shows once one
+          exists — or straight away for a freight forwarder, who owes it
+          either way and must not be failed on submit for a file the
+          step never offered. */}
+      {delegationRequired && poaDocumentSetting && (
+        <>
+          <Divider my="sm" />
+          <SmartFileInput
+            file={poaDocumentSetting}
+            value={documentFiles}
+            uploadedKeys={uploadedDocumentKeys}
+            errors={documentFieldErrors}
+            onChange={onDocumentFilesChange}
+          />
+        </>
+      )}
+    </>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/billing/InvoiceDetailPage.tsx b/apps/edr-freight-web/portal/src/pages/billing/InvoiceDetailPage.tsx
index 775d9fe41..78116013e 100644
--- a/apps/edr-freight-web/portal/src/pages/billing/InvoiceDetailPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/billing/InvoiceDetailPage.tsx
@@ -3,6 +3,7 @@ import { useNavigate, useParams } from "react-router-dom";
 import { useQuery } from "@tanstack/react-query";
 import {
   Alert,
+  Badge,
   Box,
   Button,
   Center,
@@ -21,6 +22,7 @@ import {
   CreditCard,
   Download,
   ExternalLink,
+  Landmark,
   Receipt,
 } from "lucide-react";
 import toast from "react-hot-toast";
@@ -30,6 +32,7 @@ import { invoicesService } from "@/services/invoices.service";
 import { useInvoicePayment } from "@/hooks/useInvoicePayment";
 import { warehouseInvoicesService } from "@/services/warehouse-invoices.service";
 import { PaymentMethodModal } from "@/pages/bookings/BookingDetailPage/components/PaymentMethodModal";
+import { isUsdCurrency } from "@/pages/bookings/payments/offline-payment";
 import { saveBlob } from "@/utils/download";
 import { formatCurrency } from "@/lib/currency";
 import { BORDER, INK, MUTED } from "../contracts/contract-ui";
@@ -224,7 +227,7 @@ export default function InvoiceDetailPage() {
                 Receipt
               </Button>
             )}
-            {payable && (
+            {payable && !isUsdCurrency(invoice.currency) && (
               <Button
                 color="edr-green"
                 radius="md"
@@ -239,6 +242,18 @@ export default function InvoiceDetailPage() {
                 Pay {formatCurrency(amountDue, invoice.currency)}
               </Button>
             )}
+            {payable && isUsdCurrency(invoice.currency) && (
+              <Badge
+                size="lg"
+                radius="md"
+                variant="light"
+                color="yellow"
+                leftSection={<Landmark size={12} />}
+                styles={{ label: { textTransform: "none", fontWeight: 700 } }}
+              >
+                Pay by bank transfer — send the slip to Finance
+              </Badge>
+            )}
           </Group>
         </Group>
 
diff --git a/apps/edr-freight-web/portal/src/pages/billing/InvoicesList.tsx b/apps/edr-freight-web/portal/src/pages/billing/InvoicesList.tsx
index e1d45857f..6e9e98a2c 100644
--- a/apps/edr-freight-web/portal/src/pages/billing/InvoicesList.tsx
+++ b/apps/edr-freight-web/portal/src/pages/billing/InvoicesList.tsx
@@ -32,6 +32,7 @@ import { Freight } from "@edr/types";
 
 import { api } from "@/services/api";
 import { formatCurrency } from "@/lib/currency";
+import { isUsdCurrency } from "@/pages/bookings/payments/offline-payment";
 import {
   BORDER,
   GREEN,
@@ -276,7 +277,10 @@ export default function InvoicesList() {
                 {!isLoading &&
                   !isError &&
                   pageRows.map((inv) => {
-                    const payable = isPayable(inv.status);
+                    // USD invoices are paid by bank transfer — the detail page
+                    // shows the instructions, so the row action reads "View".
+                    const payable =
+                      isPayable(inv.status) && !isUsdCurrency(inv.currency);
                     return (
                       <Table.Tr
                         key={inv.id}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ChangesRequestedView.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ChangesRequestedView.tsx
index 6b4c8927d..6ae046f1d 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ChangesRequestedView.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ChangesRequestedView.tsx
@@ -1,18 +1,30 @@
 import {
   Alert,
+  Box,
   Button,
   Group,
   Modal,
   Stack,
   Text,
   TextInput,
+  UnstyledButton,
 } from "@mantine/core";
 import { useMutation, useQuery } from "@tanstack/react-query";
-import { AlertCircle, Send, XCircle } from "lucide-react";
+import {
+  AlertCircle,
+  CalendarDays,
+  ChevronRight,
+  Package,
+  Pencil,
+  Send,
+  XCircle,
+} from "lucide-react";
+import type { ReactNode } from "react";
 import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import { api } from "@/services/api";
+import { bookingsService } from "@/services/bookings.service";
 import type { Freight } from "@edr/types";
 
 import { PriceChangeModal } from "@/pages/bookings/resubmit/PriceChangeModal";
@@ -25,13 +37,55 @@ import { CompanyInfoCard } from "./components/CompanyInfoCard";
 import { ContainersCard } from "./components/ContainersCard";
 import { ContractInfoCard } from "./components/ContractInfoCard";
 import { ActionRequiredBanner, MutationErrors } from "./components/Notices";
-import { PageHeader } from "./components/PageHeader";
+import { HeaderButton, PageHeader } from "./components/PageHeader";
 import { EstimateCard } from "./components/pricing";
 import { ScheduleCard } from "./components/ScheduleCard";
 import { ShipmentDetailsCard } from "./components/ShipmentDetailsCard";
 import { StatusHero } from "./components/StatusHero";
 import { SupportCard } from "./components/SupportCard";
 
+/** Row linking straight to one section of the edit-booking form. */
+function EditLink({
+  icon,
+  title,
+  description,
+  onClick,
+}: {
+  icon: ReactNode;
+  title: string;
+  description: string;
+  onClick: () => void;
+}) {
+  return (
+    <UnstyledButton
+      onClick={onClick}
+      p="sm"
+      style={{
+        border: "1px solid #E6ECF2",
+        borderRadius: 12,
+        width: "100%",
+      }}
+    >
+      <Group gap="sm" wrap="nowrap" align="flex-start">
+        <Box mt={2} c="#0A6F4D">
+          {icon}
+        </Box>
+        <Box style={{ flex: 1, minWidth: 0 }}>
+          <Text fz={13.5} fw={700} c="#10202F">
+            {title}
+          </Text>
+          <Text fz={12} c="#6B7C8E" mt={2}>
+            {description}
+          </Text>
+        </Box>
+        <Box mt={2} c="#9AA8B5">
+          <ChevronRight size={16} />
+        </Box>
+      </Group>
+    </UnstyledButton>
+  );
+}
+
 /**
  * Detail-page view for a booking staff returned with CHANGES_REQUESTED.
  *
@@ -64,8 +118,9 @@ export function ChangesRequestedView({
     null) as Freight.PricingBreakdown | null;
 
   const cancelMutation = useMutation({
+    // Customer-facing cancel endpoint — the plain /cancel route is staff-only.
     mutationFn: (reason: string) =>
-      api.bookings.cancel.call({ id: booking.id, reason }),
+      bookingsService.customerCancel(booking.id, reason),
     onSuccess: () => {
       setCancelDialogOpen(false);
       onBookingUpdated();
@@ -76,17 +131,21 @@ export function ChangesRequestedView({
     <PageShell>
       <PageHeader
         booking={booking}
-        menuActions={{
-          onCancel: () => setCancelDialogOpen(true),
-          onSupport: () => navigate("/support"),
-        }}
+        actions={
+          <HeaderButton
+            red
+            icon={<XCircle size={16} />}
+            label="Cancel booking"
+            onClick={() => setCancelDialogOpen(true)}
+          />
+        }
       />
 
       <MutationErrors mutations={[...flow.mutations, cancelMutation]} />
 
       <StatusHero booking={booking}>
         {booking.latestChangeRequestNote ? (
-          <ActionRequiredBanner title="Review the requested changes, then resubmit.">
+          <ActionRequiredBanner title="Review the requested changes, update the booking if needed, then resubmit.">
             {booking.latestChangeRequestNote}
           </ActionRequiredBanner>
         ) : undefined}
@@ -101,6 +160,41 @@ export function ChangesRequestedView({
 
             <ContractInfoCard booking={booking} />
 
+            <SectionCard>
+              <CardTitle>Fix your booking</CardTitle>
+              <Text fz="12.5px" c="#6B7C8E" mt={4} mb="md">
+                Staff asked for changes on this booking. Update whatever needs
+                fixing below, then resubmit for review — the booking stays in
+                place, no need to start over.
+              </Text>
+              <Stack gap={8}>
+                <EditLink
+                  icon={<Package size={16} />}
+                  title="Cargo & containers"
+                  description="Add or remove containers, change container type, quantity or VGM — or for bulk cargo, change the commodity and tonnage."
+                  onClick={() =>
+                    navigate(`/bookings/${booking.id}/edit?section=cargo`)
+                  }
+                />
+                <EditLink
+                  icon={<CalendarDays size={16} />}
+                  title="Schedule date"
+                  description="Pick a different departure day — only days with an open schedule on your route can be selected."
+                  onClick={() =>
+                    navigate(`/bookings/${booking.id}/edit?section=schedule`)
+                  }
+                />
+                <EditLink
+                  icon={<Pencil size={16} />}
+                  title="Route, service & other details"
+                  description="Change the origin or destination yard, service type, trucking options or notes."
+                  onClick={() =>
+                    navigate(`/bookings/${booking.id}/edit?section=service`)
+                  }
+                />
+              </Stack>
+            </SectionCard>
+
             <SectionCard>
               <Group justify="space-between" align="center" mb="md">
                 <CardTitle>Your documents</CardTitle>
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/DraftBookingView.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/DraftBookingView.tsx
index 277bd1a24..cc9084d85 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/DraftBookingView.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/DraftBookingView.tsx
@@ -24,7 +24,10 @@ import { useNavigate } from "react-router-dom";
 
 import { api } from "@/services/api";
 import { downloadStoredFile } from "@/services/files.service";
-import type { SubmitBookingResponse } from "@/services/bookings.service";
+import {
+  bookingsService,
+  type SubmitBookingResponse,
+} from "@/services/bookings.service";
 import type { Freight } from "@edr/types";
 
 import { REQUIRED_DOC_FIELDS } from "./constants";
@@ -42,6 +45,7 @@ import { StatusHero } from "./components/StatusHero";
 import { StepGhostButton, StepLine } from "./components/Steps";
 import { SupportCard } from "./components/SupportCard";
 import { BodyGrid } from "./components/layout";
+import { formatAmount } from "./utils";
 
 export function DraftBookingView({
   booking,
@@ -116,8 +120,9 @@ export function DraftBookingView({
   });
 
   const cancelMutation = useMutation({
+    // Customer-facing cancel endpoint — the plain /cancel route is staff-only.
     mutationFn: (reason: string) =>
-      api.bookings.cancel.call({ id: booking.id, reason }),
+      bookingsService.customerCancel(booking.id, reason),
     onSuccess: () => {
       setCancelDialogOpen(false);
       onBookingUpdated();
@@ -157,17 +162,21 @@ export function DraftBookingView({
       <PageHeader
         booking={booking}
         actions={
-          <HeaderButton
-            dark
-            icon={<Pencil size={16} />}
-            label="Continue editing"
-            onClick={() => navigate(`/bookings/${booking.id}/edit`)}
-          />
+          <Group gap={8} wrap="nowrap">
+            <HeaderButton
+              dark
+              icon={<Pencil size={16} />}
+              label="Continue editing"
+              onClick={() => navigate(`/bookings/${booking.id}/edit`)}
+            />
+            <HeaderButton
+              red
+              icon={<XCircle size={16} />}
+              label="Cancel"
+              onClick={() => setCancelDialogOpen(true)}
+            />
+          </Group>
         }
-        menuActions={{
-          onCancel: () => setCancelDialogOpen(true),
-          onSupport: () => navigate("/support"),
-        }}
       />
 
       <MutationErrors
@@ -431,7 +440,7 @@ export function DraftBookingView({
                   Previous total
                 </Text>
                 <Text size="sm" td="line-through">
-                  {priceChangeModal.previousTotalAmount.toLocaleString()}{" "}
+                  {formatAmount(priceChangeModal.previousTotalAmount)}{" "}
                   {priceChangeModal.currency}
                 </Text>
               </Group>
@@ -439,7 +448,7 @@ export function DraftBookingView({
             <Group justify="space-between">
               <Text fw={700}>New total</Text>
               <Text fw={800} c="edr-green">
-                {priceChangeModal.totalAmount.toLocaleString()}{" "}
+                {formatAmount(priceChangeModal.totalAmount)}{" "}
                 {priceChangeModal.currency}
               </Text>
             </Group>
@@ -451,7 +460,7 @@ export function DraftBookingView({
                       {item.description}
                     </Text>
                     <Text size="sm" fw={600}>
-                      {item.amount.toLocaleString()} {item.currency}
+                      {formatAmount(item.amount)} {item.currency}
                     </Text>
                   </Group>
                 ))}
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 b26a6562a..0ff719a7c 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
@@ -1,15 +1,21 @@
-import { Group, Tabs } from "@mantine/core";
+import { Button, Group, Modal, Stack, Tabs, Text } from "@mantine/core";
+import { useMutation } from "@tanstack/react-query";
 import {
   Clock,
   CreditCard,
   FileText,
   LayoutGrid,
   Package,
+  TrainFront,
   Truck,
+  XCircle,
 } from "lucide-react";
+import { useState } from "react";
+import toast from "react-hot-toast";
 import { useNavigate } from "react-router-dom";
 
 import { useFileViewer } from "@/hooks/useFileViewer";
+import { bookingsService } from "@/services/bookings.service";
 import type { Freight } from "@edr/types";
 
 import { ApproveDeliveryButton } from "../delivery/ApproveDeliveryButton";
@@ -28,6 +34,7 @@ import { MileSummaryCard } from "./components/MileSummaryCard";
 import { BodyGrid, PageShell } from "./components/layout";
 import {
   CancelledBanner,
+  ActionRequiredBanner,
   ConsolidationPairedNotice,
   ConsolidationWaitingBanner,
 } from "./components/Notices";
@@ -41,9 +48,33 @@ import { ShipmentDetailsCard } from "./components/ShipmentDetailsCard";
 import { ShipmentTrackingCard } from "./components/ShipmentTrackingCard";
 import { StatusHero } from "./components/StatusHero";
 import { SupportCard } from "./components/SupportCard";
+import { WagonCancellationCard } from "./components/WagonCancellationCard";
+import { WagonsTab } from "./components/WagonsTab";
 import { fmtDate, isNegative, priceTotal } from "./utils";
 import { useScrollToHash } from "@/hooks/useScrollToHash";
 import { useBookingPayment } from "@/pages/bookings/payments/useBookingPayment";
+import { isUsdOfflineBooking } from "@/pages/bookings/payments/offline-payment";
+
+// Pre-payment statuses the customer may self-cancel from this view (free of
+// charge). DRAFT / CHANGES_REQUESTED render their own views and drafts can
+// simply be deleted; anything at or past payment must go through support.
+const CUSTOMER_CANCELLABLE_STATUSES = [
+  "SUBMITTED",
+  "PRICE_CHANGED_PENDING_CONFIRM",
+  "PENDING_APPROVAL",
+  "CONTRACT_READY",
+  "OPERATION_REQUEST_PENDING",
+  "SELECTED_FOR_BATCH",
+];
+
+const cancelErrorMessage = (error: unknown) => {
+  const data = (
+    error as { response?: { data?: { message?: string | string[] } } }
+  )?.response?.data;
+  if (Array.isArray(data?.message)) return data.message.join(", ");
+  if (data?.message) return data.message;
+  return "Could not cancel the booking. Please try again.";
+};
 
 export function ReadonlyBookingView({
   booking,
@@ -71,6 +102,23 @@ export function ReadonlyBookingView({
   // and handles redirect vs CAC Bank OTP.
   const pay = useBookingPayment(booking.id);
 
+  const [cancelOpen, setCancelOpen] = useState(false);
+  const cancelMutation = useMutation({
+    mutationFn: () => bookingsService.customerCancel(booking.id),
+    onSuccess: () => {
+      setCancelOpen(false);
+      toast.success(
+        "Your booking has been cancelled — no cancellation fee was charged.",
+        { duration: 6000 },
+      );
+      onBookingUpdated?.();
+    },
+    onError: (e) => toast.error(cancelErrorMessage(e)),
+  });
+  const canCancel =
+    booking.paymentStatus !== "PAID" &&
+    CUSTOMER_CANCELLABLE_STATUSES.includes(status);
+
   const pricing = booking.pricingBreakdown;
   // A general contract is paid once it's FULLY_EXECUTED (signed) — it never
   // enters batch selection. A one-time booking can only pay once it's been
@@ -117,6 +165,9 @@ export function ReadonlyBookingView({
     "DOCUMENTS_UNDER_REVIEW",
     "CLEARANCE_READY",
     "OPERATION_REQUESTED",
+    // Operations returned the order — same card hosts the pick-a-new-day +
+    // resubmit flow.
+    "OPERATION_CHANGES_REQUESTED",
   ].includes(status);
   // Paired: a consolidation partner was found and the booking resumed the normal
   // flow. Surface the "partner found" reassurance only in the early stages,
@@ -124,18 +175,21 @@ export function ReadonlyBookingView({
   const showPairedNotice =
     !!booking.consolidationPartnerId &&
     ["SUBMITTED", "PENDING_APPROVAL", "CHANGES_REQUESTED"].includes(status);
+  // Wagons exist only after payment puts the booking on a train; before that
+  // the tab would always be an empty state, so it stays hidden.
+  const showWagonsTab = booking.paymentStatus === "PAID" && !isNegative(status);
 
   return (
     <PageShell>
       <PageHeader
         booking={booking}
         actions={
-          (canApproveDelivery || (canPay && !showCountdown)) && (
+          (canApproveDelivery || (canPay && !showCountdown) || canCancel) && (
             <Group gap={8} wrap="nowrap">
               {canApproveDelivery && (
                 <ApproveDeliveryButton bookingId={booking.id} />
               )}
-              {canPay && !showCountdown && (
+              {canPay && !showCountdown && !isUsdOfflineBooking(booking) && (
                 <HeaderButton
                   green
                   icon={<CreditCard size={16} />}
@@ -143,13 +197,17 @@ export function ReadonlyBookingView({
                   onClick={pay.open}
                 />
               )}
+              {canCancel && (
+                <HeaderButton
+                  red
+                  icon={<XCircle size={16} />}
+                  label="Cancel booking"
+                  onClick={() => setCancelOpen(true)}
+                />
+              )}
             </Group>
           )
         }
-        menuActions={{
-          onRebook: canSelfRebook ? onRebook : undefined,
-          onSupport: () => navigate("/support"),
-        }}
       />
 
       {isNegative(status) ? (
@@ -182,7 +240,14 @@ export function ReadonlyBookingView({
           priceLabel={pricing ? priceTotal(pricing) : undefined}
         />
       ) : (
-        <StatusHero booking={booking} />
+        <StatusHero booking={booking}>
+          {status === "OPERATION_CHANGES_REQUESTED" &&
+          booking.latestChangeRequestNote ? (
+            <ActionRequiredBanner title="Operations requested changes — pick a new shipment day and resubmit.">
+              {booking.latestChangeRequestNote}
+            </ActionRequiredBanner>
+          ) : undefined}
+        </StatusHero>
       )}
 
       {showPairedNotice && <ConsolidationPairedNotice />}
@@ -210,6 +275,11 @@ export function ReadonlyBookingView({
           <Tabs.Tab value="cargo" leftSection={<Package size={15} />}>
             Cargo
           </Tabs.Tab>
+          {showWagonsTab && (
+            <Tabs.Tab value="wagons" leftSection={<TrainFront size={15} />}>
+              Wagons
+            </Tabs.Tab>
+          )}
           <Tabs.Tab value="logistics" leftSection={<Truck size={15} />}>
             Logistics
           </Tabs.Tab>
@@ -257,6 +327,11 @@ export function ReadonlyBookingView({
                     title="Consignment & Schedule"
                     consignment
                   />
+                  {/* Renders only on PAID + paid + contract-backed bookings. */}
+                  <WagonCancellationCard
+                    booking={booking}
+                    onBookingUpdated={onBookingUpdated}
+                  />
                   <CompanyInfoCard booking={booking} />
                   <SupportCard />
                 </>
@@ -269,6 +344,20 @@ export function ReadonlyBookingView({
           <CargoTab booking={booking} />
         </Tabs.Panel>
 
+        {showWagonsTab && (
+          <Tabs.Panel value="wagons">
+            <WagonsTab
+              bookingId={booking.id}
+              cancellable={
+                booking.status === "PAID" &&
+                booking.paymentStatus === "PAID" &&
+                Boolean(booking.contractId)
+              }
+              onCancellationRequested={onBookingUpdated}
+            />
+          </Tabs.Panel>
+        )}
+
         <Tabs.Panel value="logistics">
           <div className="flex flex-col gap-6">
             <BodyGrid
@@ -313,6 +402,52 @@ export function ReadonlyBookingView({
         bill={pay.bill}
         onConfirm={pay.confirm}
       />
+      <Modal
+        opened={cancelOpen}
+        onClose={() => setCancelOpen(false)}
+        title={
+          <Text fw={800} fz={18} c="#10202F">
+            Cancel this booking?
+          </Text>
+        }
+        centered
+        radius={16}
+      >
+        <Stack gap="md">
+          <Text size="sm" c="#475569">
+            You&apos;re about to cancel booking{" "}
+            <Text span fw={700} c="#10202F">
+              {booking.reference}
+            </Text>
+            . Since you haven&apos;t paid yet,{" "}
+            <Text span fw={700}>
+              no cancellation fee
+            </Text>{" "}
+            will be charged
+            {status === "SELECTED_FOR_BATCH"
+              ? ", and your reserved wagon space will be released immediately"
+              : ""}
+            . This cannot be undone.
+          </Text>
+          <Group justify="flex-end" gap={8}>
+            <Button
+              variant="default"
+              radius={10}
+              onClick={() => setCancelOpen(false)}
+            >
+              Keep booking
+            </Button>
+            <Button
+              color="red"
+              radius={10}
+              loading={cancelMutation.isPending}
+              onClick={() => cancelMutation.mutate()}
+            >
+              Cancel booking
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
       {viewer}
     </PageShell>
   );
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/booking-detail-types.ts b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/booking-detail-types.ts
index 7479e758d..95bc57640 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/booking-detail-types.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/booking-detail-types.ts
@@ -35,6 +35,8 @@ export interface BookingContainerLineDetail {
   isOverweight?: boolean;
   overweightExcessTons?: number | string | null;
   containerNumber?: string | null;
+  /** Size (ft) as stored on the line ("20"/"40") — the wagon-cancellation key. */
+  containerSize?: string | null;
   containerType?: {
     code: string;
     label?: string | null;
@@ -75,6 +77,12 @@ export type BookingDetail = Freight.IBooking & {
     reference: string;
     status: string;
   } | null;
+  /** The allocated train, present once the booking is placed on a schedule. */
+  trainSchedule?: {
+    trainNumber: string | null;
+    reference: string | null;
+    scheduledDepartureDate: string | null;
+  } | null;
 };
 
 /**
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx
index d921308d0..b94ea9fed 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx
@@ -17,9 +17,16 @@ import type { Freight } from "@edr/types";
 import { invoicesService, type PortalInvoice } from "@/services/invoices.service";
 import { InvoiceStatusBadge, titleCase } from "@/pages/billing/invoice-ui";
 import { paymentStatusLabel } from "@/pages/bookings/booking-display";
+import { isUsdOfflineBooking } from "@/pages/bookings/payments/offline-payment";
 import { saveBlob } from "@/utils/download";
 
-import { fmtDate, priceLineItems, priceTotal, type Pricing } from "../utils";
+import {
+  fmtDate,
+  formatAmount,
+  priceLineItems,
+  priceTotal,
+  type Pricing,
+} from "../utils";
 import { CardTitle, SectionCard } from "./layout";
 
 const Divider = () => <Box my={16} h={1} w="100%" bg="#EEF2F6" />;
@@ -190,12 +197,13 @@ export function BookingPaymentPanel({
 }) {
   const navigate = useNavigate();
   const paid = booking.paymentStatus === "PAID";
+  const offlineUsd = isUsdOfflineBooking(booking);
   const isAdjusted =
     booking.adjustedTotalAmount !== null &&
     booking.adjustedTotalAmount !== undefined;
   const currency = pricing?.currency ?? booking.paymentCurrency;
   const total = isAdjusted
-    ? `${Number(booking.adjustedTotalAmount).toLocaleString()} ${currency}`
+    ? `${formatAmount(booking.adjustedTotalAmount)} ${currency}`
     : priceTotal(pricing);
   const items = priceLineItems(pricing);
 
@@ -268,11 +276,36 @@ export function BookingPaymentPanel({
         <PartialOfferNotice offer={booking.activeBatchOffer} />
       )}
 
+      {/* USD: no online payment — bank transfer + slip to Finance, who confirm
+          the payment (backoffice flow lands in a later phase). Shown for any
+          unpaid USD booking, with or without an open pay window. */}
+      {!paid && offlineUsd && (
+        <Box
+          mt={14}
+          p={14}
+          style={{
+            borderRadius: 10,
+            backgroundColor: "#FEF6E6",
+            border: "1px solid #F3E2B8",
+          }}
+        >
+          <Text fz="13px" fw={800} c="#9A5B00">
+            Pay by bank transfer
+          </Text>
+          <Text mt={4} fz="12.5px" c="#7A5A1E" lh={1.55}>
+            Online payment isn&apos;t available for USD bookings. Transfer the
+            total amount to EDR&apos;s bank account before the payment deadline,
+            then send the payment slip to the EDR Finance department — they
+            will confirm your payment.
+          </Text>
+        </Box>
+      )}
+
       {showCountdown && booking.paymentDeadline && (
         <Box mt={16}>
           <Countdown
             deadline={booking.paymentDeadline}
-            onPay={onPay}
+            onPay={offlineUsd ? undefined : onPay}
             paying={paying}
           />
           {showConsolidationNote && (
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ClearanceCard.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ClearanceCard.tsx
index e5ea8d3a9..3002356f7 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ClearanceCard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ClearanceCard.tsx
@@ -51,7 +51,12 @@ export function ClearanceCard({ booking }: { booking: Freight.IBooking }) {
   }
 
   const summary =
-    status === "CLEARANCE_READY" ? (
+    status === "OPERATION_CHANGES_REQUESTED" ? (
+      <Alert color="yellow" radius="md" icon={<Clock size={18} />}>
+        Operations returned this order for changes. Update the booking details,
+        pick a new shipment day and resubmit.
+      </Alert>
+    ) : status === "CLEARANCE_READY" ? (
       <Alert color="teal" radius="md" icon={<CheckCircle2 size={18} />}>
         {`${
           booking.customsClearingEnabled
@@ -103,9 +108,11 @@ export function ClearanceCard({ booking }: { booking: Freight.IBooking }) {
       {summary}
 
       <Text fz="12.5px" c="dimmed" mt="sm">
-        {isBookAction
-          ? "Use “Book” to enter the cargo details and schedule your shipment."
-          : `Use “${action?.label ?? "the action button"}” to manage your ${docNoun}.`}
+        {status === "OPERATION_CHANGES_REQUESTED"
+          ? "Use “Change booking” to update the details and pick a new shipment day."
+          : isBookAction
+            ? "Use “Book” to enter the cargo details and schedule your shipment."
+            : `Use “${action?.label ?? "the action button"}” to manage your ${docNoun}.`}
       </Text>
 
       {!isBookAction && (
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PageHeader.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PageHeader.tsx
index 455b71a69..95cfeab11 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PageHeader.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PageHeader.tsx
@@ -1,14 +1,5 @@
-import { ActionIcon, Button, Group, Menu, Stack, Text } from "@mantine/core";
-import {
-  ArrowDownLeft,
-  ArrowUpRight,
-  Edit2,
-  FileText,
-  HelpCircle,
-  MoreHorizontal,
-  RefreshCw,
-  XCircle,
-} from "lucide-react";
+import { Button, Group, Stack, Text } from "@mantine/core";
+import { ArrowDownLeft, ArrowUpRight } from "lucide-react";
 import type { ReactNode } from "react";
 
 import type { Freight } from "@edr/types";
@@ -20,22 +11,12 @@ import {
 
 import { bookingSubtitle, isDraftLike, isNegative } from "../utils";
 
-export interface PageHeaderMenuActions {
-  onViewContract?: () => void;
-  onCancel?: () => void;
-  onEdit?: () => void;
-  onSupport?: () => void;
-  onRebook?: () => void;
-}
-
 export function PageHeader({
   booking,
   actions,
-  menuActions,
 }: {
   booking: Freight.IBooking;
   actions?: ReactNode;
-  menuActions?: PageHeaderMenuActions;
 }) {
   const status = booking.status as string;
   const negative = isNegative(status);
@@ -47,8 +28,6 @@ export function PageHeader({
   const pillText = negative ? "#A93226" : draft ? "#475569" : "#0A6F4D";
   const isExport = booking.tradeDirection === "EXPORT";
 
-  const hasMenu = menuActions && Object.values(menuActions).some(Boolean);
-
   return (
     <Group justify="space-between" align="flex-start" wrap="wrap" gap="md">
       <Stack gap={8} miw={0}>
@@ -83,66 +62,6 @@ export function PageHeader({
 
       <Group gap={8} wrap="nowrap" align="center">
         {actions}
-        {hasMenu && (
-          <Menu shadow="md" radius={12} position="bottom-end">
-            <Menu.Target>
-              <ActionIcon
-                variant="default"
-                size={42}
-                radius={10}
-                aria-label="More options"
-              >
-                <MoreHorizontal size={18} />
-              </ActionIcon>
-            </Menu.Target>
-            <Menu.Dropdown miw={210}>
-              {menuActions!.onViewContract && (
-                <Menu.Item
-                  leftSection={<FileText size={15} />}
-                  onClick={menuActions!.onViewContract}
-                >
-                  View contract
-                </Menu.Item>
-              )}
-              {menuActions!.onEdit && (
-                <Menu.Item
-                  leftSection={<Edit2 size={15} />}
-                  onClick={menuActions!.onEdit}
-                >
-                  Edit
-                </Menu.Item>
-              )}
-              {menuActions!.onSupport && (
-                <Menu.Item
-                  leftSection={<HelpCircle size={15} />}
-                  onClick={menuActions!.onSupport}
-                >
-                  Contact customer support
-                </Menu.Item>
-              )}
-              {menuActions!.onRebook && (
-                <Menu.Item
-                  leftSection={<RefreshCw size={15} />}
-                  onClick={menuActions!.onRebook}
-                >
-                  Rebook similar schedule
-                </Menu.Item>
-              )}
-              {menuActions!.onCancel && (
-                <>
-                  <Menu.Divider />
-                  <Menu.Item
-                    color="red"
-                    leftSection={<XCircle size={15} />}
-                    onClick={menuActions!.onCancel}
-                  >
-                    Cancel booking
-                  </Menu.Item>
-                </>
-              )}
-            </Menu.Dropdown>
-          </Menu>
-        )}
       </Group>
     </Group>
   );
@@ -154,6 +73,7 @@ export function HeaderButton({
   onClick,
   dark,
   green,
+  red,
   disabled,
 }: {
   label: string;
@@ -161,6 +81,7 @@ export function HeaderButton({
   onClick?: () => void;
   dark?: boolean;
   green?: boolean;
+  red?: boolean;
   disabled?: boolean;
 }) {
   return (
@@ -169,14 +90,14 @@ export function HeaderButton({
       disabled={disabled}
       leftSection={icon}
       radius={10}
-      variant={green || dark ? "filled" : "default"}
-      color={green ? "edr-green" : dark ? "#0C1A2B" : undefined}
+      variant={green || dark ? "filled" : red ? "outline" : "default"}
+      color={green ? "edr-green" : dark ? "#0C1A2B" : red ? "red" : undefined}
       styles={{
         root: { height: 42, paddingInline: 16 },
         label: {
           fontSize: 13,
           fontWeight: 700,
-          color: green || dark ? "#fff" : "#10202F",
+          color: green || dark ? "#fff" : red ? undefined : "#10202F",
         },
       }}
     >
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PaymentMethodModal.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PaymentMethodModal.tsx
index a57dd0a9d..f4f1c7c3c 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PaymentMethodModal.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/PaymentMethodModal.tsx
@@ -25,17 +25,21 @@ interface ProviderOption {
   currencies: string[];
   accent: string;
 }
+ 
 
-// Only Telebirr, Waafi, CAC Bank and CBE bill payment are enabled for now.
+
+// ponytail: ETB pays via CBE bill only for now — restore the Telebirr entry
+// ({ method: "TELEBIRR", currencies: ["ETB"] }) when mobile money returns.
 const PROVIDERS: ProviderOption[] = [
-  {
-    method: "TELEBIRR",
-    label: "telebirr",
-    description: "Ethiopian mobile money · ETB",
-    logo: "/assets/telebirr.jpeg",
-    currencies: ["ETB"],
-    accent: "#0A6F4D",
-  },
+  // {
+  //  {
+  //   method: "TELEBIRR",
+  //   label: "telebirr",
+  //   description: "Ethiopian mobile money · ETB",
+  //   logo: "/assets/telebirr.jpeg",
+  //   currencies: ["ETB"],
+  //   accent: "#0A6F4D",
+  // },
   {
     method: "WAAFI",
     label: "Waafi",
@@ -55,7 +59,7 @@ const PROVIDERS: ProviderOption[] = [
     method: "CBE_BILL",
     label: "CBE bill payment",
     description: "Pay at any CBE branch, app or USSD · ETB",
-    logo: "/assets/edr-logo.png",
+    logo: "/assets/cbe.png",
     currencies: ["ETB"],
     accent: "#5B2D8C",
   },
@@ -69,8 +73,8 @@ const OTP_LENGTH = 4;
 const isBillMethod = (method: PaymentMethod) => method === "CBE_BILL";
 
 /**
- * Pick the provider that settles in the booking's currency. USD → Waafi,
- * ETB → Telebirr. Falls back to the first provider when unknown.
+ * Pick the provider that settles in the booking's currency. USD → Waafi/CAC,
+ * ETB → CBE bill. Falls back to the full list when unknown.
  */
 function providersForCurrency(currency?: string | null): ProviderOption[] {
   const cur = currency?.trim().toUpperCase();
@@ -190,7 +194,7 @@ export function PaymentMethodModal({
   onClose: () => void;
   /** Human-readable total, e.g. "ETB 12,500". */
   amountLabel?: string;
-  /** Booking payment currency — drives which provider is shown (USD → Waafi, ETB → Telebirr). */
+  /** Booking payment currency — drives which provider is shown (USD → Waafi/CAC, ETB → CBE bill). */
   currency?: string | null;
   onConfirm: (method: PaymentMethod, payerAccount?: string) => void;
   processing?: boolean;
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ScheduleCard.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ScheduleCard.tsx
index ab11da3a0..0d8df5cee 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ScheduleCard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/ScheduleCard.tsx
@@ -65,6 +65,12 @@ export function ScheduleCard({
   const service = serviceTypeLabel(booking);
   const equipmentReturn =
     booking.equipmentReturn === "WITH_RETURN" ? "With return" : "Without return";
+  const schedule = booking.trainSchedule;
+  const trainLabel = schedule?.trainNumber
+    ? `Train ${schedule.trainNumber}${schedule.reference ? ` · ${schedule.reference}` : ""}`
+    : schedule?.reference
+      ? `Schedule ${schedule.reference}`
+      : "Track shipment";
   const assignedTrain: Row = booking.trainScheduleId
     ? {
         label: "Assigned train",
@@ -85,7 +91,7 @@ export function ScheduleCard({
               fontSize: 13,
             }}
           >
-            <MapPin size={13} /> Track shipment
+            <MapPin size={13} /> {trainLabel}
           </button>
         ),
       }
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WagonCancellationCard.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WagonCancellationCard.tsx
new file mode 100644
index 000000000..05e7ed8d8
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WagonCancellationCard.tsx
@@ -0,0 +1,496 @@
+import {
+  Alert,
+  Box,
+  Button,
+  Group,
+  Modal,
+  NumberInput,
+  Stack,
+  Table,
+  Text,
+  Textarea,
+} from "@mantine/core";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { CheckCircle2, Clock, CreditCard, TrainTrack } from "lucide-react";
+import { useMemo, useState } from "react";
+import toast from "react-hot-toast";
+import { Link, useNavigate } from "react-router-dom";
+
+import type { Freight } from "@edr/types";
+
+import { api } from "@/services/api";
+import {
+  bookingsService,
+  type RequestWagonCancellationPayload,
+  type WagonCancellation,
+  type WagonCancellationPreview,
+} from "@/services/bookings.service";
+import { OperationDatePicker } from "@/pages/bookings/clearance";
+import { useFeeInvoicePayment } from "@/pages/bookings/payments/useBookingPayment";
+
+import type { BookingDetail } from "../booking-detail-types";
+import { fmtDate, formatAmount } from "../utils";
+import { CardTitle, SectionCard } from "./layout";
+import { PaymentMethodModal } from "./PaymentMethodModal";
+
+// Same pill treatment as WagonsTab's STATUS_TONES so the page reads as one.
+const STATUS_TONES: Record<
+  WagonCancellation["status"],
+  { bg: string; color: string; label: string }
+> = {
+  FEE_PENDING: { bg: "#FFFBEB", color: "#92400E", label: "Fee pending" },
+  CREDIT_AVAILABLE: { bg: "#EAF1FE", color: "#1E40AF", label: "Credit available" },
+  REBOOKED: { bg: "#E8F5EF", color: "#0A6F4D", label: "Rebooked" },
+  WITHDRAWN: { bg: "#F1F4F7", color: "#475569", label: "Withdrawn" },
+  EXPIRED: { bg: "#FEF2F2", color: "#B91C1C", label: "Expired" },
+};
+
+function StatusPill({ status }: { status: WagonCancellation["status"] }) {
+  const tone = STATUS_TONES[status] ?? STATUS_TONES.WITHDRAWN;
+  return (
+    <Text
+      component="span"
+      fz={11}
+      fw={700}
+      px={9}
+      py={3}
+      style={{ borderRadius: 999, backgroundColor: tone.bg, color: tone.color }}
+    >
+      {tone.label}
+    </Text>
+  );
+}
+
+const fmtMoney = (amount: number | string, currency: string) =>
+  `${formatAmount(amount)} ${currency}`;
+
+const apiErrorMessage = (error: unknown, fallback: string) => {
+  const data = (
+    error as { response?: { data?: { message?: string | string[] } } }
+  )?.response?.data;
+  if (Array.isArray(data?.message)) return data.message.join(", ");
+  if (data?.message) return data.message;
+  return fallback;
+};
+
+const th = { color: "#9AA8B5", fontSize: 11 } as const;
+
+/**
+ * Partial wagon cancellation on a PAID contract booking: request a cut (fee
+ * previewed first), pay the cancellation fee, then rebook the freed credit
+ * onto another shipment day — plus the booking's cancellation history.
+ * Wagons leave the schedule at request time; the fee settles the credit.
+ */
+export function WagonCancellationCard({
+  booking,
+  onBookingUpdated,
+}: {
+  booking: Freight.IBooking;
+  onBookingUpdated?: () => void;
+}) {
+  const navigate = useNavigate();
+  const status = booking.status as string;
+  const eligible =
+    status === "PAID" &&
+    (booking.paymentStatus as string) === "PAID" &&
+    !!booking.contractId;
+
+  const isBulk = booking.freightType === "BULK";
+  const detail = booking as BookingDetail;
+  // The entity field the API serializes on the detail read; not on the DTO type.
+  const wagonsRequired = Number(
+    (booking as { wagonsRequired?: number | string | null }).wagonsRequired ?? 0,
+  );
+
+  // Live units per container size ("20"/"40"), summed across lines.
+  const containerLines = useMemo(() => {
+    const bySize = new Map<string, number>();
+    for (const line of detail.bookingContainers ?? []) {
+      const size =
+        line.containerSize ??
+        (line.containerType?.sizeFt != null
+          ? String(line.containerType.sizeFt)
+          : null);
+      if (!size) continue;
+      bySize.set(size, (bySize.get(size) ?? 0) + Number(line.quantity ?? 0));
+    }
+    return [...bySize.entries()].map(([containerSize, quantity]) => ({
+      containerSize,
+      quantity,
+    }));
+  }, [detail.bookingContainers]);
+
+  const { data, refetch } = useQuery({
+    ...api.bookings.listWagonCancellations.queryOptions({
+      input: { bookingId: booking.id },
+    }),
+    enabled: eligible,
+  });
+  // History includes rows where this booking is the rebooked TARGET — only
+  // rows this booking opened itself can be paid/withdrawn/rebooked from here.
+  const rows = data?.items ?? [];
+  const ownRows = rows.filter((r) => r.bookingId === booking.id);
+  const openRow = ownRows.find((r) => r.status === "FEE_PENDING");
+  const creditRow = ownRows.find((r) => r.status === "CREDIT_AVAILABLE");
+
+  const feePay = useFeeInvoicePayment(booking.id);
+
+  // ── Request modal state ──
+  const [modalOpen, setModalOpen] = useState(false);
+  const [wagons, setWagons] = useState<number | string>(1);
+  const [cancelBySize, setCancelBySize] = useState<Record<string, number>>({});
+  const [reason, setReason] = useState("");
+  const [preview, setPreview] = useState<WagonCancellationPreview | null>(null);
+
+  const closeModal = () => {
+    setModalOpen(false);
+    setWagons(1);
+    setCancelBySize({});
+    setReason("");
+    setPreview(null);
+  };
+
+  const requestPayload = (): RequestWagonCancellationPayload | null => {
+    const trimmedReason = reason.trim();
+    if (isBulk) {
+      const n = Number(wagons);
+      if (!n || n <= 0) return null;
+      return { wagons: n, ...(trimmedReason ? { reason: trimmedReason } : {}) };
+    }
+    const containers = containerLines
+      .map((l) => ({
+        containerSize: l.containerSize,
+        quantity: cancelBySize[l.containerSize] ?? 0,
+      }))
+      .filter((c) => c.quantity > 0);
+    if (!containers.length) return null;
+    return { containers, ...(trimmedReason ? { reason: trimmedReason } : {}) };
+  };
+  const payload = requestPayload();
+
+  const previewMutation = useMutation({
+    mutationFn: (body: RequestWagonCancellationPayload) =>
+      bookingsService.previewWagonCancellation(booking.id, body),
+    onSuccess: setPreview,
+    onError: (e) => {
+      setPreview(null);
+      toast.error(apiErrorMessage(e, "Could not calculate the fee. Please try again."));
+    },
+  });
+
+  const requestMutation = useMutation({
+    mutationFn: (body: RequestWagonCancellationPayload) =>
+      bookingsService.requestWagonCancellation(booking.id, body),
+    onSuccess: () => {
+      closeModal();
+      toast.success(
+        "Cancellation requested — pay the fee to release the wagons.",
+        { duration: 6000 },
+      );
+      void refetch();
+      onBookingUpdated?.();
+    },
+    onError: (e) =>
+      toast.error(
+        apiErrorMessage(e, "Could not request the cancellation. Please try again."),
+      ),
+  });
+
+  const withdrawMutation = useMutation({
+    mutationFn: () => bookingsService.withdrawWagonCancellation(openRow!.id),
+    onSuccess: () => {
+      toast.success("Cancellation withdrawn — the fee invoice was voided.");
+      void refetch();
+      onBookingUpdated?.();
+    },
+    onError: (e) =>
+      toast.error(
+        apiErrorMessage(e, "Could not withdraw the cancellation. Please try again."),
+      ),
+  });
+
+  const [rebookDate, setRebookDate] = useState("");
+  const rebookMutation = useMutation({
+    mutationFn: () =>
+      bookingsService.rebookWagonCancellation(creditRow!.id, {
+        scheduledDate: rebookDate,
+      }),
+    onSuccess: ({ bookingId }) => {
+      toast.success("Wagons rebooked — taking you to the new booking.", {
+        duration: 6000,
+      });
+      navigate(`/bookings/${bookingId}`);
+    },
+    onError: (e) =>
+      toast.error(apiErrorMessage(e, "Could not rebook the wagons. Please try again.")),
+  });
+
+  if (!eligible) return null;
+
+  return (
+    <SectionCard>
+      <Group justify="space-between" align="center" mb="sm">
+        <CardTitle>Wagon Cancellation</CardTitle>
+        {!openRow && !creditRow && (
+          <Button
+            variant="default"
+            radius="md"
+            leftSection={<TrainTrack size={16} />}
+            onClick={() => setModalOpen(true)}
+          >
+            Cancel wagons
+          </Button>
+        )}
+      </Group>
+
+      {openRow ? (
+        <Stack gap="sm">
+          <Alert color="yellow" radius="md" icon={<Clock size={18} />}>
+            A cancellation of {Number(openRow.wagonsCancelled)} wagon(s) is
+            awaiting its fee of{" "}
+            <Text span fw={700}>
+              {fmtMoney(openRow.feeAmount, openRow.feeCurrency)}
+            </Text>
+            . The cancelled wagons have left the train. Pay the fee to unlock
+            the rebooking credit, or withdraw the request to get the wagons
+            back — withdrawing works only while the train still has free space
+            for them.
+          </Alert>
+          <Group gap={8}>
+            <Button
+              color="edr-green"
+              radius="md"
+              leftSection={<CreditCard size={16} />}
+              onClick={feePay.open}
+            >
+              Pay cancellation fee
+            </Button>
+            <Button
+              variant="default"
+              radius="md"
+              loading={withdrawMutation.isPending}
+              onClick={() => withdrawMutation.mutate()}
+            >
+              Withdraw request
+            </Button>
+          </Group>
+        </Stack>
+      ) : creditRow ? (
+        <Stack gap="sm">
+          <Alert color="teal" radius="md" icon={<CheckCircle2 size={18} />}>
+            {Number(creditRow.wagonsCancelled)} wagon(s) were released — a
+            credit of{" "}
+            <Text span fw={700}>
+              {fmtMoney(creditRow.creditAmount, booking.paymentCurrency)}
+            </Text>{" "}
+            is available. Pick a shipment day to rebook them as a new paid
+            booking (no further payment needed).
+          </Alert>
+          <OperationDatePicker
+            bookingId={booking.id}
+            value={rebookDate}
+            onChange={setRebookDate}
+          />
+          <Group justify="flex-end">
+            <Button
+              color="edr-green"
+              radius="md"
+              disabled={!rebookDate}
+              loading={rebookMutation.isPending}
+              onClick={() => rebookMutation.mutate()}
+            >
+              Rebook wagons
+            </Button>
+          </Group>
+        </Stack>
+      ) : (
+        <Text fz={13} c="#475569">
+          Need fewer wagons than you paid for? Cancel part of this booking for
+          a per-wagon fee — the freed freight amount becomes a credit you can
+          rebook onto another shipment day.
+        </Text>
+      )}
+
+      {rows.length > 0 && (
+        <Box style={{ overflowX: "auto" }} mt="md">
+          <Table verticalSpacing={6} horizontalSpacing="sm">
+            <Table.Thead>
+              <Table.Tr>
+                <Table.Th style={th}>Date</Table.Th>
+                <Table.Th style={th}>Wagons</Table.Th>
+                <Table.Th style={th}>Fee</Table.Th>
+                <Table.Th style={th}>Status</Table.Th>
+                <Table.Th style={th}>Rebooked as</Table.Th>
+              </Table.Tr>
+            </Table.Thead>
+            <Table.Tbody>
+              {rows.map((r) => (
+                <Table.Tr key={r.id}>
+                  <Table.Td>
+                    <Text fz={12.5} c="#475569">
+                      {fmtDate(r.createdAt)}
+                    </Text>
+                  </Table.Td>
+                  <Table.Td>
+                    <Text fz={12.5} fw={700} c="#10202F">
+                      {Number(r.wagonsCancelled)}
+                    </Text>
+                  </Table.Td>
+                  <Table.Td>
+                    <Text fz={12.5} c="#475569">
+                      {fmtMoney(r.feeAmount, r.feeCurrency)}
+                    </Text>
+                  </Table.Td>
+                  <Table.Td>
+                    <StatusPill status={r.status} />
+                  </Table.Td>
+                  <Table.Td>
+                    {r.rebookedBookingId ? (
+                      <Text
+                        component={Link}
+                        to={`/bookings/${r.rebookedBookingId}`}
+                        fz={12.5}
+                        fw={700}
+                        c="#0A6F4D"
+                        style={{ textDecoration: "underline" }}
+                      >
+                        {r.rebookedBooking?.reference ?? "View booking"}
+                      </Text>
+                    ) : (
+                      <Text fz={12.5} c="#9AA8B5">
+                        —
+                      </Text>
+                    )}
+                  </Table.Td>
+                </Table.Tr>
+              ))}
+            </Table.Tbody>
+          </Table>
+        </Box>
+      )}
+
+      <PaymentMethodModal
+        opened={feePay.modalOpen}
+        onClose={feePay.close}
+        amountLabel={
+          openRow ? fmtMoney(openRow.feeAmount, openRow.feeCurrency) : undefined
+        }
+        currency={openRow?.feeCurrency}
+        processing={feePay.processing}
+        error={feePay.error}
+        otp={feePay.otp}
+        bill={feePay.bill}
+        onConfirm={feePay.confirm}
+      />
+
+      <Modal
+        opened={modalOpen}
+        onClose={closeModal}
+        title={
+          <Text fw={800} fz={18} c="#10202F">
+            Cancel wagons
+          </Text>
+        }
+        centered
+        radius={16}
+      >
+        <Stack gap="md">
+          <Text size="sm" c="#475569">
+            Choose how much of booking{" "}
+            <Text span fw={700} c="#10202F">
+              {booking.reference}
+            </Text>{" "}
+            to cancel. A per-wagon fee applies; once it&apos;s paid the wagons
+            are released and the freed amount becomes a rebooking credit. At
+            least one wagon must remain — to cancel everything, cancel the
+            whole booking instead.
+          </Text>
+
+          {isBulk ? (
+            <NumberInput
+              label="Wagons to cancel"
+              min={1}
+              max={wagonsRequired > 1 ? wagonsRequired - 1 : undefined}
+              allowDecimal={false}
+              value={wagons}
+              onChange={(v) => {
+                setWagons(v);
+                setPreview(null);
+              }}
+            />
+          ) : (
+            containerLines.map((line) => (
+              <NumberInput
+                key={line.containerSize}
+                label={`${line.containerSize}ft containers to cancel`}
+                description={`${line.quantity} on this booking`}
+                min={0}
+                max={line.quantity}
+                allowDecimal={false}
+                value={cancelBySize[line.containerSize] ?? 0}
+                onChange={(v) => {
+                  setCancelBySize((prev) => ({
+                    ...prev,
+                    [line.containerSize]: Number(v) || 0,
+                  }));
+                  setPreview(null);
+                }}
+              />
+            ))
+          )}
+
+          <Textarea
+            label="Reason (optional)"
+            placeholder="Why are these wagons no longer needed?"
+            autosize
+            minRows={2}
+            value={reason}
+            onChange={(e) => setReason(e.currentTarget.value)}
+          />
+
+          {preview && (
+            <Alert color="blue" radius="md">
+              <Text fz={13}>
+                Cancelling{" "}
+                <Text span fw={700}>
+                  {preview.wagons} wagon(s)
+                </Text>{" "}
+                (~{preview.weightTons} t) costs a fee of{" "}
+                <Text span fw={700}>
+                  {fmtMoney(preview.feeAmount, preview.feeCurrency)}
+                </Text>{" "}
+                ({fmtMoney(preview.feePerWagon, preview.feeCurrency)} per
+                wagon) and frees a rebooking credit of{" "}
+                <Text span fw={700}>
+                  {fmtMoney(preview.creditAmount, booking.paymentCurrency)}
+                </Text>
+                .
+              </Text>
+            </Alert>
+          )}
+
+          <Group justify="flex-end" gap={8}>
+            <Button
+              variant="default"
+              radius={10}
+              disabled={!payload}
+              loading={previewMutation.isPending}
+              onClick={() => payload && previewMutation.mutate(payload)}
+            >
+              Calculate fee
+            </Button>
+            <Button
+              color="red"
+              radius={10}
+              disabled={!payload}
+              loading={requestMutation.isPending}
+              onClick={() => payload && requestMutation.mutate(payload)}
+            >
+              Request cancellation
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+    </SectionCard>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WagonsTab.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WagonsTab.tsx
new file mode 100644
index 000000000..89df714d6
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WagonsTab.tsx
@@ -0,0 +1,792 @@
+import {
+  Alert,
+  Box,
+  Button,
+  Checkbox,
+  Group,
+  Modal,
+  SimpleGrid,
+  Skeleton,
+  Stack,
+  Table,
+  Text,
+  Textarea,
+  Tooltip,
+} from "@mantine/core";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  Container,
+  Gauge,
+  MapPin,
+  Package,
+  Route,
+  Scale,
+  TrainFront,
+  TrainTrack,
+} from "lucide-react";
+import { useState, type ReactNode } from "react";
+import toast from "react-hot-toast";
+
+import {
+  bookingsService,
+  type BookingWagonAllocation,
+  type WagonCancellation,
+  type WagonCancellationPreview,
+} from "@/services/bookings.service";
+import { api } from "@/services/api";
+
+import { fmtDate, fmtWeight } from "../utils";
+import { CardTitle, SectionCard } from "./layout";
+
+const CANCEL_TONES: Record<
+  string,
+  { bg: string; color: string; border: string; label: string; hint: string }
+> = {
+  FEE_PENDING: {
+    bg: "#FFFBEB",
+    color: "#92400E",
+    border: "#FDE68A",
+    label: "Cancelled — fee unpaid",
+    hint: "These wagons left the train. Pay the cancellation fee to turn them into a rebooking credit, or withdraw to get them back (needs free space).",
+  },
+  CREDIT_AVAILABLE: {
+    bg: "#E6F7F2",
+    color: "#0A6F4D",
+    border: "#B7E6D6",
+    label: "Cancelled — credit ready",
+    hint: "Fee paid. Pick a new shipment day in the wagon cancellation card to rebook these — no new freight charge.",
+  },
+  REBOOKED: {
+    bg: "#E8F5EF",
+    color: "#0A6F4D",
+    border: "#B7E6D6",
+    label: "Rebooked",
+    hint: "These wagons ride again on the rebooked shipment.",
+  },
+};
+
+/** Cancelled wagons + their cargo, categorized by cancellation state. */
+function CancelledWagonsSection({ rows }: { rows: WagonCancellation[] }) {
+  const visible = rows.filter((r) => CANCEL_TONES[r.status]);
+  if (!visible.length) return null;
+  return (
+    <SectionCard>
+      <CardTitle>Cancelled wagons</CardTitle>
+      <Stack gap="sm" mt="sm">
+        {visible.map((r) => {
+          const tone = CANCEL_TONES[r.status];
+          const units = r.cancelledQuantities.units ?? [];
+          return (
+            <Box
+              key={r.id}
+              p={12}
+              style={{
+                borderRadius: 10,
+                backgroundColor: tone.bg,
+                border: `1px solid ${tone.border}`,
+              }}
+            >
+              <Group justify="space-between" align="center" wrap="wrap" gap={6}>
+                <Text fz={13.5} fw={800} style={{ color: tone.color }}>
+                  {Number(r.wagonsCancelled)} wagon(s) — {tone.label}
+                </Text>
+                <Text fz={12} c="#6B7C8E">
+                  {fmtDate(r.createdAt)}
+                  {r.rebookedBooking
+                    ? ` · new booking ${r.rebookedBooking.reference}`
+                    : ""}
+                </Text>
+              </Group>
+              {units.length > 0 && (
+                <Group gap={6} mt={6} wrap="wrap">
+                  {units.map((u) => (
+                    <Text
+                      key={u.containerNumber}
+                      component="span"
+                      fz={11.5}
+                      fw={700}
+                      px={8}
+                      py={2}
+                      style={{
+                        borderRadius: 6,
+                        backgroundColor: "white",
+                        border: `1px solid ${tone.border}`,
+                        color: tone.color,
+                        fontFamily: "monospace",
+                      }}
+                    >
+                      {u.containerNumber} · {u.containerSize}ft
+                    </Text>
+                  ))}
+                </Group>
+              )}
+              {!units.length && r.cancelledQuantities.bulkTons != null && (
+                <Text fz={12.5} mt={4} style={{ color: tone.color }}>
+                  {Number(r.cancelledQuantities.bulkTons).toLocaleString()} tons of
+                  bulk cargo
+                </Text>
+              )}
+              <Text fz={12} c="#6B7C8E" mt={6}>
+                {tone.hint}
+              </Text>
+            </Box>
+          );
+        })}
+      </Stack>
+    </SectionCard>
+  );
+}
+
+const apiErrorMessage = (error: unknown, fallback: string) => {
+  const data = (
+    error as { response?: { data?: { message?: string | string[] } } }
+  )?.response?.data;
+  if (Array.isArray(data?.message)) return data.message.join(", ");
+  if (data?.message) return data.message;
+  return fallback;
+};
+
+// Mirrors CargoTab's local Flag/StatTile look so the two tabs read as one page.
+const STATUS_TONES: Record<
+  BookingWagonAllocation["status"],
+  { bg: string; color: string; label: string }
+> = {
+  PLANNED: { bg: "#F1F4F7", color: "#475569", label: "Planned" },
+  RESERVED: { bg: "#FFFBEB", color: "#92400E", label: "Reserved" },
+  LOADED: { bg: "#E8F5EF", color: "#0A6F4D", label: "Loaded" },
+  DEPARTED: { bg: "#EAF1FE", color: "#1E40AF", label: "Departed" },
+};
+
+function StatusPill({ status }: { status: BookingWagonAllocation["status"] }) {
+  const tone = STATUS_TONES[status] ?? STATUS_TONES.PLANNED;
+  return (
+    <Text
+      component="span"
+      fz={11}
+      fw={700}
+      px={9}
+      py={3}
+      style={{ borderRadius: 999, backgroundColor: tone.bg, color: tone.color }}
+    >
+      {tone.label}
+    </Text>
+  );
+}
+
+function StatTile({
+  icon,
+  label,
+  value,
+  sub,
+}: {
+  icon: ReactNode;
+  label: string;
+  value: string;
+  sub?: string;
+}) {
+  return (
+    <Box
+      p={14}
+      style={{
+        borderRadius: 12,
+        border: "1px solid #E6ECF2",
+        backgroundColor: "#FAFCFE",
+      }}
+    >
+      <Group gap={6} align="center" mb={6} c="#6B7C8E">
+        {icon}
+        <Text fz="11px" fw={700} tt="uppercase" style={{ letterSpacing: "0.05em" }}>
+          {label}
+        </Text>
+      </Group>
+      <Text fz={18} fw={800} c="#10202F" truncate>
+        {value}
+      </Text>
+      {sub && (
+        <Text fz={12} c="#9AA8B5" mt={2}>
+          {sub}
+        </Text>
+      )}
+    </Box>
+  );
+}
+
+/** Little consist strip: locomotive + one box per wagon, in marshalling order. */
+function ConsistStrip({ wagons }: { wagons: BookingWagonAllocation[] }) {
+  return (
+    <Box style={{ overflowX: "auto" }} pb={4}>
+      <Group gap={5} wrap="nowrap" align="flex-end">
+        <Box
+          px={10}
+          py={8}
+          style={{
+            borderRadius: "10px 4px 4px 10px",
+            backgroundColor: "#10202F",
+            color: "white",
+            display: "flex",
+            alignItems: "center",
+            gap: 6,
+            flexShrink: 0,
+          }}
+        >
+          <TrainFront size={16} />
+          <Text fz={11} fw={800}>
+            LOCO
+          </Text>
+        </Box>
+        {wagons.map((w) => (
+          <Tooltip
+            key={w.sequenceNo}
+            label={`${w.wagonNumber ?? "Unassigned"} · ${w.wagonType ?? "—"} · ${
+              STATUS_TONES[w.status]?.label ?? w.status
+            }`}
+            withArrow
+          >
+            <Box
+              px={10}
+              py={8}
+              ta="center"
+              style={{
+                borderRadius: 6,
+                border: "1.5px solid #C9D6E2",
+                backgroundColor: STATUS_TONES[w.status]?.bg ?? "#F1F4F7",
+                flexShrink: 0,
+                minWidth: 64,
+                cursor: "default",
+              }}
+            >
+              <Text fz={10} fw={700} c="#6B7C8E">
+                W{w.sequenceNo}
+              </Text>
+              <Text fz={11.5} fw={800} c="#10202F" style={{ fontFamily: "monospace" }}>
+                {w.wagonNumber ?? "—"}
+              </Text>
+            </Box>
+          </Tooltip>
+        ))}
+      </Group>
+    </Box>
+  );
+}
+
+function LoadBar({ allocated, capacity }: { allocated: number; capacity: number }) {
+  const pct = capacity > 0 ? Math.min(100, Math.round((allocated / capacity) * 100)) : 0;
+  return (
+    <Box>
+      <Group justify="space-between" mb={4}>
+        <Text fz={11.5} fw={700} c="#6B7C8E">
+          Load
+        </Text>
+        <Text fz={11.5} fw={800} c="#10202F">
+          {fmtWeight(allocated)}
+          {capacity > 0 ? ` / ${fmtWeight(capacity)} · ${pct}%` : ""}
+        </Text>
+      </Group>
+      <Box style={{ height: 6, borderRadius: 999, backgroundColor: "#EDF2F7" }}>
+        <Box
+          style={{
+            height: 6,
+            width: `${pct}%`,
+            borderRadius: 999,
+            backgroundColor: pct >= 95 ? "#B45309" : "#0A6F4D",
+            transition: "width 300ms ease",
+          }}
+        />
+      </Box>
+    </Box>
+  );
+}
+
+const th = { color: "#9AA8B5", fontSize: 11 } as const;
+
+function WagonCard({
+  wagon,
+  selectable,
+  selected,
+  onToggle,
+}: {
+  wagon: BookingWagonAllocation;
+  selectable?: boolean;
+  selected?: boolean;
+  onToggle?: () => void;
+}) {
+  const allocated = Number(wagon.allocatedWeightTons || 0);
+  const capacity = Number(wagon.capacityTons || 0);
+  const containers = wagon.containers ?? [];
+
+  return (
+    <SectionCard
+      style={
+        selected
+          ? { outline: "2px solid #B45309", outlineOffset: -2, borderRadius: 16 }
+          : undefined
+      }
+    >
+      <Group justify="space-between" align="flex-start" wrap="nowrap" mb="sm">
+        <Group gap={10} align="center" wrap="nowrap">
+          {selectable && (
+            <Checkbox
+              checked={!!selected}
+              onChange={onToggle}
+              color="orange"
+              aria-label={`Select wagon ${wagon.sequenceNo} for cancellation`}
+            />
+          )}
+          <Box
+            style={{
+              width: 40,
+              height: 40,
+              display: "flex",
+              flexDirection: "column",
+              alignItems: "center",
+              justifyContent: "center",
+              borderRadius: 10,
+              backgroundColor: "#10202F",
+              color: "white",
+              flexShrink: 0,
+            }}
+          >
+            <Text fz={9} fw={700} c="#9AA8B5" lh={1}>
+              WAGON
+            </Text>
+            <Text fz={15} fw={800} lh={1.2}>
+              {wagon.sequenceNo}
+            </Text>
+          </Box>
+          <Box>
+            <Text fz={16} fw={800} c="#10202F" style={{ fontFamily: "monospace" }}>
+              {wagon.wagonNumber ?? "Not yet assigned"}
+            </Text>
+            <Text fz={12} c="#9AA8B5">
+              {wagon.wagonType ?? "Wagon type pending"}
+              {wagon.wagonTypeCode && wagon.wagonType !== wagon.wagonTypeCode
+                ? ` · ${wagon.wagonTypeCode}`
+                : ""}
+            </Text>
+          </Box>
+        </Group>
+        <StatusPill status={wagon.status} />
+      </Group>
+
+      <LoadBar allocated={allocated} capacity={capacity} />
+
+      <Group gap={16} mt="sm" mb={containers.length || wagon.loadType === "BULK" ? "sm" : 0}>
+        {Number(wagon.tareWeightTons) > 0 && (
+          <Group gap={5}>
+            <Scale size={12} color="#9AA8B5" />
+            <Text fz={12} c="#475569">
+              Tare {fmtWeight(Number(wagon.tareWeightTons))}
+            </Text>
+          </Group>
+        )}
+        {Number(wagon.lengthMeters) > 0 && (
+          <Group gap={5}>
+            <Route size={12} color="#9AA8B5" />
+            <Text fz={12} c="#475569">
+              {Number(wagon.lengthMeters)} m
+            </Text>
+          </Group>
+        )}
+        <Group gap={5}>
+          {wagon.loadType === "BULK" ? (
+            <Package size={12} color="#9AA8B5" />
+          ) : (
+            <Container size={12} color="#9AA8B5" />
+          )}
+          <Text fz={12} c="#475569">
+            {wagon.loadType === "BULK" ? "Bulk load" : "Container load"}
+          </Text>
+        </Group>
+      </Group>
+
+      {wagon.loadType === "BULK" && (wagon.bulkCargoDescription || wagon.bulkQuantity) && (
+        <Box
+          p={10}
+          style={{ borderRadius: 10, backgroundColor: "#FAFCFE", border: "1px solid #EDF2F7" }}
+        >
+          <Text fz={12.5} fw={700} c="#10202F">
+            {wagon.bulkCargoDescription ?? "Bulk cargo"}
+          </Text>
+          {Number(wagon.bulkQuantity) > 0 && (
+            <Text fz={12} c="#9AA8B5">
+              Quantity: {Number(wagon.bulkQuantity).toLocaleString()}
+            </Text>
+          )}
+        </Box>
+      )}
+
+      {containers.length > 0 && (
+        <Box style={{ overflowX: "auto" }}>
+          <Table verticalSpacing={6} horizontalSpacing="sm">
+            <Table.Thead>
+              <Table.Tr>
+                <Table.Th style={th}>Container no.</Table.Th>
+                <Table.Th style={th}>Seal no.</Table.Th>
+                <Table.Th style={th}>Gross wt.</Table.Th>
+              </Table.Tr>
+            </Table.Thead>
+            <Table.Tbody>
+              {containers.map((c, i) => (
+                <Table.Tr key={c.containerNumber ?? i}>
+                  <Table.Td>
+                    <Text fz={12.5} fw={700} c="#10202F" style={{ fontFamily: "monospace" }}>
+                      {c.containerNumber ?? "—"}
+                    </Text>
+                  </Table.Td>
+                  <Table.Td>
+                    <Text fz={12.5} c="#475569">
+                      {c.sealNumber ?? "—"}
+                    </Text>
+                  </Table.Td>
+                  <Table.Td>
+                    <Text fz={12.5} c="#475569">
+                      {Number(c.grossWeightTons) > 0
+                        ? fmtWeight(Number(c.grossWeightTons))
+                        : "—"}
+                    </Text>
+                  </Table.Td>
+                </Table.Tr>
+              ))}
+            </Table.Tbody>
+          </Table>
+        </Box>
+      )}
+    </SectionCard>
+  );
+}
+
+/**
+ * "Wagons" tab: the customer's view of their allocated wagons once the paid
+ * booking has been placed on a train — consist strip in marshalling order,
+ * per-wagon load/containers, and the train's route summary.
+ */
+export function WagonsTab({
+  bookingId,
+  cancellable,
+  onCancellationRequested,
+}: {
+  bookingId: string;
+  /** PAID contract booking — specific wagons may be selected for cancellation. */
+  cancellable?: boolean;
+  onCancellationRequested?: () => void;
+}) {
+  const queryClient = useQueryClient();
+  const { data: wagons, isLoading } = useQuery({
+    queryKey: ["booking-wagons", bookingId],
+    queryFn: () => bookingsService.getWagons(bookingId),
+    enabled: !!bookingId,
+  });
+
+  // Cancellation history: feeds the "Cancelled wagons" section and blocks a
+  // second request while one is awaiting its fee.
+  const { data: history } = useQuery({
+    ...api.bookings.listWagonCancellations.queryOptions({ input: { bookingId } }),
+    enabled: !!bookingId,
+  });
+  const ownCancellations = (history?.items ?? []).filter(
+    (r) => r.bookingId === bookingId,
+  );
+  const hasOpenCancellation = ownCancellations.some(
+    (r) => r.status === "FEE_PENDING",
+  );
+
+  const [selected, setSelected] = useState<Set<string>>(new Set());
+  const [confirmOpen, setConfirmOpen] = useState(false);
+  const [reason, setReason] = useState("");
+  const [preview, setPreview] = useState<WagonCancellationPreview | null>(null);
+
+  const toggle = (allocationId: string) =>
+    setSelected((prev) => {
+      const next = new Set(prev);
+      if (next.has(allocationId)) next.delete(allocationId);
+      else next.add(allocationId);
+      return next;
+    });
+
+  const previewMutation = useMutation({
+    mutationFn: () =>
+      bookingsService.previewWagonCancellation(bookingId, {
+        wagonAllocationIds: [...selected],
+      }),
+    onSuccess: setPreview,
+    onError: (e) => {
+      setPreview(null);
+      toast.error(apiErrorMessage(e, "Could not calculate the fee. Please try again."));
+    },
+  });
+
+  const requestMutation = useMutation({
+    mutationFn: () =>
+      bookingsService.requestWagonCancellation(bookingId, {
+        wagonAllocationIds: [...selected],
+        ...(reason.trim() ? { reason: reason.trim() } : {}),
+      }),
+    onSuccess: () => {
+      setConfirmOpen(false);
+      setSelected(new Set());
+      setReason("");
+      setPreview(null);
+      toast.success(
+        "Cancellation requested — pay the fee in the wagon cancellation card to release these wagons.",
+        { duration: 7000 },
+      );
+      void queryClient.invalidateQueries({ queryKey: ["booking-wagons", bookingId] });
+      void queryClient.invalidateQueries({
+        queryKey: api.bookings.listWagonCancellations.queryKey({ bookingId }),
+      });
+      onCancellationRequested?.();
+    },
+    onError: (e) =>
+      toast.error(apiErrorMessage(e, "Could not request the cancellation. Please try again.")),
+  });
+
+  const openConfirm = () => {
+    setPreview(null);
+    setConfirmOpen(true);
+    previewMutation.mutate();
+  };
+
+  if (isLoading) {
+    return (
+      <div className="flex flex-col gap-6" style={{ maxWidth: 980 }}>
+        <Skeleton height={140} radius={16} />
+        <SimpleGrid cols={{ base: 1, md: 2 }} spacing={24}>
+          <Skeleton height={220} radius={16} />
+          <Skeleton height={220} radius={16} />
+        </SimpleGrid>
+      </div>
+    );
+  }
+
+  if (!wagons?.length) {
+    return (
+      <div className="flex flex-col gap-6" style={{ maxWidth: 980 }}>
+        <CancelledWagonsSection rows={ownCancellations} />
+      <SectionCard>
+        <Group gap={12} align="center">
+          <Box
+            style={{
+              width: 44,
+              height: 44,
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              borderRadius: 12,
+              backgroundColor: "#F1F4F7",
+              color: "#6B7C8E",
+            }}
+          >
+            <TrainTrack size={22} />
+          </Box>
+          <Box>
+            <Text fz={15} fw={800} c="#10202F">
+              No wagons allocated yet
+            </Text>
+            <Text fz={13} c="#9AA8B5">
+              Your wagons will appear here once the shipment is placed on a
+              train after payment.
+            </Text>
+          </Box>
+        </Group>
+      </SectionCard>
+      </div>
+    );
+  }
+
+  const canSelect = !!cancellable && !hasOpenCancellation;
+  const first = wagons[0];
+  const totalAllocated = wagons.reduce(
+    (s, w) => s + Number(w.allocatedWeightTons || 0),
+    0,
+  );
+  const totalCapacity = wagons.reduce((s, w) => s + Number(w.capacityTons || 0), 0);
+  const containerCount = wagons.reduce((s, w) => s + (w.containers?.length ?? 0), 0);
+  const utilization =
+    totalCapacity > 0 ? Math.round((totalAllocated / totalCapacity) * 100) : null;
+
+  return (
+    <div className="flex flex-col gap-6" style={{ maxWidth: 980 }}>
+      <SectionCard>
+        <Group justify="space-between" align="flex-start" mb="md" wrap="wrap">
+          <Group gap={10} align="center">
+            <Box
+              style={{
+                width: 36,
+                height: 36,
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                borderRadius: 10,
+                backgroundColor: "#E8F5EF",
+                color: "#0A6F4D",
+              }}
+            >
+              <TrainFront size={18} />
+            </Box>
+            <Box>
+              <Text fz={15} fw={800} c="#10202F">
+                {first.trainNumber ? `Train ${first.trainNumber}` : "Your train"}
+              </Text>
+              <Group gap={5} align="center">
+                <MapPin size={11} color="#9AA8B5" />
+                <Text fz={12} c="#9AA8B5">
+                  {first.originStation ?? "—"} → {first.destinationStation ?? "—"}
+                  {first.departureAt ? ` · departs ${fmtDate(first.departureAt)}` : ""}
+                </Text>
+              </Group>
+            </Box>
+          </Group>
+          <CardTitle>Your wagons on this train</CardTitle>
+        </Group>
+
+        <ConsistStrip wagons={wagons} />
+
+        <SimpleGrid cols={{ base: 2, sm: 4 }} spacing={10} mt="md">
+          <StatTile
+            icon={<TrainTrack size={13} />}
+            label="Wagons"
+            value={`${wagons.length}`}
+            sub="allocated to you"
+          />
+          <StatTile
+            icon={<Scale size={13} />}
+            label="Allocated weight"
+            value={fmtWeight(totalAllocated)}
+          />
+          <StatTile
+            icon={<Container size={13} />}
+            label="Containers"
+            value={containerCount ? `${containerCount}` : "—"}
+            sub={containerCount ? "loaded on wagons" : undefined}
+          />
+          <StatTile
+            icon={<Gauge size={13} />}
+            label="Utilization"
+            value={utilization != null ? `${utilization}%` : "—"}
+            sub="of wagon capacity"
+          />
+        </SimpleGrid>
+      </SectionCard>
+
+      {canSelect && (
+        <SectionCard>
+          <Group justify="space-between" align="center" wrap="wrap" gap="sm">
+            <Box>
+              <Text fz={14} fw={800} c="#10202F">
+                Cancel specific wagons
+              </Text>
+              <Text fz={12.5} c="#9AA8B5">
+                Tick the wagons you want to cancel. They leave this train
+                immediately; after you pay the per-wagon cancellation fee, the
+                freight you paid for them becomes a credit you can rebook on
+                another day.
+              </Text>
+            </Box>
+            <Button
+              color="orange"
+              disabled={selected.size === 0 || selected.size >= wagons.length}
+              onClick={openConfirm}
+            >
+              Cancel selected ({selected.size})
+            </Button>
+          </Group>
+          {selected.size >= wagons.length && selected.size > 0 && (
+            <Text fz={12} c="#B3362C" mt={6}>
+              You cannot cancel every wagon here — to cancel the whole booking,
+              use the booking cancellation instead.
+            </Text>
+          )}
+        </SectionCard>
+      )}
+      {cancellable && hasOpenCancellation && (
+        <Alert color="yellow" variant="light">
+          A wagon cancellation is already awaiting its fee — pay or withdraw it
+          in the wagon cancellation card before requesting another.
+        </Alert>
+      )}
+
+      <CancelledWagonsSection rows={ownCancellations} />
+
+      <SimpleGrid cols={{ base: 1, md: 2 }} spacing={24}>
+        {wagons.map((w) => (
+          <WagonCard
+            key={w.allocationId ?? w.sequenceNo}
+            wagon={w}
+            selectable={
+              canSelect &&
+              !!w.allocationId &&
+              (w.status === "PLANNED" || w.status === "RESERVED")
+            }
+            selected={!!w.allocationId && selected.has(w.allocationId)}
+            onToggle={() => w.allocationId && toggle(w.allocationId)}
+          />
+        ))}
+      </SimpleGrid>
+
+      <Modal
+        opened={confirmOpen}
+        onClose={() => setConfirmOpen(false)}
+        title="Cancel selected wagons"
+        centered
+      >
+        <Stack gap="sm">
+          <Text fz={13.5} c="#475569">
+            You are cancelling <b>{selected.size}</b> wagon(s). They stay
+            allocated to you until the cancellation fee is paid; after that the
+            paid freight for them becomes a credit you can rebook on another
+            day while your contract is valid.
+          </Text>
+          {previewMutation.isPending && <Skeleton height={64} radius={10} />}
+          {preview && (
+            <Box
+              p={12}
+              style={{
+                borderRadius: 10,
+                backgroundColor: "#FFFBEB",
+                border: "1px solid #FDE68A",
+              }}
+            >
+              <Group justify="space-between">
+                <Text fz={13} c="#92400E">
+                  Cancellation fee ({preview.wagons} × {Number(preview.feePerWagon).toLocaleString()})
+                </Text>
+                <Text fz={14} fw={800} c="#92400E">
+                  {Number(preview.feeAmount).toLocaleString()} {preview.feeCurrency}
+                </Text>
+              </Group>
+              <Group justify="space-between" mt={4}>
+                <Text fz={13} c="#0A6F4D">
+                  Rebooking credit kept
+                </Text>
+                <Text fz={14} fw={800} c="#0A6F4D">
+                  {Number(preview.creditAmount).toLocaleString()}
+                </Text>
+              </Group>
+            </Box>
+          )}
+          <Textarea
+            label="Reason (optional)"
+            placeholder="Why are you cancelling these wagons?"
+            value={reason}
+            onChange={(e) => setReason(e.currentTarget.value)}
+            autosize
+            minRows={2}
+          />
+          <Group justify="flex-end" gap="sm">
+            <Button variant="default" onClick={() => setConfirmOpen(false)}>
+              Keep wagons
+            </Button>
+            <Button
+              color="orange"
+              loading={requestMutation.isPending}
+              disabled={!preview}
+              onClick={() => requestMutation.mutate()}
+            >
+              Request cancellation
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+    </div>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx
index d3bbc55e9..a28fc2077 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx
@@ -10,6 +10,7 @@ import {
   type PortalWarehouseInvoice,
 } from "@/services/warehouse-invoices.service";
 import { saveBlob } from "@/utils/download";
+import { formatAmount } from "../utils";
 
 import { PaymentMethodModal } from "./PaymentMethodModal";
 import { CardTitle, SectionCard } from "./layout";
@@ -20,7 +21,7 @@ const isPayable = (inv: PortalWarehouseInvoice) =>
   PAYABLE_STATUSES.has(inv.status) && Number(inv.balanceAmount ?? 0) > 0;
 
 const money = (amount: number | string | null | undefined, currency: string) =>
-  `${Number(amount ?? 0).toLocaleString()} ${currency}`;
+  `${formatAmount(amount)} ${currency}`;
 
 const STATUS_STYLE: Record<string, { bg: string; fg: string }> = {
   DRAFT: { bg: "#EEF2F6", fg: "#64748B" },
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/utils.ts b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/utils.ts
index 22b347e85..5f9a71702 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/utils.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/utils.ts
@@ -151,15 +151,27 @@ export function bookingSubtitle(b: BookingDetail) {
 
 export type Pricing = Freight.PricingBreakdown | null | undefined;
 
+/**
+ * Money always prints its cents. Bare toLocaleString() defaults to
+ * maximumFractionDigits: 0, which silently hid the cents the customer is
+ * actually charged — CBE bills the exact amount, so the shown figure must match.
+ */
+export function formatAmount(amount: number | string | null | undefined) {
+  return Number(amount ?? 0).toLocaleString(undefined, {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+  });
+}
+
 export function priceLineItems(pricing: Pricing) {
   return (pricing?.lineItems ?? []).map((li) => ({
     label: li.description,
-    value: `${li.amount.toLocaleString()} ${li.currency}`,
+    value: `${formatAmount(li.amount)} ${li.currency}`,
   }));
 }
 
 export function priceTotal(pricing: Pricing) {
   if (!pricing) return "—";
   const total = pricing.lineItems.reduce((s, li) => s + li.amount, 0);
-  return `${total.toLocaleString()} ${pricing.currency}`;
+  return `${formatAmount(total)} ${pricing.currency}`;
 }
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/EditBookingPage.tsx b/apps/edr-freight-web/portal/src/pages/bookings/EditBookingPage.tsx
index 269fa2160..26a59b405 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/EditBookingPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/EditBookingPage.tsx
@@ -157,8 +157,8 @@ function mapBookingToFormValues(
     isRefrigerated: booking.isRefrigerated ?? false,
     bulkHazardousQty: String(Number(booking.bulkHazardousQuantity ?? 0)),
     bulkReeferQty: String(Number(booking.bulkReeferQuantity ?? 0)),
-    paymentCurrency:
-      booking.paymentCurrency === "ETB" ? "ETB" : "USD",
+    // ponytail: ETB-only for now — old USD drafts are re-billed in ETB on edit.
+    paymentCurrency: "ETB",
     scheduledDate: booking.scheduledDate
       ? new Date(booking.scheduledDate).toISOString().slice(0, 10)
       : "",
@@ -683,7 +683,11 @@ export default function EditBookingPage() {
             />
           </SimpleGrid>
 
-          <PaymentCurrencyField control={form.control} />
+          {/* USD billing is import-only; export/intercity stay ETB. */}
+          <PaymentCurrencyField
+            control={form.control}
+            allowUsd={operationType === "import"}
+          />
 
           {(selectedService?.includesFirstMile ||
             selectedService?.includesLastMile ||
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/clearance/ClearanceFlow.tsx b/apps/edr-freight-web/portal/src/pages/bookings/clearance/ClearanceFlow.tsx
index a1d2cafd8..ee96799b3 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/clearance/ClearanceFlow.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/clearance/ClearanceFlow.tsx
@@ -85,7 +85,12 @@ export function ClearanceFlow({ booking, flow, footer }: ClearanceFlowProps) {
 
   return (
     <Stack gap={0}>
-      {isReady ? (
+      {status === "OPERATION_CHANGES_REQUESTED" ? (
+        <Alert color="yellow" radius="md" icon={<Clock size={18} />} mb="md">
+          Operations returned this order for changes. Review their note, pick a
+          new shipment day below and resubmit.
+        </Alert>
+      ) : isReady ? (
         <Alert color="teal" radius="md" icon={<CheckCircle2 size={18} />} mb="md">
           {needsCompletion
             ? "Clearance is finalized. Complete your booking now — enter the cargo details and pick a shipment day inside an open booking window."
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts b/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts
index d0256510a..297b0c152 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts
@@ -89,6 +89,22 @@ function actionByStatus(booking: ActionBooking): BookingNextAction | null {
         label: "Schedule & proceed",
         title: "Schedule your shipment",
       };
+    case "OPERATION_CHANGES_REQUESTED":
+      // Contract bookings reopen the full completion form (cargo + shipment
+      // day, prefilled from the booking) — same page as the initial booking.
+      // Contract-less bookings keep the in-place day-picker modal.
+      return booking.contractId
+        ? {
+            kind: "BOOK",
+            label: "Change booking",
+            title: "Change your booking",
+            to: `/contracts/${booking.contractId}/bookings/${booking.id}/complete`,
+          }
+        : {
+            kind: "SCHEDULE_OPERATION",
+            label: "Choose day & resubmit",
+            title: "Resubmit your shipment",
+          };
     default:
       return null;
   }
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/clearance/useClearanceFlow.ts b/apps/edr-freight-web/portal/src/pages/bookings/clearance/useClearanceFlow.ts
index 5d8143f79..c50a7c046 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/clearance/useClearanceFlow.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/clearance/useClearanceFlow.ts
@@ -98,7 +98,10 @@ export function useClearanceFlow(booking: Freight.IBooking) {
     [clearance],
   );
 
-  const isReady = status === "CLEARANCE_READY";
+  // OPERATION_CHANGES_REQUESTED re-opens the same pick-a-day flow: the
+  // customer resubmits via the same clearance/proceed endpoint.
+  const isReady =
+    status === "CLEARANCE_READY" || status === "OPERATION_CHANGES_REQUESTED";
   // Bare initiated instance: created with no cargo and no price; completion
   // (cargo + shipment day + window check) happens on the full booking form.
   const isBareInstance =
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/LocationPicker.tsx b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/LocationPicker.tsx
index 8832279ad..e38e333fd 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/LocationPicker.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/LocationPicker.tsx
@@ -45,11 +45,16 @@ interface PlacePrediction {
 }
 
 // Maps JavaScript API keys are public client-side keys (lock them down by
-// HTTP-referrer in the Google Cloud console). The env var lets deployments
-// override the default key without a code change.
-const GOOGLE_MAPS_API_KEY =
-  import.meta.env.VITE_GOOGLE_MAPS_API_KEY ||
-  "AIzaSyBg4tN31-fgvH_2Ix_TPo6VSfOA2uA5CCI";
+// HTTP-referrer in the Google Cloud console), so this one env var is the whole
+// configuration. Requires BOTH "Maps JavaScript API" (tiles) and "Places API"
+// (the address search) enabled on the key, or the map draws and the search box
+// silently returns nothing.
+//
+// There is deliberately no fallback key. A hardcoded default used to live here
+// and expired, which degraded a missing env var into a blank map with a search
+// box that spun forever — indistinguishable from a broken picker. Absent config
+// now says so on screen instead.
+const GOOGLE_MAPS_API_KEY = import.meta.env.VITE_GOOGLE_MAPS_API_KEY?.trim();
 
 // Centre of the EDR corridor (Addis Ababa) — a sensible default view.
 const DEFAULT_CENTER = { lat: 9.03, lng: 38.74 };
@@ -191,10 +196,7 @@ async function resolvePrediction(
       },
       (place, status) => {
         const loc = place?.geometry?.location;
-        if (
-          status !== google.maps.places.PlacesServiceStatus.OK ||
-          !loc
-        ) {
+        if (status !== google.maps.places.PlacesServiceStatus.OK || !loc) {
           resolve(null);
           return;
         }
@@ -309,6 +311,7 @@ export function LocationPicker(props: LocationPickerProps) {
     lat: toFiniteNumber(props.value.lat),
     lng: toFiniteNumber(props.value.lng),
   };
+  if (!GOOGLE_MAPS_API_KEY) return <MapUnavailable label={props.label} />;
   return (
     <APIProvider apiKey={GOOGLE_MAPS_API_KEY}>
       {props.variant === "modal" ? (
@@ -320,6 +323,42 @@ export function LocationPicker(props: LocationPickerProps) {
   );
 }
 
+/**
+ * Stands in for the picker when the Maps key is absent. Says which variable is
+ * missing rather than rendering an empty map that reads as a broken feature —
+ * the failure this replaced took a live API request to diagnose.
+ */
+function MapUnavailable({ label }: { label?: string }) {
+  return (
+    <Box>
+      {label && (
+        <Text fz={13} fw={600} c="#10202F" mb={6}>
+          {label}
+        </Text>
+      )}
+      <Box
+        style={{
+          display: "flex",
+          alignItems: "center",
+          gap: 10,
+          borderRadius: 12,
+          padding: "12px 14px",
+          border: "1px solid #F0D2A8",
+          background: "#FFF9F0",
+        }}
+      >
+        <MapPin size={16} color="#B45309" style={{ flexShrink: 0 }} />
+        <Text fz={12.5} c="#8A5A16">
+          Map unavailable — <code>VITE_GOOGLE_MAPS_API_KEY</code> is not set.
+          Add a Google Maps key with the Maps JavaScript API and Places API
+          enabled to this app&apos;s
+          <code> .env</code>, then restart the dev server.
+        </Text>
+      </Box>
+    </Box>
+  );
+}
+
 /** Compact trigger + modal wrapper around the inline picker. */
 function LocationPickerModal({
   value,
@@ -368,7 +407,12 @@ function LocationPickerModal({
         >
           <MapPin size={16} />
         </Box>
-        <Text fz={13.5} c={hasPin ? "#10202F" : "#94A3B8"} lineClamp={1} style={{ flex: 1 }}>
+        <Text
+          fz={13.5}
+          c={hasPin ? "#10202F" : "#94A3B8"}
+          lineClamp={1}
+          style={{ flex: 1 }}
+        >
           {hasPin ? value.address || "Pinned location" : placeholder}
         </Text>
         <Text fz={12.5} fw={600} c="#0A6F4D" style={{ flexShrink: 0 }}>
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/payment-currency-field.tsx b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/payment-currency-field.tsx
index d874fb783..fb91b515b 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/payment-currency-field.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/payment-currency-field.tsx
@@ -19,14 +19,25 @@ const CURRENCY_ICONS: Record<
 
 export function PaymentCurrencyField({
   control,
+  allowUsd = false,
 }: {
   control: Control<BookingFormInputValues, any, BookingFormValues>;
+  /**
+   * Offer USD alongside ETB. Import shipments only — export and domestic
+   * traffic is always invoiced in ETB.
+   */
+  allowUsd?: boolean;
 }) {
+  const options = allowUsd
+    ? PAYMENT_CURRENCY_OPTIONS
+    : PAYMENT_CURRENCY_OPTIONS.filter((o) => o.value !== "USD");
   return (
     <Box mt={24}>
       <StepLabel>Payment currency</StepLabel>
       <Text fz={12} c="#6B7C8E" mt={4} mb={12}>
-        Choose the currency for your freight quote and invoices.
+        {allowUsd
+          ? "Choose the currency for your freight quote and invoices. USD is paid by bank transfer, not online."
+          : "Choose the currency for your freight quote and invoices."}
       </Text>
       <Controller
         name="paymentCurrency"
@@ -44,7 +55,7 @@ export function PaymentCurrencyField({
                 border: "1px solid #E6ECF2",
               }}
             >
-              {PAYMENT_CURRENCY_OPTIONS.map((option) => {
+              {options.map((option) => {
                 const Icon = CURRENCY_ICONS[option.value].icon;
                 const selected = field.value === option.value;
                 return (
@@ -97,10 +108,7 @@ export function PaymentCurrencyField({
             </Group>
             {/* Description for the active currency, kept subtle. */}
             <Text fz={11.5} c="#6B7C8E" mt={8}>
-              {
-                PAYMENT_CURRENCY_OPTIONS.find((o) => o.value === field.value)
-                  ?.description
-              }
+              {options.find((o) => o.value === field.value)?.description}
             </Text>
             <OptionFieldError error={fieldState.error} />
           </div>
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/schema.ts b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/schema.ts
index c81e5571b..27b669d72 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/schema.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/schema.ts
@@ -81,15 +81,16 @@ export const PAYMENT_CURRENCY_OPTIONS: Array<{
   label: string;
   description: string;
 }> = [
-  {
-    value: "USD",
-    label: "USD",
-    description: "US Dollar — international pricing and invoicing.",
-  },
   {
     value: "ETB",
     label: "ETB",
-    description: "Ethiopian Birr — local pricing and invoicing.",
+    description: "Ethiopian Birr — pay online through the payment gateway.",
+  },
+  // Import shipments only; the field is hidden on export/domestic traffic.
+  {
+    value: "USD",
+    label: "USD",
+    description: "US Dollar — paid by bank transfer, slip sent to Finance.",
   },
 ];
 
@@ -373,7 +374,7 @@ export const initialBookingFormValues: DeepPartial<BookingFormValues> = {
   previousContractRef: "",
 
   serviceTypeId: "",
-  paymentCurrency: "USD",
+  paymentCurrency: "ETB",
   firstMile: {
     enabled: false,
     pickUpAddress: "",
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step2-service-type.tsx b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step2-service-type.tsx
index 64653abe3..2c51cbb62 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step2-service-type.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step2-service-type.tsx
@@ -40,6 +40,11 @@ export function Step2ServiceType({
     serviceType ?? {};
   const firstMileEnabled = form.watch("firstMile.enabled");
   const lastMileEnabled = form.watch("lastMile.enabled");
+  // The paid-mile service prices the road legs into the booking itself; every
+  // other service defers last-mile billing to after the Djibouti departure
+  // (confirm containers → sign supplementary LM contract → pay advance).
+  const deferredLastMileBilling =
+    serviceType?.code !== "RAIL_CONTAINER_PAID_MILE";
 
   const prevServiceType = useRef(serviceType);
   // Only clear a mile when the current service doesn't include it — this ran
@@ -128,7 +133,11 @@ export function Step2ServiceType({
         )}
       />
 
-      <PaymentCurrencyField control={form.control} />
+      {/* USD billing is import-only; export/intercity stay ETB. */}
+      <PaymentCurrencyField
+        control={form.control}
+        allowUsd={operationType === "import"}
+      />
 
       {showServiceSections && (
         <Stack gap={12} mt={24}>
@@ -205,7 +214,11 @@ export function Step2ServiceType({
                 <ServiceToggle
                   icon={<Truck size={18} />}
                   title="Last Mile — Delivery"
-                  description="Truck delivery from the destination rail yard to the final address (Port to Door)."
+                  description={
+                    deferredLastMileBilling
+                      ? "Truck delivery from the destination rail yard to the final address (Port to Door). Nothing is paid now — last-mile billing starts after your train departs Djibouti."
+                      : "Truck delivery from the destination rail yard to the final address (Port to Door)."
+                  }
                   checked={field.value ?? false}
                   onChange={(value) => {
                     field.onChange(value);
@@ -224,6 +237,15 @@ export function Step2ServiceType({
                 >
                   {lastMileEnabled && (
                     <Box mt="md">
+                      {deferredLastMileBilling && (
+                        <Text size="xs" c="dimmed" mb={10}>
+                          How it works: when your train departs Djibouti, you
+                          will be asked to confirm which containers EDR should
+                          deliver. Once truck availability is approved, you will
+                          sign a short supplementary last-mile contract and pay
+                          the delivery advance — nothing is charged at booking.
+                        </Text>
+                      )}
                       <Controller
                         name="lastMile"
                         control={form.control}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step8-review.tsx b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step8-review.tsx
index b5605f598..001e55966 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step8-review.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step8-review.tsx
@@ -299,7 +299,7 @@ export function Step8Review({
             <DetailRow label="Service" value={serviceType?.name ?? ""} />
             <DetailRow
               label="Payment currency"
-              value={values.paymentCurrency ?? "USD"}
+              value={values.paymentCurrency ?? "ETB"}
             />
             <Button
               type="button"
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/payments/PayNowButton.tsx b/apps/edr-freight-web/portal/src/pages/bookings/payments/PayNowButton.tsx
index 2eb07a0b1..db50bd57f 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/payments/PayNowButton.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/payments/PayNowButton.tsx
@@ -1,11 +1,12 @@
-import { Button, type ButtonProps } from "@mantine/core";
-import { CreditCard } from "lucide-react";
+import { Badge, Button, type ButtonProps } from "@mantine/core";
+import { CreditCard, Landmark } from "lucide-react";
 
 import { Freight } from "@edr/types";
 
 import { ModalSafeWrapper } from "@/components/customer-actions/ModalSafeWrapper";
 import { PaymentMethodModal } from "../BookingDetailPage/components/PaymentMethodModal";
 import { priceTotal } from "../BookingDetailPage/utils";
+import { isUsdOfflineBooking } from "./offline-payment";
 import { useBookingPayment } from "./useBookingPayment";
 
 interface PayNowButtonProps {
@@ -29,6 +30,23 @@ export function PayNowButton({
   const pay = useBookingPayment(booking.id);
   const pricing = booking.pricingBreakdown;
 
+  // USD is paid by bank transfer and confirmed by Finance — no online payment.
+  if (isUsdOfflineBooking(booking)) {
+    return (
+      <Badge
+        size={size === "xs" ? "md" : "lg"}
+        radius="md"
+        variant="light"
+        color="yellow"
+        fullWidth={fullWidth}
+        leftSection={<Landmark size={12} />}
+        styles={{ label: { textTransform: "none", fontWeight: 700 } }}
+      >
+        Pay by bank transfer
+      </Badge>
+    );
+  }
+
   return (
     <ModalSafeWrapper>
       <Button
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/payments/offline-payment.ts b/apps/edr-freight-web/portal/src/pages/bookings/payments/offline-payment.ts
new file mode 100644
index 000000000..92c94940d
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/bookings/payments/offline-payment.ts
@@ -0,0 +1,16 @@
+import type { Freight } from "@edr/types";
+
+/**
+ * USD bookings are never paid online: the customer pays by bank transfer and
+ * the Finance department confirms the payment from the slip. Phase 1 is
+ * portal-only — Finance's confirm flow lands in the backoffice later.
+ */
+export function isUsdCurrency(currency?: string | null): boolean {
+  return currency?.toUpperCase() === "USD";
+}
+
+export function isUsdOfflineBooking(booking: Freight.IBooking): boolean {
+  return isUsdCurrency(
+    booking.pricingBreakdown?.currency ?? booking.paymentCurrency,
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/payments/useBookingPayment.ts b/apps/edr-freight-web/portal/src/pages/bookings/payments/useBookingPayment.ts
index eb6e170d1..eaaa77a9e 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/payments/useBookingPayment.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/payments/useBookingPayment.ts
@@ -3,18 +3,22 @@ import { useState } from "react";
 
 import { useInvoicePayment } from "@/hooks/useInvoicePayment";
 import { type PaymentMethod } from "@/services/payments.service";
-import { invoicesService } from "@/services/invoices.service";
+import { invoicesService, type PortalInvoice } from "@/services/invoices.service";
 import { isPayable } from "@/pages/billing/invoice-ui";
 
+/** Fee invoice opened by a partial wagon cancellation (see WagonCancellationCard). */
+export const WAGON_CANCEL_FEE_INVOICE_TYPE = "WAGON_CANCEL_FEE";
+
 /**
- * Shared payment flow for a single booking: opens the method modal, fires
- * POST /billing/my-invoices/:id/pay for the booking's currently payable
- * invoice, and redirects the browser to the provider (or, for CAC Bank, an
- * OTP debit with no redirect, collects the SMS'd code in the modal). Reused by
- * the booking detail page, the booking list, and the home page so "Pay now"
- * behaves identically everywhere.
+ * Core of the booking payment flows: resolves the booking's invoices (shared
+ * query/key with BookingPaymentPanel, so they share that cache), picks the one
+ * matching `match`, and charges it through the ownership-checked portal route —
+ * redirect vs CAC Bank OTP handled by `useInvoicePayment`.
  */
-export function useBookingPayment(bookingId: string) {
+function useBookingInvoicePayment(
+  bookingId: string,
+  match: (invoice: PortalInvoice) => boolean,
+) {
   const [modalOpen, setModalOpen] = useState(false);
   const [noInvoice, setNoInvoice] = useState(false);
 
@@ -22,7 +26,7 @@ export function useBookingPayment(bookingId: string) {
     queryKey: ["booking-invoices", bookingId],
     queryFn: () => invoicesService.listForSource("booking", bookingId),
   });
-  const payableInvoiceId = invoices.find((inv) => isPayable(inv.status))?.id;
+  const payableInvoiceId = invoices.find(match)?.id;
 
   const flow = useInvoicePayment();
 
@@ -56,3 +60,28 @@ export function useBookingPayment(bookingId: string) {
     },
   };
 }
+
+/**
+ * Shared payment flow for a single booking: opens the method modal, fires
+ * POST /billing/my-invoices/:id/pay for the booking's currently payable
+ * invoice, and redirects the browser to the provider (or, for CAC Bank, an
+ * OTP debit with no redirect, collects the SMS'd code in the modal). Reused by
+ * the booking detail page, the booking list, and the home page so "Pay now"
+ * behaves identically everywhere.
+ */
+export function useBookingPayment(bookingId: string) {
+  return useBookingInvoicePayment(bookingId, (inv) => isPayable(inv.status));
+}
+
+/**
+ * Same flow, but targets the booking's payable wagon-cancellation FEE invoice
+ * (type WAGON_CANCEL_FEE) — the freight invoice is already paid on these
+ * bookings, so the generic "first payable" pick would work today, but pinning
+ * the type keeps the two buttons from ever racing over the same invoice.
+ */
+export function useFeeInvoicePayment(bookingId: string) {
+  return useBookingInvoicePayment(
+    bookingId,
+    (inv) => inv.type === WAGON_CANCEL_FEE_INVOICE_TYPE && isPayable(inv.status),
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/ContractBookingWindowsSection.tsx b/apps/edr-freight-web/portal/src/pages/contracts/ContractBookingWindowsSection.tsx
index a8d9d0830..c4fa72977 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/ContractBookingWindowsSection.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/ContractBookingWindowsSection.tsx
@@ -104,16 +104,29 @@ const COUNTDOWN_TEXT: Partial<
   PRE_WINDOW: { label: "Booking opens in", expiredText: "Booking opening now…" },
   OPEN: { label: "Window closes in", expiredText: "Document review starting…" },
   DOC_REVIEW: { label: "Document review ends in", expiredText: "Payment starting…" },
-  PAYMENT: { label: "Payment due in", expiredText: "Payment window closing…" },
+  PAYMENT: { label: "Payment due in", expiredText: "Finalizing payments…" },
 };
 
-function phaseCountdown(
-  w: MyBookingWindow,
-): { label: string; deadline: string; expiredText: string } | null {
+function phaseCountdown(w: MyBookingWindow): {
+  label: string;
+  deadline: string;
+  expiredText: string;
+  graceDeadline?: string | null;
+  graceLabel?: string;
+} | null {
   const state = bookingWindowUiState(w);
   const text = COUNTDOWN_TEXT[state.kind];
   if (!state.countdownTo || !text) return null;
-  return { ...text, deadline: state.countdownTo };
+  // Once the pay deadline lapses, pending payments still settle during the
+  // drain tail — count it down as "processing" instead of a stale "closing".
+  const grace =
+    state.kind === "PAYMENT" && w.paymentDrainEndsAt
+      ? {
+          graceDeadline: w.paymentDrainEndsAt,
+          graceLabel: "Payment processing — closes in",
+        }
+      : undefined;
+  return { ...text, deadline: state.countdownTo, ...grace };
 }
 
 /**
@@ -226,6 +239,8 @@ function WindowCard({ w }: { w: MyBookingWindow }) {
               deadline={cd.deadline}
               label={cd.label}
               expiredText={cd.expiredText}
+              graceDeadline={cd.graceDeadline}
+              graceLabel={cd.graceLabel}
               size="xs"
             />
           </Box>
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 6ceb1fb69..ded69afb1 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
@@ -64,6 +64,7 @@ import {
 } from "@/pages/bookings/booking-display";
 import { InitiateBookingButton } from "@/components/customer-actions/ContractCustomerAction";
 import { formatRateUnit } from "./new-contract-form/unit-rates";
+import { formatAmount } from "./new-shipment-form/total";
 import { bookingDocNoun } from "@/pages/bookings/clearance/bookingNextAction";
 import { getContractBookingAction } from "./contract-booking-action";
 import { closedWindowMessage, hasOpenWindow } from "./booking-window";
@@ -719,7 +720,7 @@ export default function ContractDetailPage() {
                     )}
                   </Box>
                   <Text fz={14} fw={700} style={{ color: GREEN }}>
-                    {(item.unitPrice ?? 0).toLocaleString()} {pricing.currency}{" "}
+                    {formatAmount(item.unitPrice)} {pricing.currency}{" "}
                     <Text span fz={12} fw={600} c="dimmed">
                       / {formatRateUnit(item.unit)}
                     </Text>
@@ -1336,9 +1337,7 @@ export default function ContractDetailPage() {
                                   whiteSpace: "nowrap",
                                 }}
                               >
-                                {amount > 0
-                                  ? `ETB ${amount.toLocaleString()}`
-                                  : "—"}
+                                {amount > 0 ? `ETB ${formatAmount(amount)}` : "—"}
                               </Text>
                             </Table.Td>
                           </Table.Tr>
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 54f678049..347cdd2bb 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
@@ -38,6 +38,7 @@ import {
   CheckCircle2,
   ChevronLeft,
   FileDown,
+  FileText,
   FileUp,
   Flame,
   MapPin,
@@ -59,6 +60,7 @@ import {
   contractsService,
   type ShipmentValidation,
 } from "@/services/contracts.service";
+import { downloadStoredFile } from "@/services/files.service";
 import {
   SelectField,
   StepCard,
@@ -73,7 +75,7 @@ import {
   createShipmentFormSchema,
   initialShipmentFormValues,
 } from "./new-shipment-form/schema";
-import { computeShipmentTotal } from "./new-shipment-form/total";
+import { computeShipmentTotal, formatAmount } from "./new-shipment-form/total";
 import {
   downloadContainerImportTemplate,
   parseContainerExcel,
@@ -245,6 +247,127 @@ function bulkUnitOfMeasure(
   return hasPerItem ? "PER_ITEM" : "PER_TON";
 }
 
+/**
+ * Prefill for a changes-requested resubmit: the booking's persisted cargo,
+ * currency and route become the form's starting values so the customer edits
+ * what exists instead of retyping it. The shipment day is deliberately left
+ * empty — a new day must be picked.
+ */
+function mapBookingToShipmentValues(
+  booking: Freight.IBooking,
+  contract: Freight.IContract,
+): Partial<ShipmentFormInputValues> {
+  const b = booking as unknown as {
+    cargoFreeText?: string | null;
+    contractRouteId?: string | null;
+    cargoTotalWeightVgm?: number | string | null;
+    bulkTotalWeightTons?: number | string | null;
+    bulkHazardousQuantity?: number | string | null;
+    bulkReeferQuantity?: number | string | null;
+    bookingContainers?: Array<{
+      quantity?: number;
+      hazardousQuantity?: number | string | null;
+      reeferQuantity?: number | string | null;
+      returnQuantity?: number | string | null;
+      containerType?: { sizeFt?: number | null } | null;
+      units?: Array<{
+        containerNumber?: string;
+        sealNumber?: string | null;
+        vgmTons?: number | string;
+        isHazardous?: boolean;
+        isReefer?: boolean;
+        isReturn?: boolean;
+      }>;
+    }>;
+  };
+  const values: Partial<ShipmentFormInputValues> = {
+    paymentCurrency: "ETB",
+    withReturn: booking.equipmentReturn === "WITH_RETURN",
+    cargoDescription: b.cargoFreeText ?? "",
+    ...(b.contractRouteId ? { contractRouteId: b.contractRouteId } : {}),
+  };
+  if (contract.freightType === "CONTAINER") {
+    const rows = b.bookingContainers ?? [];
+    const lineFor = (size: "20ft" | "40ft") => {
+      const bc = rows.find(
+        (r) => (r.containerType?.sizeFt === 40 ? "40ft" : "20ft") === size,
+      );
+      return {
+        containerSize: size,
+        quantity: String(bc?.quantity ?? 0),
+        hazardousQuantity: String(Number(bc?.hazardousQuantity ?? 0)),
+        reeferQuantity: String(Number(bc?.reeferQuantity ?? 0)),
+        returnQuantity: String(Number(bc?.returnQuantity ?? 0)),
+        units: (bc?.units ?? []).map((u) => ({
+          containerNumber: u.containerNumber ?? "",
+          sealNumber: u.sealNumber ?? "",
+          vgmTons: String(Number(u.vgmTons ?? 0)),
+          isHazardous: Boolean(u.isHazardous),
+          isReefer: Boolean(u.isReefer),
+          isReturn: Boolean(u.isReturn),
+        })),
+      };
+    };
+    const sizes = (contract.cargoScope ?? [])
+      .map((s) => s.containerSize)
+      .filter((s): s is "20ft" | "40ft" => s === "20ft" || s === "40ft");
+    values.containers = (sizes.length ? sizes : (["20ft", "40ft"] as const)).map(lineFor);
+  } else {
+    const perItem = bulkUnitOfMeasure(contract) === "PER_ITEM";
+    const amount = Number(b.cargoTotalWeightVgm ?? 0);
+    if (perItem) {
+      values.itemCount = amount ? String(amount) : "";
+      values.cargoWeightTons =
+        b.bulkTotalWeightTons != null
+          ? String(Number(b.bulkTotalWeightTons))
+          : "";
+    } else {
+      values.cargoWeightTons = amount ? String(amount) : "";
+    }
+    values.bulkHazardousQuantity = String(Number(b.bulkHazardousQuantity ?? 0));
+    values.bulkReeferQuantity = String(Number(b.bulkReeferQuantity ?? 0));
+  }
+  return values;
+}
+
+/** Read-only list of the booking's already-uploaded documents (resubmit view). */
+function UploadedDocumentsCard({ booking }: { booking: Freight.IBooking }) {
+  const files =
+    (booking as unknown as { files?: Array<{ id: string; name: string }> })
+      .files ?? [];
+  if (!files.length) return null;
+  return (
+    <Paper withBorder radius="lg" p="lg">
+      <Group gap={8} mb={4}>
+        <FileText size={16} />
+        <Text fw={700} fz="sm">
+          Your uploaded documents
+        </Text>
+      </Group>
+      <Text fz={12.5} c="dimmed" mb="sm">
+        These stay attached to the booking — no need to upload them again.
+      </Text>
+      <Stack gap={6}>
+        {files.map((f) => (
+          <Group key={f.id} justify="space-between" wrap="nowrap">
+            <Text fz={13} truncate>
+              {f.name}
+            </Text>
+            <ActionIcon
+              variant="default"
+              radius="md"
+              onClick={() => void downloadStoredFile(f.id, f.name)}
+              aria-label={`Download ${f.name}`}
+            >
+              <FileDown size={15} />
+            </ActionIcon>
+          </Group>
+        ))}
+      </Stack>
+    </Paper>
+  );
+}
+
 function NewShipmentBookingForm({
   contract,
   contractId,
@@ -267,11 +390,8 @@ function NewShipmentBookingForm({
       // Seed the equipment-return toggle from the contract; the customer can
       // still flip it per shipment.
       withReturn: contract.equipmentReturn === "WITH_RETURN",
-      // The contract quotes USD; the customer bills this shipment in the
-      // currency they pick here. Intercity is always ETB, so it is preset;
-      // everything else starts empty so the customer picks deliberately
-      // instead of silently inheriting USD.
-      paymentCurrency: contract.tradeDirection === "DOMESTIC" ? "ETB" : "",
+      // ponytail: ETB-only for now — preset since there is no other choice.
+      paymentCurrency: "ETB",
     },
     resolver: zodResolver(
       createShipmentFormSchema({
@@ -284,6 +404,10 @@ function NewShipmentBookingForm({
         unitOfMeasure: bulkUnitOfMeasure(contract),
         // Intercity rides a passing train staff pick later — no date to choose.
         requiresDate: contract.tradeDirection !== "DOMESTIC",
+        // Export completion locks onto a specific train — the pick is required
+        // (mirrors the ScheduleStep picker's visibility).
+        requiresTrain:
+          contract.tradeDirection === "EXPORT" && Boolean(completeBookingId),
       }),
     ),
     mode: "onChange",
@@ -302,6 +426,34 @@ function NewShipmentBookingForm({
       : 0;
   const hasOdd20ft = ft20Total % 2 === 1;
 
+  // COMPLETION mode: fetch the booking — a changes-requested resubmit prefills
+  // the form from it and shows the operations note + uploaded documents.
+  const { data: completeBooking } = useQuery(
+    api.bookings.get.queryOptions({
+      input: { id: completeBookingId! },
+      enabled: Boolean(completeBookingId),
+    }),
+  );
+  const isResubmit = Boolean(
+    completeBooking &&
+      ["OPERATION_CHANGES_REQUESTED", "EXPIRED"].includes(
+        completeBooking.status as string,
+      ) &&
+      (((completeBooking as unknown as { bookingContainers?: unknown[] })
+        .bookingContainers?.length ?? 0) > 0 ||
+        Number(completeBooking.cargoTotalWeightVgm ?? 0) > 0),
+  );
+  const prefilledRef = useRef(false);
+  useEffect(() => {
+    if (!isResubmit || prefilledRef.current || !completeBooking) return;
+    prefilledRef.current = true;
+    form.reset({
+      ...form.getValues(),
+      ...mapBookingToShipmentValues(completeBooking, contract),
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isResubmit]);
+
   const submitMutation = useMutation({
     mutationFn: (dto: Freight.CreateBookingUnderContractDto) =>
       completeBookingId
@@ -328,7 +480,12 @@ function NewShipmentBookingForm({
   // price modal opens so re-reviewing after an edit re-checks.
   const validateMutation = useMutation({
     mutationFn: (dto: Freight.CreateBookingUnderContractDto) =>
-      api.contracts.validateShipment.call({ id: contractId, dto }),
+      api.contracts.validateShipment.call({
+        id: contractId,
+        dto,
+        // Resubmit preview must not clash with this booking's own containers.
+        excludeBookingId: completeBookingId,
+      }),
   });
 
   function buildDto(
@@ -484,12 +641,16 @@ function NewShipmentBookingForm({
             style={{ letterSpacing: "-0.01em" }}
           >
             {completeBookingId
-              ? "Complete Your Booking"
+              ? isResubmit
+                ? "Change Your Booking"
+                : "Complete Your Booking"
               : "New Shipment Booking"}
           </Title>
           <Text size="sm" c="edr-muted" mt={4}>
             {completeBookingId
-              ? `Clearance is finalized — enter the cargo details and shipment day to complete your booking under contract ${contract.reference}.`
+              ? isResubmit
+                ? `Update the details below and pick a new shipment day, then resubmit your booking under contract ${contract.reference}.`
+                : `Clearance is finalized — enter the cargo details and shipment day to complete your booking under contract ${contract.reference}.`
               : `Book a shipment against contract ${contract.reference}.`}
           </Text>
         </Box>
@@ -531,6 +692,16 @@ function NewShipmentBookingForm({
 
           {/* Single-step form — all sections on one page. */}
           <Stack gap="lg" className="mx-auto max-w-4xl">
+            {isResubmit && completeBooking?.latestChangeRequestNote && (
+              <Alert
+                color="yellow"
+                icon={<AlertCircle size={16} />}
+                radius="md"
+                title="Operations requested changes"
+              >
+                <Text size="sm">{completeBooking.latestChangeRequestNote}</Text>
+              </Alert>
+            )}
             <RouteStep form={form} contract={contract} routes={routes} />
             <CargoStep form={form} contract={contract} />
             {/* Legacy contracts only — WITH_RETURN contracts capture per-line
@@ -543,6 +714,9 @@ function NewShipmentBookingForm({
               routes={routes}
               completeBookingId={completeBookingId ?? null}
             />
+            {isResubmit && completeBooking && (
+              <UploadedDocumentsCard booking={completeBooking} />
+            )}
             {/* Notes are captured when the booking is initiated — completing
                 a bare booking does not re-ask for them. */}
             {!completeBookingId && <NotesSection form={form} />}
@@ -590,7 +764,7 @@ function NewShipmentBookingForm({
                     onClick={handleReview}
                     disabled={hasOdd20ft}
                   >
-                    Review price &amp; book
+                    {isResubmit ? "Change booking" : "Review price & book"}
                   </Button>
                 </Box>
               </Tooltip>
@@ -840,7 +1014,7 @@ function PriceConfirmModal({
                 ))}
                 <Text fz="xs" c="#9A5B00" mt={2}>
                   {overweightSurchargeAmount > 0
-                    ? `An overweight surcharge of ${overweightSurchargeAmount.toLocaleString()} ${
+                    ? `An overweight surcharge of ${formatAmount(overweightSurchargeAmount)} ${
                         validation?.currency ?? total?.currency ?? ""
                       } applies (included in the total below). You can still submit, or go back and adjust weights.`
                     : "An overweight surcharge applies. You can still submit, or go back and adjust weights."}
@@ -864,7 +1038,7 @@ function PriceConfirmModal({
                     </Text>
                     <Text fz="xs" c="dimmed">
                       {line.quantity.toLocaleString()} ×{" "}
-                      {line.unitPrice.toLocaleString()} {total.currency} ·{" "}
+                      {formatAmount(line.unitPrice)} {total.currency} ·{" "}
                       {formatRateUnit(line.unit)}
                     </Text>
                   </Box>
@@ -874,7 +1048,7 @@ function PriceConfirmModal({
                     c="#10202F"
                     style={{ whiteSpace: "nowrap" }}
                   >
-                    {line.amount.toLocaleString()} {total.currency}
+                    {formatAmount(line.amount)} {total.currency}
                   </Text>
                 </Group>
               ))}
@@ -896,7 +1070,7 @@ function PriceConfirmModal({
                 Total
               </Text>
               <Text fw={800} fz={28} c="#10202F">
-                {total.total.toLocaleString()}{" "}
+                {formatAmount(total.total)}{" "}
                 <Text span fz={16} fw={700} c="edr-muted">
                   {total.currency}
                 </Text>
@@ -1041,6 +1215,9 @@ function ScheduleStep({
   })();
 
   const isIntercity = contract.tradeDirection === "DOMESTIC";
+  // USD billing is offered on import traffic only — export and domestic
+  // shipments are always invoiced in ETB.
+  const isImport = contract.tradeDirection === "IMPORT";
   const { data: availableDays, isLoading } = useQuery({
     ...api.bookings.getAvailableDaysForCargo.queryOptions({
       input:
@@ -1136,13 +1313,15 @@ function ScheduleStep({
           <Box mb="lg">
             <StepLabel>Billing currency *</StepLabel>
             <Text fz={12.5} c="dimmed" mt={4} mb={10}>
-              Your contract is quoted in USD. Pick the currency this shipment is
-              invoiced in — the total is converted for you.
+              {isImport
+                ? "Import shipments may be invoiced in ETB or USD. USD is paid by bank transfer, not online."
+                : "Shipments are invoiced in ETB."}
             </Text>
             <CurrencySelector
               value={field.value || ""}
               onChange={(v) => field.onChange(v)}
               error={fieldState.error?.message}
+              allowUsd={isImport}
             />
           </Box>
         )}
@@ -1179,12 +1358,23 @@ function ScheduleStep({
               </Text>
             )}
             {isExportPick && scheduledDate ? (
-              <ExportTrainPicker
-                options={exportTrainsQuery.data ?? []}
-                loading={exportTrainsQuery.isLoading}
-                value={selectedTrainId ?? ""}
-                onChange={(id) => form.setValue("trainScheduleId", id)}
-              />
+              <>
+                <ExportTrainPicker
+                  options={exportTrainsQuery.data ?? []}
+                  loading={exportTrainsQuery.isLoading}
+                  value={selectedTrainId ?? ""}
+                  onChange={(id) =>
+                    form.setValue("trainScheduleId", id, {
+                      shouldValidate: true,
+                    })
+                  }
+                />
+                {form.formState.errors.trainScheduleId?.message && (
+                  <Text fz="xs" c="red" mt={6}>
+                    {String(form.formState.errors.trainScheduleId.message)}
+                  </Text>
+                )}
+              </>
             ) : null}
           </Box>
         )}
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step2-service-type.tsx b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step2-service-type.tsx
index de227035f..cbd2c8913 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step2-service-type.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step2-service-type.tsx
@@ -254,6 +254,11 @@ export function Step2ServiceType({
     (serviceType?.includesLastMile ?? false) && tradeDirection !== "EXPORT";
   const firstMileEnabled = form.watch("firstMile.enabled");
   const lastMileEnabled = form.watch("lastMile.enabled");
+  // The paid-mile service prices the road legs into the booking itself; every
+  // other service defers last-mile billing to after the Djibouti departure
+  // (confirm containers → sign supplementary LM contract → pay advance).
+  const deferredLastMileBilling =
+    serviceType?.code !== "RAIL_CONTAINER_PAID_MILE";
 
   const prevServiceType = useRef(serviceType);
   useEffect(() => {
@@ -471,7 +476,11 @@ export function Step2ServiceType({
                 <ServiceToggle
                   icon={<Truck size={18} />}
                   title="Last Mile — Delivery"
-                  description="Truck delivery from the destination rail yard to the final address (Port to Door)."
+                  description={
+                    deferredLastMileBilling
+                      ? "Truck delivery from the destination rail yard to the final address (Port to Door). Nothing is paid now — last-mile billing starts after your train departs Djibouti."
+                      : "Truck delivery from the destination rail yard to the final address (Port to Door)."
+                  }
                   checked={field.value ?? false}
                   onChange={(value) => {
                     field.onChange(value);
@@ -492,6 +501,15 @@ export function Step2ServiceType({
                 >
                   {lastMileEnabled && (
                     <Stack mt="md" gap={12}>
+                      {deferredLastMileBilling && (
+                        <Text size="xs" c="dimmed">
+                          How it works: when your train departs Djibouti, you
+                          will be asked to confirm which containers EDR should
+                          deliver. Once truck availability is approved, you will
+                          sign a short supplementary last-mile contract and pay
+                          the delivery advance — nothing is charged at booking.
+                        </Text>
+                      )}
                       <Controller
                         name="lastMile"
                         control={form.control}
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts
index 825112980..a156a2174 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts
@@ -30,6 +30,11 @@ export interface ShipmentValidationContext {
    * staff pick later, so no shipment day is chosen. Defaults to true.
    */
   requiresDate?: boolean;
+  /**
+   * EXPORT rail completion: the shipment must ride a specific train the
+   * customer picks for the chosen day. Defaults to false.
+   */
+  requiresTrain?: boolean;
 }
 
 // ISO 6346: 3-letter owner code + category id (U/J/Z) + 6-digit serial + check digit.
@@ -102,6 +107,20 @@ export function createShipmentFormSchema(ctx: ShipmentValidationContext) {
       });
     }
 
+    // Train is only pickable once a day is chosen — the day error covers the
+    // no-date case, so don't stack a second error on an invisible field.
+    if (
+      ctx.requiresTrain &&
+      data.scheduledDate.trim() &&
+      !data.trainScheduleId.trim()
+    ) {
+      refineCtx.addIssue({
+        code: "custom",
+        path: ["trainScheduleId"],
+        message: "Select a train for your shipment day.",
+      });
+    }
+
     // No default currency — the customer must pick one before submitting.
     if (!data.paymentCurrency) {
       refineCtx.addIssue({
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts
index cbe9ae083..7c80ca1d6 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts
@@ -15,6 +15,19 @@ export interface ShipmentTotal {
   total: number;
 }
 
+/**
+ * Money always prints its cents. Bare toLocaleString() defaults to
+ * maximumFractionDigits: 0, which rounded the total away from the line items it
+ * sums (118,171.21 shown as 118,171) — and the customer is billed the exact
+ * amount, so the shown figure must match to the cent.
+ */
+export function formatAmount(amount: number | string | null | undefined) {
+  return Number(amount ?? 0).toLocaleString(undefined, {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+  });
+}
+
 /**
  * Quantity a bulk rate bills, in ITS OWN unit. PER_ITEM cargo carries both
  * figures — the item count prices the booking, the tonnage sizes the wagons —
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/train-required.test.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/train-required.test.ts
new file mode 100644
index 000000000..edf4ec284
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/train-required.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from "vitest";
+
+import { createShipmentFormSchema, initialShipmentFormValues } from "./schema";
+
+const schema = createShipmentFormSchema({
+  isContainer: false,
+  isHazardous: false,
+  isReefer: false,
+  requiresTrain: true,
+});
+
+const values = (over: Record<string, unknown> = {}) => ({
+  ...initialShipmentFormValues,
+  cargoWeightTons: "10",
+  paymentCurrency: "USD",
+  scheduledDate: "2026-08-10",
+  ...over,
+});
+
+const trainIssue = (input: Record<string, unknown>) => {
+  const result = schema.safeParse(input);
+  return result.success
+    ? undefined
+    : result.error.issues.find((i) => i.path[0] === "trainScheduleId");
+};
+
+describe("requiresTrain", () => {
+  it("rejects a dated export completion without a train pick", () => {
+    expect(trainIssue(values())?.message).toMatch(/select a train/i);
+  });
+
+  it("passes once a train is picked", () => {
+    expect(trainIssue(values({ trainScheduleId: "sched-1" }))).toBeUndefined();
+  });
+
+  it("stays silent while no date is chosen (day error covers it)", () => {
+    expect(trainIssue(values({ scheduledDate: "" }))).toBeUndefined();
+  });
+
+  it("is off by default (non-completion flows)", () => {
+    const plain = createShipmentFormSchema({
+      isContainer: false,
+      isHazardous: false,
+      isReefer: false,
+    });
+    const result = plain.safeParse(values());
+    expect(
+      result.success ||
+        result.error.issues.every((i) => i.path[0] !== "trainScheduleId"),
+    ).toBe(true);
+  });
+});
diff --git a/apps/edr-freight-web/portal/src/pages/customers/on_boarding/DjiboutiFreightForwardingAgent.tsx b/apps/edr-freight-web/portal/src/pages/customers/on_boarding/DjiboutiFreightForwardingAgent.tsx
deleted file mode 100644
index f7955a0c0..000000000
--- a/apps/edr-freight-web/portal/src/pages/customers/on_boarding/DjiboutiFreightForwardingAgent.tsx
+++ /dev/null
@@ -1,512 +0,0 @@
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
-
-import {
-  ArrowLeft,
-  ArrowRight,
-  Building2,
-  User,
-  CheckCircle2,
-} from "lucide-react";
-
-import { ControlledPhoneField, isValidPhone } from "@/components/PhoneField";
-
-import {
-  Button,
-  Field,
-  FieldError,
-  FieldGroup,
-  FieldLabel,
-  Input,
-} from "@edr/ui-common";
-
-type OnboardingStep =
-  | "personal"
-  | "company"
-  | "representative";
-
-const schema = z.object({
-  // PERSONAL
-  firstName: z.string().min(1, "First name is required"),
-
-  lastName: z.string().min(1, "Last name is required"),
-
-  email: z.string().email("Invalid email address"),
-
-  phoneNumber: z
-    .string()
-    .min(1, "Phone number is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-
-  // COMPANY
-  companyName: z
-    .string()
-    .min(1, "Company name is required"),
-
-  companyEmail: z
-    .string()
-    .email("Invalid company email"),
-
-  companyPhone: z
-    .string()
-    .min(1, "Company phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-
-  companyLocation: z
-    .string()
-    .min(1, "Company location is required"),
-
-  companyAddress: z
-    .string()
-    .min(1, "Company address is required"),
-
-  // REPRESENTATIVE
-  representativeName: z
-    .string()
-    .min(1, "Representative name is required"),
-
-  representativeEmail: z
-    .string()
-    .email("Invalid representative email"),
-
-  representativePhone: z
-    .string()
-    .min(1, "Representative phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-});
-
-type FormData = z.infer<typeof schema>;
-
-const stepFields: Record<
-  OnboardingStep,
-  (keyof FormData)[]
-> = {
-  personal: [
-    "firstName",
-    "lastName",
-    "email",
-    "phoneNumber",
-  ],
-
-  company: [
-    "companyName",
-    "companyEmail",
-    "companyPhone",
-    "companyLocation",
-    "companyAddress",
-  ],
-
-  representative: [
-    "representativeName",
-    "representativeEmail",
-    "representativePhone",
-  ],
-};
-
-export default function DjiboutiForwardingAgentForm() {
-  const [step, setStep] =
-    useState<OnboardingStep>("personal");
-
-  const {
-    register,
-    control,
-    handleSubmit,
-    trigger,
-    formState: { errors, isSubmitting },
-  } = useForm<FormData>({
-    resolver: zodResolver(schema),
-
-    defaultValues: {
-      phoneNumber: "",
-      companyPhone: "",
-      representativePhone: "",
-    },
-  });
-
-  const nextStep = async () => {
-    if (step === "representative") {
-      handleSubmit(onSubmit)();
-      return;
-    }
-
-    const isValid = await trigger(
-      stepFields[step]
-    );
-
-    if (!isValid) return;
-
-    if (step === "personal") {
-      setStep("company");
-    } else {
-      setStep("representative");
-    }
-  };
-
-  const prevStep = () => {
-    if (step === "company") {
-      setStep("personal");
-    } else if (
-      step === "representative"
-    ) {
-      setStep("company");
-    }
-  };
-
-  const onSubmit = async (
-    data: FormData
-  ) => {
-    console.log(data);
-  };
-
-  return (
-    <>
-      {/* STEPPER */}
-      <div className="mb-8">
-        <div className="flex items-center justify-between max-w-xl mx-auto relative px-2">
-          <div className="absolute top-1/2 left-0 w-full h-0.5 bg-border -translate-y-1/2 z-0" />
-
-          <StepIcon
-            icon={<User className="size-5" />}
-            active={step === "personal"}
-            completed={
-              step !== "personal"
-            }
-          />
-
-          <StepIcon
-            icon={
-              <Building2 className="size-5" />
-            }
-            active={step === "company"}
-            completed={
-              step === "representative"
-            }
-          />
-
-          <StepIcon
-            icon={<User className="size-5" />}
-            active={
-              step === "representative"
-            }
-            completed={false}
-          />
-        </div>
-
-        <p className="text-center text-sm text-muted-foreground mt-3">
-          {step === "personal" &&
-            "Step 1 of 3 — Personal Information"}
-
-          {step === "company" &&
-            "Step 2 of 3 — Company Information"}
-
-          {step === "representative" &&
-            "Step 3 of 3 — Representative Information"}
-        </p>
-      </div>
-
-      {/* FORM */}
-      <form
-        onSubmit={handleSubmit(onSubmit)}
-        className="flex flex-col gap-4"
-      >
-        <FieldGroup className="gap-4">
-          {/* PERSONAL */}
-          {step === "personal" && (
-            <>
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.firstName
-                  )}
-                >
-                  <FieldLabel>
-                    First Name
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Ahmed"
-                    {...register("firstName")}
-                  />
-
-                  <FieldError
-                    errors={[errors.firstName]}
-                  />
-                </Field>
-
-                <Field
-                  data-invalid={Boolean(
-                    errors.lastName
-                  )}
-                >
-                  <FieldLabel>
-                    Last Name
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Ali"
-                    {...register("lastName")}
-                  />
-
-                  <FieldError
-                    errors={[errors.lastName]}
-                  />
-                </Field>
-              </div>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.email
-                  )}
-                >
-                  <FieldLabel>Email</FieldLabel>
-
-                  <Input
-                    type="email"
-                    placeholder="agent@company.com"
-                    {...register("email")}
-                  />
-
-                  <FieldError
-                    errors={[errors.email]}
-                  />
-                </Field>
-
-                <ControlledPhoneField
-                  control={control}
-                  name="phoneNumber"
-                  label="Phone Number"
-                  required
-                />
-              </div>
-            </>
-          )}
-
-          {/* COMPANY */}
-          {step === "company" && (
-            <>
-              <Field
-                data-invalid={Boolean(
-                  errors.companyName
-                )}
-              >
-                <FieldLabel>
-                  Company Name
-                </FieldLabel>
-
-                <Input
-                  placeholder="Djibouti Freight Co."
-                  {...register("companyName")}
-                />
-
-                <FieldError
-                  errors={[errors.companyName]}
-                />
-              </Field>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.companyEmail
-                  )}
-                >
-                  <FieldLabel>
-                    Company Email
-                  </FieldLabel>
-
-                  <Input
-                    type="email"
-                    placeholder="ops@company.com"
-                    {...register(
-                      "companyEmail"
-                    )}
-                  />
-
-                  <FieldError
-                    errors={[errors.companyEmail]}
-                  />
-                </Field>
-
-                <ControlledPhoneField
-                  control={control}
-                  name="companyPhone"
-                  label="Company Phone"
-                  required
-                />
-              </div>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.companyLocation
-                  )}
-                >
-                  <FieldLabel>
-                    Company Location / Country
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Djibouti"
-                    {...register(
-                      "companyLocation"
-                    )}
-                  />
-
-                  <FieldError
-                    errors={[
-                      errors.companyLocation,
-                    ]}
-                  />
-                </Field>
-
-                <Field
-                  data-invalid={Boolean(
-                    errors.companyAddress
-                  )}
-                >
-                  <FieldLabel>
-                    Company Address
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Rue de Venise"
-                    {...register(
-                      "companyAddress"
-                    )}
-                  />
-
-                  <FieldError
-                    errors={[
-                      errors.companyAddress,
-                    ]}
-                  />
-                </Field>
-              </div>
-            </>
-          )}
-
-          {/* REPRESENTATIVE */}
-          {step ===
-            "representative" && (
-            <>
-              <Field
-                data-invalid={Boolean(
-                  errors.representativeName
-                )}
-              >
-                <FieldLabel>
-                  Company Representative Person
-                  Name
-                </FieldLabel>
-
-                <Input
-                  placeholder="Mohamed Hassan"
-                  {...register(
-                    "representativeName"
-                  )}
-                />
-
-                <FieldError
-                  errors={[
-                    errors.representativeName,
-                  ]}
-                />
-              </Field>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.representativeEmail
-                  )}
-                >
-                  <FieldLabel>
-                    Representative Email
-                  </FieldLabel>
-
-                  <Input
-                    type="email"
-                    placeholder="rep@company.com"
-                    {...register(
-                      "representativeEmail"
-                    )}
-                  />
-
-                  <FieldError
-                    errors={[
-                      errors.representativeEmail,
-                    ]}
-                  />
-                </Field>
-
-                <ControlledPhoneField
-                  control={control}
-                  name="representativePhone"
-                  label="Representative Phone"
-                  required
-                />
-              </div>
-            </>
-          )}
-        </FieldGroup>
-
-        {/* FOOTER */}
-        <div className="flex items-center justify-between pt-2">
-          <Button
-            type="button"
-            variant="outline"
-            onClick={prevStep}
-            disabled={step === "personal"}
-          >
-            <ArrowLeft />
-            Back
-          </Button>
-
-          <Button
-            type="button"
-            onClick={nextStep}
-            disabled={isSubmitting}
-          >
-            {step === "representative" ? (
-              "Complete Registration"
-            ) : (
-              <>
-                Next Step
-                <ArrowRight />
-              </>
-            )}
-          </Button>
-        </div>
-      </form>
-    </>
-  );
-}
-
-function StepIcon({
-  icon,
-  active,
-  completed,
-}: {
-  icon: React.ReactNode;
-  active: boolean;
-  completed: boolean;
-}) {
-  return (
-    <div
-      className={`relative z-10 flex h-10 w-10 items-center justify-center rounded-full border-2 transition-all ${
-        completed
-          ? "bg-primary border-primary text-primary-foreground"
-          : active
-            ? "bg-background border-primary text-primary shadow-md"
-            : "bg-background border-border text-muted-foreground"
-      }`}
-    >
-      {completed ? (
-        <CheckCircle2 className="size-5" />
-      ) : (
-        icon
-      )}
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/apps/edr-freight-web/portal/src/pages/customers/on_boarding/ImportExportOnBoarding.tsx b/apps/edr-freight-web/portal/src/pages/customers/on_boarding/ImportExportOnBoarding.tsx
deleted file mode 100644
index 33a28f58d..000000000
--- a/apps/edr-freight-web/portal/src/pages/customers/on_boarding/ImportExportOnBoarding.tsx
+++ /dev/null
@@ -1,711 +0,0 @@
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
-
-import {
-  ArrowLeft,
-  ArrowRight,
-  Building2,
-  User,
-  FileText,
-  CheckCircle2,
-} from "lucide-react";
-
-import { ControlledPhoneField, isValidPhone } from "@/components/PhoneField";
-
-import {
-  Button,
-  Field,
-  FieldError,
-  FieldGroup,
-  FieldLabel,
-  Input,
-} from "@edr/ui-common";
-
-type OnboardingStep =
-  | "personal"
-  | "company"
-  | "personnel"
-  | "poa";
-
-const onboardingSchema = z.object({
-  // PERSONAL
-  firstName: z.string().min(1, "First name is required"),
-  lastName: z.string().min(1, "Last name is required"),
-  email: z.string().email("Invalid email address"),
-  phoneNumber: z
-    .string()
-    .min(1, "Phone number is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-
-  // COMPANY
-  companyName: z.string().min(1, "Company name is required"),
-  companyEmail: z.string().email("Invalid email address"),
-  companyPhone: z
-    .string()
-    .min(1, "Company phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-  companyLocation: z.string().min(1, "Location is required"),
-  companyAddress: z.string().min(1, "Address is required"),
-
-  // LEGAL
-  tinNumber: z.string().regex(/^\d{10}$/, {
-    message: "TIN must be exactly 10 digits",
-  }),
-
-  vatNumber: z.string().min(1, "VAT number is required"),
-
-  fanNumber: z.string().regex(/^\d{16}$/, {
-    message: "FAN must be exactly 16 digits",
-  }),
-
-  // CONTACT PERSON
-  contactPersonName: z
-    .string()
-    .min(1, "Contact person name is required"),
-
-  contactPersonPhone: z
-    .string()
-    .min(1, "Contact person phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-
-  // GENERAL MANAGER
-  generalManagerName: z
-    .string()
-    .min(1, "General manager name is required"),
-
-  generalManagerEmail: z
-    .string()
-    .email("Invalid email"),
-
-  generalManagerPhone: z
-    .string()
-    .min(1, "General manager phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
-
-  // OPTIONAL POA
-  poaName: z.string().optional(),
-  poaPhone: z
-    .string()
-    .optional()
-    .refine((v) => !v || isValidPhone(v), "Enter a valid phone number"),
-  poaAddress: z.string().optional(),
-  poaEmail: z.string().optional(),
-  poaLocation: z.string().optional(),
-});
-
-type FormData = z.infer<typeof onboardingSchema>;
-
-const stepFields: Record<
-  OnboardingStep,
-  (keyof FormData)[]
-> = {
-  personal: [
-    "firstName",
-    "lastName",
-    "email",
-    "phoneNumber",
-  ],
-
-  company: [
-    "companyName",
-    "companyEmail",
-    "companyPhone",
-    "companyLocation",
-    "companyAddress",
-    "tinNumber",
-    "vatNumber",
-    "fanNumber",
-  ],
-
-  personnel: [
-    "contactPersonName",
-    "contactPersonPhone",
-    "generalManagerName",
-    "generalManagerEmail",
-    "generalManagerPhone",
-  ],
-
-  poa: [],
-};
-
-export default function ImportExportOnBoarding() {
-  const [step, setStep] =
-    useState<OnboardingStep>("personal");
-
-  const {
-    register,
-    control,
-    handleSubmit,
-    trigger,
-    formState: { errors, isSubmitting },
-  } = useForm<FormData>({
-    resolver: zodResolver(onboardingSchema),
-
-    defaultValues: {
-      phoneNumber: "",
-      companyPhone: "",
-      contactPersonPhone: "",
-      generalManagerPhone: "",
-      poaPhone: "",
-    },
-  });
-
-  const nextStep = async () => {
-    if (step === "poa") {
-      handleSubmit(onSubmit)();
-      return;
-    }
-
-    const isValid = await trigger(stepFields[step]);
-
-    if (!isValid) return;
-
-    if (step === "personal") {
-      setStep("company");
-    } else if (step === "company") {
-      setStep("personnel");
-    } else {
-      setStep("poa");
-    }
-  };
-
-  const prevStep = () => {
-    if (step === "company") {
-      setStep("personal");
-    } else if (step === "personnel") {
-      setStep("company");
-    } else if (step === "poa") {
-      setStep("personnel");
-    }
-  };
-
-  const onSubmit = async (data: FormData) => {
-    console.log(data);
-  };
-
-  return (
-    <>
-      {/* STEP HEADER */}
-      <div className="mb-8">
-        <div className="flex items-center justify-between max-w-2xl mx-auto relative px-2">
-          <div className="absolute top-1/2 left-0 w-full h-0.5 bg-border -translate-y-1/2 z-0" />
-
-          <StepIcon
-            icon={<User className="size-5" />}
-            active={step === "personal"}
-            completed={
-              step !== "personal"
-            }
-          />
-
-          <StepIcon
-            icon={<Building2 className="size-5" />}
-            active={step === "company"}
-            completed={
-              step === "personnel" ||
-              step === "poa"
-            }
-          />
-
-          <StepIcon
-            icon={<User className="size-5" />}
-            active={step === "personnel"}
-            completed={step === "poa"}
-          />
-
-          <StepIcon
-            icon={<FileText className="size-5" />}
-            active={step === "poa"}
-            completed={false}
-          />
-        </div>
-
-        <p className="text-center text-sm text-muted-foreground mt-3">
-          {step === "personal" &&
-            "Step 1 of 4 — Personal Information"}
-
-          {step === "company" &&
-            "Step 2 of 4 — Company Information"}
-
-          {step === "personnel" &&
-            "Step 3 of 4 — Personnel Information"}
-
-          {step === "poa" &&
-            "Step 4 of 4 — Power of Attorney"}
-        </p>
-      </div>
-
-      <form
-        onSubmit={handleSubmit(onSubmit)}
-        className="flex flex-col gap-4"
-      >
-        <FieldGroup className="gap-4">
-          {/* PERSONAL */}
-          {step === "personal" && (
-            <>
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.firstName
-                  )}
-                >
-                  <FieldLabel>
-                    First Name
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="John"
-                    {...register("firstName")}
-                  />
-
-                  <FieldError
-                    errors={[errors.firstName]}
-                  />
-                </Field>
-
-                <Field
-                  data-invalid={Boolean(
-                    errors.lastName
-                  )}
-                >
-                  <FieldLabel>
-                    Last Name
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Doe"
-                    {...register("lastName")}
-                  />
-
-                  <FieldError
-                    errors={[errors.lastName]}
-                  />
-                </Field>
-              </div>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.email
-                  )}
-                >
-                  <FieldLabel>Email</FieldLabel>
-
-                  <Input
-                    type="email"
-                    placeholder="john@example.com"
-                    {...register("email")}
-                  />
-
-                  <FieldError
-                    errors={[errors.email]}
-                  />
-                </Field>
-
-                <ControlledPhoneField
-                  control={control}
-                  name="phoneNumber"
-                  label="Phone Number"
-                  required
-                />
-              </div>
-            </>
-          )}
-
-          {/* COMPANY */}
-          {step === "company" && (
-            <>
-              <Field
-                data-invalid={Boolean(
-                  errors.companyName
-                )}
-              >
-                <FieldLabel>
-                  Company Name
-                </FieldLabel>
-
-                <Input
-                  placeholder="Global Logistics Ltd"
-                  {...register("companyName")}
-                />
-
-                <FieldError
-                  errors={[errors.companyName]}
-                />
-              </Field>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.companyEmail
-                  )}
-                >
-                  <FieldLabel>
-                    Company Email
-                  </FieldLabel>
-
-                  <Input
-                    type="email"
-                    placeholder="ops@company.com"
-                    {...register(
-                      "companyEmail"
-                    )}
-                  />
-
-                  <FieldError
-                    errors={[errors.companyEmail]}
-                  />
-                </Field>
-
-                <ControlledPhoneField
-                  control={control}
-                  name="companyPhone"
-                  label="Company Phone"
-                  required
-                />
-              </div>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.companyLocation
-                  )}
-                >
-                  <FieldLabel>
-                    Company Location
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Addis Ababa"
-                    {...register(
-                      "companyLocation"
-                    )}
-                  />
-
-                  <FieldError
-                    errors={[
-                      errors.companyLocation,
-                    ]}
-                  />
-                </Field>
-
-                <Field
-                  data-invalid={Boolean(
-                    errors.companyAddress
-                  )}
-                >
-                  <FieldLabel>
-                    Company Address
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Bole, Woreda 03"
-                    {...register(
-                      "companyAddress"
-                    )}
-                  />
-
-                  <FieldError
-                    errors={[
-                      errors.companyAddress,
-                    ]}
-                  />
-                </Field>
-              </div>
-
-              <div className="grid grid-cols-3 gap-4">
-                <Field
-                  data-invalid={Boolean(
-                    errors.tinNumber
-                  )}
-                >
-                  <FieldLabel>
-                    TIN Number
-                  </FieldLabel>
-
-                  <Input
-                    maxLength={10}
-                    placeholder="1234567890"
-                    {...register("tinNumber")}
-                  />
-
-                  <FieldError
-                    errors={[errors.tinNumber]}
-                  />
-                </Field>
-
-                <Field
-                  data-invalid={Boolean(
-                    errors.vatNumber
-                  )}
-                >
-                  <FieldLabel>
-                    VAT Number
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="VAT123456"
-                    {...register("vatNumber")}
-                  />
-
-                  <FieldError
-                    errors={[errors.vatNumber]}
-                  />
-                </Field>
-
-                <Field
-                  data-invalid={Boolean(
-                    errors.fanNumber
-                  )}
-                >
-                  <FieldLabel>
-                    FAN Number
-                  </FieldLabel>
-
-                  <Input
-                    maxLength={16}
-                    placeholder="1234567890123456"
-                    {...register("fanNumber")}
-                  />
-
-                  <FieldError
-                    errors={[errors.fanNumber]}
-                  />
-                </Field>
-              </div>
-            </>
-          )}
-
-          {/* PERSONNEL */}
-          {step === "personnel" && (
-            <>
-              <div>
-                <h3 className="text-sm font-semibold text-foreground mb-3">
-                  Contact Person
-                </h3>
-
-                <div className="grid grid-cols-2 gap-4">
-                  <Field
-                    data-invalid={Boolean(
-                      errors.contactPersonName
-                    )}
-                  >
-                    <FieldLabel>
-                      Contact Person Name
-                    </FieldLabel>
-
-                    <Input
-                      placeholder="Jane Smith"
-                      {...register(
-                        "contactPersonName"
-                      )}
-                    />
-
-                    <FieldError
-                      errors={[
-                        errors.contactPersonName,
-                      ]}
-                    />
-                  </Field>
-
-                  <ControlledPhoneField
-                    control={control}
-                    name="contactPersonPhone"
-                    label="Contact Person Phone"
-                    required
-                  />
-                </div>
-              </div>
-
-              <hr className="border-border" />
-
-              <div>
-                <h3 className="text-sm font-semibold text-foreground mb-3">
-                  General Manager
-                </h3>
-
-                <div className="grid grid-cols-2 gap-4">
-                  <Field
-                    className="col-span-2"
-                    data-invalid={Boolean(
-                      errors.generalManagerName
-                    )}
-                  >
-                    <FieldLabel>
-                      General Manager Name
-                    </FieldLabel>
-
-                    <Input
-                      placeholder="Abebe Bikila"
-                      {...register(
-                        "generalManagerName"
-                      )}
-                    />
-
-                    <FieldError
-                      errors={[
-                        errors.generalManagerName,
-                      ]}
-                    />
-                  </Field>
-
-                  <Field
-                    data-invalid={Boolean(
-                      errors.generalManagerEmail
-                    )}
-                  >
-                    <FieldLabel>
-                      General Manager Email
-                    </FieldLabel>
-
-                    <Input
-                      type="email"
-                      placeholder="gm@company.com"
-                      {...register(
-                        "generalManagerEmail"
-                      )}
-                    />
-
-                    <FieldError
-                      errors={[
-                        errors.generalManagerEmail,
-                      ]}
-                    />
-                  </Field>
-
-                  <ControlledPhoneField
-                    control={control}
-                    name="generalManagerPhone"
-                    label="General Manager Phone"
-                    required
-                  />
-                </div>
-              </div>
-            </>
-          )}
-
-          {/* POA */}
-          {step === "poa" && (
-            <>
-              <p className="text-sm text-muted-foreground">
-                Power of Attorney details are
-                optional.
-              </p>
-
-              <Field>
-                <FieldLabel>PoA Name</FieldLabel>
-
-                <Input
-                  placeholder="Authorized Representative"
-                  {...register("poaName")}
-                />
-              </Field>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field>
-                  <FieldLabel>
-                    PoA Email
-                  </FieldLabel>
-
-                  <Input
-                    type="email"
-                    placeholder="poa@company.com"
-                    {...register("poaEmail")}
-                  />
-                </Field>
-
-                <ControlledPhoneField
-                  control={control}
-                  name="poaPhone"
-                  label="PoA Phone"
-                />
-              </div>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field>
-                  <FieldLabel>
-                    PoA Location
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="City, Country"
-                    {...register("poaLocation")}
-                  />
-                </Field>
-
-                <Field>
-                  <FieldLabel>
-                    PoA Address
-                  </FieldLabel>
-
-                  <Input
-                    placeholder="Full Address"
-                    {...register("poaAddress")}
-                  />
-                </Field>
-              </div>
-            </>
-          )}
-        </FieldGroup>
-
-        {/* FOOTER */}
-        <div className="flex items-center justify-between pt-2">
-          <Button
-            type="button"
-            variant="outline"
-            onClick={prevStep}
-            disabled={step === "personal"}
-          >
-            <ArrowLeft />
-            Back
-          </Button>
-
-          <Button
-            type="button"
-            onClick={nextStep}
-            disabled={isSubmitting}
-          >
-            {step === "poa" ? (
-              "Complete Registration"
-            ) : (
-              <>
-                Next Step
-                <ArrowRight />
-              </>
-            )}
-          </Button>
-        </div>
-      </form>
-    </>
-  );
-}
-
-function StepIcon({
-  icon,
-  active,
-  completed,
-}: {
-  icon: React.ReactNode;
-  active: boolean;
-  completed: boolean;
-}) {
-  return (
-    <div
-      className={`relative z-10 flex h-10 w-10 items-center justify-center rounded-full border-2 transition-all ${
-        completed
-          ? "bg-primary border-primary text-primary-foreground"
-          : active
-            ? "bg-background border-primary text-primary shadow-md"
-            : "bg-background border-border text-muted-foreground"
-      }`}
-    >
-      {completed ? (
-        <CheckCircle2 className="size-5" />
-      ) : (
-        icon
-      )}
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/apps/edr-freight-web/portal/src/pages/customers/on_boarding/TransportrOnBoarding.tsx b/apps/edr-freight-web/portal/src/pages/customers/on_boarding/TransportrOnBoarding.tsx
deleted file mode 100644
index 77b5d4ecd..000000000
--- a/apps/edr-freight-web/portal/src/pages/customers/on_boarding/TransportrOnBoarding.tsx
+++ /dev/null
@@ -1,288 +0,0 @@
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
-
-import {
-  ArrowLeft,
-  ArrowRight,
-  User,
-  Truck,
-  CheckCircle2,
-} from "lucide-react";
-
-import { ControlledPhoneField, isValidPhone } from "@/components/PhoneField";
-
-import {
-  Button,
-  Field,
-  FieldError,
-  FieldGroup,
-  FieldLabel,
-  Input,
-} from "@edr/ui-common";
-
-type Step = "personal" | "transport";
-
-const schema = z.object({
-  // PERSONAL
-  firstName: z.string().min(1),
-  lastName: z.string().min(1),
-  email: z.string().email(),
-  phoneNumber: z
-    .string()
-    .min(1)
-    .refine(isValidPhone, "Enter a valid phone number"),
-
-  // TRANSPORT
-  fanNumber: z.string().min(1),
-  tinNumber: z.string().regex(/^\d{10}$/, "TIN must be exactly 10 digits"),
-
-  truckType: z.enum([
-    "Casoni",
-    "Truck Trailer",
-    "High Bed",
-    "Low Bed",
-    "Others",
-  ]),
-
-  plateNumber: z.string().min(1),
-
-  plateNumber2: z.string().optional(),
-
-  vehicleModel: z.string().min(1),
-  yearOfManufacturing: z.string().min(1),
-});
-
-type FormData = z.infer<typeof schema>;
-
-const stepFields: Record<Step, (keyof FormData)[]> = {
-  personal: [
-    "firstName",
-    "lastName",
-    "email",
-    "phoneNumber",
-  ],
-  transport: [
-    "fanNumber",
-    "tinNumber",
-    "truckType",
-    "plateNumber",
-    "plateNumber2",
-    "vehicleModel",
-    "yearOfManufacturing",
-  ],
-};
-
-export default function TransporterOnboarding() {
-  const [step, setStep] = useState<Step>("personal");
-
-  const {
-    register,
-    control,
-    handleSubmit,
-    trigger,
-    watch,
-    formState: { errors, isSubmitting },
-  } = useForm<FormData>({
-    resolver: zodResolver(schema),
-    defaultValues: {
-      phoneNumber: "",
-    },
-  });
-
-  const truckType = watch("truckType");
-
-  const nextStep = async () => {
-    const valid = await trigger(stepFields[step]);
-    if (!valid) return;
-
-    if (step === "personal") setStep("transport");
-    else handleSubmit(onSubmit)();
-  };
-
-  const prevStep = () => {
-    if (step === "transport") setStep("personal");
-  };
-
-  const onSubmit = (data: FormData) => {
-    console.log("TRANSPORTER:", data);
-  };
-
-  return (
-    <>
-      {/* STEPPER */}
-      <div className="mb-8 lg:col-span-2">
-        <div className="flex items-center justify-between max-w-lg mx-auto relative px-2">
-          <div className="absolute top-1/2 left-0 w-full h-0.5 bg-border -translate-y-1/2 z-0" />
-
-          <StepIcon
-            icon={<User className="size-5" />}
-            active={step === "personal"}
-            completed={step !== "personal"}
-          />
-
-          <StepIcon
-            icon={<Truck className="size-5" />}
-            active={step === "transport"}
-            completed={false}
-          />
-        </div>
-
-        <p className="text-center text-sm text-muted-foreground mt-3">
-          {step === "personal" && "Step 1 of 2 — Personal Information"}
-          {step === "transport" && "Step 2 of 2 — Transport Information"}
-        </p>
-      </div>
-
-      {/* FORM */}
-      <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-4">
-        <FieldGroup className="gap-4">
-
-          {/* PERSONAL */}
-          {step === "personal" && (
-            <>
-              <div className="grid grid-cols-2 gap-4">
-                <Field data-invalid={!!errors.firstName}>
-                  <FieldLabel>First Name</FieldLabel>
-                  <Input {...register("firstName")} />
-                  <FieldError errors={[errors.firstName]} />
-                </Field>
-
-                <Field data-invalid={!!errors.lastName}>
-                  <FieldLabel>Last Name</FieldLabel>
-                  <Input {...register("lastName")} />
-                  <FieldError errors={[errors.lastName]} />
-                </Field>
-              </div>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field data-invalid={!!errors.email}>
-                  <FieldLabel>Email</FieldLabel>
-                  <Input type="email" {...register("email")} />
-                  <FieldError errors={[errors.email]} />
-                </Field>
-
-                <ControlledPhoneField
-                  control={control}
-                  name="phoneNumber"
-                  label="Phone Number"
-                  required
-                />
-              </div>
-            </>
-          )}
-
-          {/* TRANSPORT */}
-          {step === "transport" && (
-            <>
-              <div className="grid grid-cols-2 gap-4">
-                <Field data-invalid={!!errors.fanNumber}>
-                  <FieldLabel>FAN Number</FieldLabel>
-                  <Input {...register("fanNumber")} />
-                  <FieldError errors={[errors.fanNumber]} />
-                </Field>
-
-                <Field data-invalid={!!errors.tinNumber}>
-                  <FieldLabel>TIN Number</FieldLabel>
-                  <Input maxLength={10} inputMode="numeric" {...register("tinNumber")} />
-                  <FieldError errors={[errors.tinNumber]} />
-                </Field>
-              </div>
-
-              <Field data-invalid={!!errors.truckType}>
-                <FieldLabel>Truck Type</FieldLabel>
-                <select
-                  className="w-full border rounded-md p-2 bg-background"
-                  {...register("truckType")}
-                >
-                  <option value="">Select type</option>
-                  <option value="Casoni">Casoni</option>
-                  <option value="Truck Trailer">Truck Trailer</option>
-                  <option value="High Bed">High Bed</option>
-                  <option value="Low Bed">Low Bed</option>
-                  <option value="Others">Others</option>
-                </select>
-                <FieldError errors={[errors.truckType]} />
-              </Field>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field data-invalid={!!errors.plateNumber}>
-                  <FieldLabel>Plate Number</FieldLabel>
-                  <Input {...register("plateNumber")} />
-                  <FieldError errors={[errors.plateNumber]} />
-                </Field>
-
-                {truckType === "Casoni" && (
-                  <Field data-invalid={!!errors.plateNumber2}>
-                    <FieldLabel>Second Plate Number (Casoni)</FieldLabel>
-                    <Input {...register("plateNumber2")} />
-                    <FieldError errors={[errors.plateNumber2]} />
-                  </Field>
-                )}
-              </div>
-
-              <div className="grid grid-cols-2 gap-4">
-                <Field data-invalid={!!errors.vehicleModel}>
-                  <FieldLabel>Vehicle Model</FieldLabel>
-                  <Input {...register("vehicleModel")} />
-                  <FieldError errors={[errors.vehicleModel]} />
-                </Field>
-
-                <Field data-invalid={!!errors.yearOfManufacturing}>
-                  <FieldLabel>Year of Manufacturing</FieldLabel>
-                  <Input {...register("yearOfManufacturing")} />
-                  <FieldError errors={[errors.yearOfManufacturing]} />
-                </Field>
-              </div>
-            </>
-          )}
-
-        </FieldGroup>
-
-        {/* FOOTER */}
-        <div className="flex items-center justify-between pt-2">
-          <Button type="button" variant="outline" onClick={prevStep} disabled={step === "personal"}>
-            <ArrowLeft />
-            Back
-          </Button>
-
-          <Button type="button" onClick={nextStep} disabled={isSubmitting}>
-            {step === "transport" ? (
-              "Complete Registration"
-            ) : (
-              <>
-                Next Step
-                <ArrowRight />
-              </>
-            )}
-          </Button>
-        </div>
-      </form>
-    </>
-  );
-}
-
-function StepIcon({
-  icon,
-  active,
-  completed,
-}: {
-  icon: React.ReactNode;
-  active: boolean;
-  completed: boolean;
-}) {
-  return (
-    <div
-      className={`relative z-10 flex h-10 w-10 items-center justify-center rounded-full border-2 transition-all ${
-        completed
-          ? "bg-primary border-primary text-primary-foreground"
-          : active
-          ? "bg-background border-primary text-primary shadow-md"
-          : "bg-background border-border text-muted-foreground"
-      }`}
-    >
-      {completed ? <CheckCircle2 className="size-5" /> : icon}
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/apps/edr-freight-web/portal/src/pages/settings/TabCompanyProfile.tsx b/apps/edr-freight-web/portal/src/pages/settings/TabCompanyProfile.tsx
index e42283674..6a315392c 100644
--- a/apps/edr-freight-web/portal/src/pages/settings/TabCompanyProfile.tsx
+++ b/apps/edr-freight-web/portal/src/pages/settings/TabCompanyProfile.tsx
@@ -1,23 +1,22 @@
-import { isValidPhone, toEthiopianE164 } from "@/components/PhoneField";
 import { api } from "@/services/api";
 import type {
-    CompanyProfileInput,
-    CreateCompanyPayload,
+  CompanyProfileInput,
+  CreateCompanyPayload,
 } from "@/services/companies.service";
 import type { AuthUser } from "@/types/auth";
 import type { ProfileResponse } from "@/types/profile";
 import { extractApiError } from "@/utils/result";
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
-    Button,
-    Card,
-    Group,
-    Select,
-    SimpleGrid,
-    Stack,
-    Text,
-    TextInput,
-    Title,
+  Button,
+  Card,
+  Group,
+  Select,
+  SimpleGrid,
+  Stack,
+  Text,
+  TextInput,
+  Title,
 } from "@mantine/core";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { Building2, CheckCircle2, Save, XCircle } from "lucide-react";
@@ -27,28 +26,27 @@ import { z } from "zod";
 import { ETHIOPIAN_REGIONS, type CompanyRegistrationData } from "@edr/types";
 import OnboardingRoleSelect from "./OnboardingRoleSelect";
 import FaydaVerifyPanel from "@/components/FaydaVerifyPanel";
-import ETradeInfo, { type ETradeStatus } from "@/components/onboarding/ETradeInfo";
+import ETradeInfo, {
+  type ETradeStatus,
+} from "@/components/onboarding/ETradeInfo";
 import { ReadOnlyField } from "@/pages/accounts/companyProfileForm/ReadOnlyField";
 import StepSection from "@/pages/accounts/companyProfileForm/StepSection";
+import { ETRADE_BUNDLE_FIELDS as SHARED_ETRADE_FIELDS } from "@/pages/accounts/companyProfileForm/schema";
+import { normalizeIdentityPhones } from "@/pages/accounts/companyProfileForm/helpers";
 
 export const COMPANY_PROFILE_SCHEMA = z.object({
   companyName: z.string().min(1, "Company name is required"),
-  companyEmail: z.string().email("Invalid email address"),
-  companyPhone: z
-    .string()
-    .min(1, "Company phone is required")
-    .refine(isValidPhone, "Enter a valid phone number"),
   companyLocation: z.string().min(1, "Location is required"),
   // Derived from the eTrade address parts (region/zone/woreda/kebele/houseNo);
   // no standalone input.
   companyAddress: z.string().optional(),
   tinNumber: z.string().regex(/^\d{10}$/, "TIN must be exactly 10 digits"),
+  // Same rule as onboarding — the two forms write the same column, so they must
+  // not disagree about what is acceptable in it.
   vatNumber: z
     .string()
-    .trim()
-    .max(20, "VAT number is too long")
-    .optional()
-    .or(z.literal("")),
+    .min(1, "VAT number is required")
+    .regex(/^\d{10}$/, "VAT number must be exactly 10 digits"),
   ownerPassportNumber: z.string().optional(),
   // Registration/address fields are eTrade-sourced — locked once eTrade
   // supplies a value, editable only as an escape hatch when it doesn't
@@ -72,21 +70,13 @@ export const COMPANY_PROFILE_SCHEMA = z.object({
 
 export type CompanyProfileFormData = z.infer<typeof COMPANY_PROFILE_SCHEMA>;
 
-/** UpdateProfilePayload keys eTrade owns — only resent when the customer re-verified them this session. */
-const ETRADE_BUNDLE_FIELDS = [
-  "companyName",
-  "licenceNumber",
-  "statusDescription",
-  "dateRegistered",
-  "renewedFrom",
-  "renewalDate",
-  "renewedTo",
-  "region",
-  "zone",
-  "woreda",
-  "kebele",
-  "houseNo",
-] as const satisfies readonly (keyof CompanyProfileFormData)[];
+/**
+ * `etradePhone` is not on this form, so the shared list is filtered down to the
+ * keys it actually holds. Source of truth: `companyProfileForm/schema.ts`.
+ */
+const ETRADE_FIELDS = SHARED_ETRADE_FIELDS.filter(
+  (k): k is Exclude<typeof k, "etradePhone"> => k !== "etradePhone",
+);
 
 interface TabCompanyProfileProps {
   profile?: ProfileResponse;
@@ -99,7 +89,6 @@ export default function TabCompanyProfile({
   profile,
   mode = "edit",
   onCreateSuccess,
-  user,
 }: TabCompanyProfileProps) {
   const queryClient = useQueryClient();
   const isCreate = mode === "create";
@@ -110,8 +99,6 @@ export default function TabCompanyProfile({
     if (profile) {
       return {
         companyName: profile.companyName,
-        companyEmail: profile.companyEmail ?? "",
-        companyPhone: profile.companyPhone ?? "",
         companyLocation: profile.companyLocation,
         companyAddress: profile.companyAddress ?? "",
         tinNumber: profile.tinNumber,
@@ -132,8 +119,6 @@ export default function TabCompanyProfile({
     }
     return {
       companyName: "",
-      companyEmail: "",
-      companyPhone: "",
       companyLocation: "",
       companyAddress: "",
       tinNumber: "",
@@ -166,33 +151,15 @@ export default function TabCompanyProfile({
     values: defaultValues,
   });
 
-  const identity = profile?.identity;
+  // Fayda stores the phone as the national registry holds it (often a local
+  // number), which neither this form's E.164 validation nor the API's
+  // `@IsValidPhone()` accepts. Normalize on read — same as the wizard.
+  const identity = useMemo(
+    () => normalizeIdentityPhones(profile?.identity),
+    [profile?.identity],
+  );
   const verifiedIdentity = identity?.faydaRequired === true;
 
-  // companyEmail/companyPhone are the owner's verified contact details, never
-  // typed — same derivation as the onboarding wizard, just fed from the saved
-  // profile instead of an in-progress form.
-  useEffect(() => {
-    if (!user) return;
-    setValue("companyEmail", identity?.owner.email ?? user.email ?? "", {
-      shouldValidate: true,
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [identity?.owner.email, user?.email]);
-
-  useEffect(() => {
-    if (!user) return;
-    setValue(
-      "companyPhone",
-      identity?.owner.phone ??
-        profile?.etradePhone ??
-        toEthiopianE164(user.phoneNumber) ??
-        "",
-      { shouldValidate: true },
-    );
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [identity?.owner.phone, profile?.etradePhone, user?.phoneNumber]);
-
   // companyAddress is composed from the (locked) eTrade address parts, not
   // typed directly.
   const region = watch("region");
@@ -216,7 +183,9 @@ export default function TabCompanyProfile({
       });
     }
     setValue("licenceNumber", data.licenceNumber, { shouldDirty: true });
-    setValue("statusDescription", data.statusDescription, { shouldDirty: true });
+    setValue("statusDescription", data.statusDescription, {
+      shouldDirty: true,
+    });
     setValue("dateRegistered", data.dateRegistered, { shouldDirty: true });
     setValue("renewedFrom", data.renewedFrom, { shouldDirty: true });
     setValue("renewalDate", data.renewalDate, { shouldDirty: true });
@@ -249,14 +218,12 @@ export default function TabCompanyProfile({
       // on every save would otherwise trigger the server's eTrade
       // authenticity re-check for no reason.
       const etradeBundle: Record<string, string | undefined> = {};
-      for (const key of ETRADE_BUNDLE_FIELDS) {
+      for (const key of ETRADE_FIELDS) {
         if (dirtyFields[key]) etradeBundle[key] = data[key];
       }
       if (dirtyFields.tinNumber) etradeBundle.tin = data.tinNumber;
 
       const base = {
-        companyEmail: data.companyEmail,
-        companyPhone: data.companyPhone,
         companyLocation: data.companyLocation,
         companyAddress: data.companyAddress,
         vatNumber: data.vatNumber ?? "",
@@ -296,17 +263,39 @@ export default function TabCompanyProfile({
   });
 
   const onSubmit = (data: CompanyProfileFormData) => {
+    setValidationError(null);
     if (isCreate && selectedRoles.length === 0) return;
     mutation.mutate(data);
   };
 
-  const saveErrorMessage = mutation.isError
-    ? extractApiError(mutation.error).message
-    : null;
+  /**
+   * Without this, a failed validation made "Save Changes" a no-op: the fields
+   * the schema requires are largely eTrade-sourced and rendered read-only, so
+   * their error messages had nowhere to appear and the button simply did
+   * nothing. Name them instead.
+   */
+  const [validationError, setValidationError] = useState<string | null>(null);
+  const onInvalid = (formErrors: typeof errors) => {
+    const messages = Object.values(formErrors)
+      .map((e) => e?.message)
+      .filter((m): m is string => Boolean(m));
+    setValidationError(
+      messages.length > 0
+        ? `Please fix: ${[...new Set(messages)].join(", ")}.`
+        : "Some details are incomplete. Please review the fields above.",
+    );
+  };
+
+  const saveErrorMessage =
+    validationError ??
+    (mutation.isError ? extractApiError(mutation.error).message : null);
 
   const pendingOwnerReview = Boolean(
-    (profile?.pendingChanges as { faydaIdentity?: Record<string, unknown> } | null)
-      ?.faydaIdentity?.ownerFaydaSub,
+    (
+      profile?.pendingChanges as {
+        faydaIdentity?: Record<string, unknown>;
+      } | null
+    )?.faydaIdentity?.ownerFaydaSub,
   );
 
   // During onboarding the role selection gates the form: nothing else shows
@@ -322,160 +311,163 @@ export default function TabCompanyProfile({
         />
       ) : null}
       {showForm && (
-      <Card padding="lg">
-        <Group gap="sm" mb="xs">
-          <Building2 size={20} />
-          <Title order={3}>Company Profile</Title>
-        </Group>
-      <Text c="edr-muted" size="sm" mb="lg">
-        {isCreate
-          ? "Enter your company registration details to get started"
-          : "Your registration and identity come from eTrade and Fayda — re-verify to refresh them."}
-      </Text>
-
-      <form onSubmit={handleSubmit(onSubmit)}>
-        <Stack gap="xl">
-          <StepSection
-            index={1}
-            title="VAT number"
-            status={watch("vatNumber") ? "done" : "todo"}
-          >
-            <TextInput
-              label="VAT Number (optional)"
-              placeholder="e.g. 0012345678"
-              maxLength={20}
-              error={errors.vatNumber?.message}
-              {...register("vatNumber")}
-            />
-          </StepSection>
-
-          {identity && (
-            <StepSection
-              index={2}
-              title="Owner identity"
-              subtitle={
-                verifiedIdentity
-                  ? "Re-verify the company owner with Fayda — their name, phone, email and address are refreshed from the verification."
-                  : "The company owner's passport number."
-              }
-              status={
-                verifiedIdentity
-                  ? identity.owner.verified
-                    ? "done"
-                    : identity.faydaRequired
-                      ? "blocked"
-                      : "todo"
-                  : (watch("ownerPassportNumber")?.trim()?.length ?? 0) > 0
-                    ? "done"
-                    : identity.passportRequired
-                      ? "blocked"
-                      : "todo"
-              }
-            >
-              <FaydaVerifyPanel
-                subject="owner"
-                title="Company owner"
-                state={identity.owner}
-                required={identity.faydaRequired}
-                disabled={mutation.isPending}
-                pendingReview={pendingOwnerReview}
-              />
-              {identity.passportRequired && (
-                <TextInput
-                  label="Owner Passport Number"
-                  placeholder="P1234567"
-                  description="The owner's identity credential — Fayda is an Ethiopian national ID, so a foreign company's owner is identified by passport instead."
-                  error={errors.ownerPassportNumber?.message}
-                  {...register("ownerPassportNumber")}
-                />
-              )}
-              <SimpleGrid cols={2} spacing="md">
-                <ReadOnlyField label="Company email" value={watch("companyEmail")} />
-                <ReadOnlyField label="Company phone" value={watch("companyPhone")} />
-              </SimpleGrid>
-            </StepSection>
-          )}
-
-          <StepSection
-            index={3}
-            title="Company TIN"
-            subtitle="Re-verify with eTrade to refresh your registration record — nothing here is typed by hand."
-            status={
-              tinVerified ? "done" : tinStatus === "taken" ? "blocked" : "todo"
-            }
-          >
-            <ETradeInfo
-              tin={watch("tinNumber")}
-              register={register("tinNumber")}
-              error={errors.tinNumber?.message}
-              onDataLoaded={handleETradeDataLoaded}
-              onStatusChange={setTinStatus}
-            />
-            {tinVerified && (
-              <EtradeLockedCard
-                tin={watch("tinNumber")}
-                register={register}
-                watch={watch}
-                errors={errors}
-                control={control}
-              />
-            )}
-          </StepSection>
-
-          <TextInput
-            label="Location"
-            placeholder="Addis Ababa, Ethiopia"
-            error={errors.companyLocation?.message}
-            {...register("companyLocation")}
-          />
-        </Stack>
-
-        <Group
-          justify="space-between"
-          mt="xl"
-          pt="md"
-          style={{ borderTop: "1px solid var(--mantine-color-edr-border-0)" }}
-        >
-          <Group gap="xs">
-            {mutation.isSuccess && !isCreate && (
-              <Group gap={6} c="green">
-                <CheckCircle2 size={16} />
-                <Text size="sm" fw={500}>
-                  Saved successfully
-                </Text>
-              </Group>
-            )}
-            {saveErrorMessage && (
-              <Group gap={6} c="red">
-                <XCircle size={16} />
-                <Text size="sm" fw={500}>
-                  {saveErrorMessage}
-                </Text>
-              </Group>
-            )}
+        <Card padding="lg">
+          <Group gap="sm" mb="xs">
+            <Building2 size={20} />
+            <Title order={3}>Company Profile</Title>
           </Group>
-          <Group gap="md">
-            {!isCreate && (
-              <Button
-                type="button"
-                variant="outline"
-                disabled={mutation.isPending || !isDirty}
-                onClick={() => reset()}
+          <Text c="edr-muted" size="sm" mb="lg">
+            {isCreate
+              ? "Enter your company registration details to get started"
+              : "Your registration and identity come from eTrade and Fayda — re-verify to refresh them."}
+          </Text>
+
+          <form onSubmit={handleSubmit(onSubmit, onInvalid)}>
+            <Stack gap="xl">
+              <StepSection
+                index={1}
+                title="VAT number"
+                status={watch("vatNumber") ? "done" : "todo"}
               >
-                Reset
-              </Button>
-            )}
-            <Button
-              type="submit"
-              leftSection={<Save size={16} />}
-              loading={mutation.isPending}
+                <TextInput
+                  label="VAT Number"
+                  placeholder="e.g. 0012345678"
+                  maxLength={10}
+                  error={errors.vatNumber?.message}
+                  {...register("vatNumber")}
+                />
+              </StepSection>
+
+              {identity && (
+                <StepSection
+                  index={2}
+                  title="Owner identity"
+                  subtitle={
+                    verifiedIdentity
+                      ? "Re-verify the company owner with Fayda — their name, phone, email and address are refreshed from the verification."
+                      : "The company owner's passport number."
+                  }
+                  status={
+                    verifiedIdentity
+                      ? identity.owner.verified
+                        ? "done"
+                        : identity.faydaRequired
+                          ? "blocked"
+                          : "todo"
+                      : (watch("ownerPassportNumber")?.trim()?.length ?? 0) > 0
+                        ? "done"
+                        : identity.passportRequired
+                          ? "blocked"
+                          : "todo"
+                  }
+                >
+                  <FaydaVerifyPanel
+                    subject="owner"
+                    title="Company owner"
+                    state={identity.owner}
+                    required={identity.faydaRequired}
+                    disabled={mutation.isPending}
+                    pendingReview={pendingOwnerReview}
+                  />
+                  {identity.passportRequired && (
+                    <TextInput
+                      label="Owner Passport Number"
+                      placeholder="P1234567"
+                      description="The owner's identity credential — Fayda is an Ethiopian national ID, so a foreign company's owner is identified by passport instead."
+                      error={errors.ownerPassportNumber?.message}
+                      {...register("ownerPassportNumber")}
+                    />
+                  )}
+                </StepSection>
+              )}
+
+              <StepSection
+                index={3}
+                title="Company TIN"
+                subtitle="Re-verify with eTrade to refresh your registration record — nothing here is typed by hand."
+                status={
+                  tinVerified
+                    ? "done"
+                    : tinStatus === "taken"
+                      ? "blocked"
+                      : "todo"
+                }
+              >
+                <ETradeInfo
+                  tin={watch("tinNumber")}
+                  register={register("tinNumber")}
+                  error={errors.tinNumber?.message}
+                  onDataLoaded={handleETradeDataLoaded}
+                  onStatusChange={setTinStatus}
+                  alreadyVerified={hasRegistrationDetails}
+                />
+                {tinVerified && (
+                  <EtradeLockedCard
+                    tin={watch("tinNumber")}
+                    register={register}
+                    watch={watch}
+                    errors={errors}
+                    control={control}
+                  />
+                )}
+              </StepSection>
+
+              <TextInput
+                label="Location"
+                placeholder="Addis Ababa, Ethiopia"
+                error={errors.companyLocation?.message}
+                {...register("companyLocation")}
+              />
+            </Stack>
+
+            <Group
+              justify="space-between"
+              mt="xl"
+              pt="md"
+              style={{
+                borderTop: "1px solid var(--mantine-color-edr-border-0)",
+              }}
             >
-              {isCreate ? "Continue" : "Save Changes"}
-            </Button>
-          </Group>
-        </Group>
-      </form>
-      </Card>
+              <Group gap="xs">
+                {mutation.isSuccess && !isCreate && (
+                  <Group gap={6} c="green">
+                    <CheckCircle2 size={16} />
+                    <Text size="sm" fw={500}>
+                      Saved successfully
+                    </Text>
+                  </Group>
+                )}
+                {saveErrorMessage && (
+                  <Group gap={6} c="red">
+                    <XCircle size={16} />
+                    <Text size="sm" fw={500}>
+                      {saveErrorMessage}
+                    </Text>
+                  </Group>
+                )}
+              </Group>
+              <Group gap="md">
+                {!isCreate && (
+                  <Button
+                    type="button"
+                    variant="outline"
+                    disabled={mutation.isPending || !isDirty}
+                    onClick={() => reset()}
+                  >
+                    Reset
+                  </Button>
+                )}
+                <Button
+                  type="submit"
+                  leftSection={<Save size={16} />}
+                  loading={mutation.isPending}
+                >
+                  {isCreate ? "Continue" : "Save Changes"}
+                </Button>
+              </Group>
+            </Group>
+          </form>
+        </Card>
       )}
     </Stack>
   );
@@ -496,7 +488,9 @@ function EtradeLockedCard({
   tin: string;
   register: ReturnType<typeof useForm<CompanyProfileFormData>>["register"];
   watch: ReturnType<typeof useForm<CompanyProfileFormData>>["watch"];
-  errors: ReturnType<typeof useForm<CompanyProfileFormData>>["formState"]["errors"];
+  errors: ReturnType<
+    typeof useForm<CompanyProfileFormData>
+  >["formState"]["errors"];
   control: ReturnType<typeof useForm<CompanyProfileFormData>>["control"];
 }) {
   const companyName = watch("companyName");
@@ -513,22 +507,57 @@ function EtradeLockedCard({
         </Text>
       </Group>
       <SimpleGrid cols={2} spacing="sm">
-        <LockedField label="Company Name" name="companyName" register={register} watch={watch} errors={errors} />
+        <LockedField
+          label="Company Name"
+          name="companyName"
+          register={register}
+          watch={watch}
+          errors={errors}
+        />
         <ReadOnlyField label="License Number" value={watch("licenceNumber")} />
         <ReadOnlyField label="Status" value={watch("statusDescription")} />
-        <ReadOnlyField label="Date Registered" value={watch("dateRegistered")} />
+        <ReadOnlyField
+          label="Date Registered"
+          value={watch("dateRegistered")}
+        />
         <ReadOnlyField label="Renewal Date" value={watch("renewalDate")} />
         <ReadOnlyField label="Renewed From" value={watch("renewedFrom")} />
         <ReadOnlyField label="Renewed To" value={watch("renewedTo")} />
-        {region?.trim() ? (
+        {/* Membership of the catalog, not mere presence — a stored spelling
+            outside the list is otherwise uncorrectable. */}
+        {(ETHIOPIAN_REGIONS as readonly string[]).includes(region ?? "") ? (
           <ReadOnlyField label="Region" value={region} />
         ) : (
           <RegionSelect control={control} error={errors.region?.message} />
         )}
-        <LockedField label="Zone" name="zone" register={register} watch={watch} errors={errors} />
-        <LockedField label="Woreda" name="woreda" register={register} watch={watch} errors={errors} />
-        <LockedField label="Kebele" name="kebele" register={register} watch={watch} errors={errors} />
-        <LockedField label="House No" name="houseNo" register={register} watch={watch} errors={errors} />
+        <LockedField
+          label="Zone"
+          name="zone"
+          register={register}
+          watch={watch}
+          errors={errors}
+        />
+        <LockedField
+          label="Woreda"
+          name="woreda"
+          register={register}
+          watch={watch}
+          errors={errors}
+        />
+        <LockedField
+          label="Kebele"
+          name="kebele"
+          register={register}
+          watch={watch}
+          errors={errors}
+        />
+        <LockedField
+          label="House No"
+          name="houseNo"
+          register={register}
+          watch={watch}
+          errors={errors}
+        />
       </SimpleGrid>
     </Card>
   );
@@ -545,10 +574,14 @@ function LockedField({
   name: keyof CompanyProfileFormData;
   register: ReturnType<typeof useForm<CompanyProfileFormData>>["register"];
   watch: ReturnType<typeof useForm<CompanyProfileFormData>>["watch"];
-  errors: ReturnType<typeof useForm<CompanyProfileFormData>>["formState"]["errors"];
+  errors: ReturnType<
+    typeof useForm<CompanyProfileFormData>
+  >["formState"]["errors"];
 }) {
   const value = watch(name) as string | undefined;
-  if (value?.trim()) {
+  // A value that fails validation unlocks too — rendering a rejected value
+  // read-only is a save that can never succeed and never says why.
+  if (value?.trim() && !errors[name]) {
     return <ReadOnlyField label={label} value={value} />;
   }
   return (
diff --git a/apps/edr-freight-web/portal/src/pages/settings/TabGeneralManager.tsx b/apps/edr-freight-web/portal/src/pages/settings/TabGeneralManager.tsx
index 7191d162c..ad680b010 100644
--- a/apps/edr-freight-web/portal/src/pages/settings/TabGeneralManager.tsx
+++ b/apps/edr-freight-web/portal/src/pages/settings/TabGeneralManager.tsx
@@ -127,9 +127,13 @@ export default function TabGeneralManager({ profile, mode = "edit", onContinue }
   const mutation = useMutation({
     mutationFn: (data: FormData) =>
       api.companies.updateProfile.call({
-        generalManagerName: data.generalManagerName,
-        generalManagerEmail: data.generalManagerEmail,
-        generalManagerPhone: data.generalManagerPhone,
+        // `|| undefined`, never "": the DTO's `@IsOptional()` only skips null
+        // and undefined, so an empty string is validated and 400s with
+        // "generalManagerEmail must be an email". A verified manager legitimately
+        // leaves the fields Fayda did supply blank here.
+        generalManagerName: data.generalManagerName || undefined,
+        generalManagerEmail: data.generalManagerEmail || undefined,
+        generalManagerPhone: data.generalManagerPhone || undefined,
       }),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: api.companies.getProfile.queryKey() });
@@ -144,6 +148,18 @@ export default function TabGeneralManager({ profile, mode = "edit", onContinue }
   // posting empty strings over a proven identity.
   const typedFieldsInUse = !gmSameAsOwner && !gm?.verified && !faydaRequired;
 
+  // Except for what the verification never supplied. Fayda's name, email and
+  // phone claims are all optional, and a manager verified without them has no
+  // account to fall back on the way the owner does — so those stay typed, here
+  // as well as in onboarding, or a wrong value could never be corrected.
+  const gmGaps = {
+    name: !gmSameAsOwner && Boolean(gm?.verified) && !gm?.name?.trim(),
+    email: !gmSameAsOwner && Boolean(gm?.verified) && !gm?.email?.trim(),
+    phone: !gmSameAsOwner && Boolean(gm?.verified) && !gm?.phone?.trim(),
+  };
+  const savable =
+    typedFieldsInUse || gmGaps.name || gmGaps.email || gmGaps.phone;
+
   return (
     <Card padding="lg">
       <Group gap="sm" mb="xs">
@@ -187,6 +203,42 @@ export default function TabGeneralManager({ profile, mode = "edit", onContinue }
             />
           )}
 
+          {/* Whatever the verification did not supply is typed instead — the
+              API keeps exactly those keys writable. */}
+          {gmGaps.name && (
+            <TextInput
+              label="Full Name"
+              placeholder="Abebe Bikila"
+              error={errors.generalManagerName?.message}
+              {...register("generalManagerName")}
+            />
+          )}
+          {(gmGaps.email || gmGaps.phone) && (
+            <Grid>
+              {gmGaps.email && (
+                <Grid.Col span={gmGaps.phone ? 6 : 12}>
+                  <TextInput
+                    label="Email Address"
+                    type="email"
+                    placeholder="gm@company.com"
+                    error={errors.generalManagerEmail?.message}
+                    {...register("generalManagerEmail")}
+                  />
+                </Grid.Col>
+              )}
+              {gmGaps.phone && (
+                <Grid.Col span={gmGaps.email ? 6 : 12}>
+                  <ControlledPhoneField
+                    control={control}
+                    name="generalManagerPhone"
+                    label="Phone Number"
+                    required
+                  />
+                </Grid.Col>
+              )}
+            </Grid>
+          )}
+
           {/* Typed details survive only where Fayda cannot be required — a
               foreign company's manager may hold no Fayda ID. Once verified the
               API owns these fields and refuses edits, so they go away. */}
@@ -258,7 +310,7 @@ export default function TabGeneralManager({ profile, mode = "edit", onContinue }
                 empty strings at an identity the API owns and refuses to
                 overwrite. Onboarding still needs a way forward, so the button
                 becomes a plain Continue rather than disappearing. */}
-            {typedFieldsInUse ? (
+            {savable ? (
               <Button
                 type="submit"
                 leftSection={<Save size={16} />}
diff --git a/apps/edr-freight-web/portal/src/pages/settings/TabPowerOfAttorney.tsx b/apps/edr-freight-web/portal/src/pages/settings/TabPowerOfAttorney.tsx
index 4c48ea238..40f118580 100644
--- a/apps/edr-freight-web/portal/src/pages/settings/TabPowerOfAttorney.tsx
+++ b/apps/edr-freight-web/portal/src/pages/settings/TabPowerOfAttorney.tsx
@@ -41,6 +41,7 @@ import {
 } from "@/services/companies.service";
 import FaydaVerifyPanel from "@/components/FaydaVerifyPanel";
 import { verifaydaService } from "@/services/verifayda.service";
+import { LinkCheckboxCard } from "@/pages/accounts/companyProfileForm/LinkCheckboxCard";
 import type { ProfileResponse } from "@/types/profile";
 
 // The representative's name, email, phone and address all come from their
@@ -135,13 +136,21 @@ export default function TabPowerOfAttorney({
   // company inside Ethiopia either way. A PoA therefore exists exactly when one
   // has been verified.
   const identity = profile.identity;
+  const owner = identity?.owner;
   const poaProvided = identity?.poa.verified ?? false;
+  const [poaSameAsOwner, setPoaSameAsOwner] = useState(
+    identity?.poaSameAsOwner ?? false,
+  );
   // The paper authorises the representative named above, so there is nothing
   // for it to authorise until one has been verified — the upload is hidden
   // until then, and requiring it while hidden would block the save on a
   // control the customer cannot see. A freight forwarder is still held to
   // having a PoA at all, by the verification gate on the panel and by the API.
-  const letterRequired = poaProvided;
+  //
+  // And nobody delegates to themselves: an owner representing their own company
+  // has no delegation to evidence, which is the same waiver the API applies in
+  // `assertPoaDelegationSatisfied`.
+  const letterRequired = poaProvided && !poaSameAsOwner;
   const letterMissing = letterRequired && !hasLetterAfterSave;
 
   const fileDirty = Boolean(pickedFile) || removeIds.length > 0;
@@ -198,6 +207,46 @@ export default function TabPowerOfAttorney({
     },
   });
 
+  /**
+   * "Same as owner": the owner represents the company themselves. Always goes
+   * to the API, whichever credential backs the owner — the declaration is what
+   * waives the DARS paper, so it has to be recorded server-side even when there
+   * is no proven identity to copy.
+   *
+   * Unchecking undoes the declaration only. It leaves the paper on file and is
+   * allowed for a freight forwarder, which is how one changes who represents
+   * it; "Remove representative" below is the harder action that takes the paper
+   * with it and is refused to a forwarder.
+   */
+  const [linkPending, setLinkPending] = useState(false);
+  const [linkError, setLinkError] = useState<string | null>(null);
+  const togglePoaSameAsOwner = async (checked: boolean) => {
+    setPoaSameAsOwner(checked);
+    setLinkError(null);
+    setLinkPending(true);
+    try {
+      if (checked) await verifaydaService.setPoaSameAsOwner();
+      else await verifaydaService.clearPoaSameAsOwner();
+      queryClient.invalidateQueries({
+        queryKey: api.companies.getProfile.queryKey(),
+      });
+      queryClient.invalidateQueries({
+        queryKey: api.companies.poaDelegation.queryKey(),
+      });
+    } catch (err) {
+      setPoaSameAsOwner(!checked);
+      setLinkError(
+        (err as { response?: { data?: { message?: string } } })?.response?.data
+          ?.message ??
+        (err instanceof Error
+          ? err.message
+          : "Could not update the Power of Attorney"),
+      );
+    } finally {
+      setLinkPending(false);
+    }
+  };
+
   const onSubmit = (data: FormData) => {
     // The letter lives outside the form state, so it's gated here rather than
     // in the zod resolver.
@@ -247,17 +296,60 @@ export default function TabPowerOfAttorney({
         </Group>
         <Text c="edr-muted" size="sm" mb="lg">
           {requirePoa
-            ? "As a freight forwarder you act on other companies' behalf, so a Power of Attorney and its DARS delegation paper are required."
-            : "Power of Attorney details are optional. If you name a representative, upload the DARS delegation paper authorising them."}
+            ? "As a freight forwarder you act on other companies' behalf, so a Power of Attorney is required."
+            : "Power of Attorney details are optional."}{" "}
+          {poaSameAsOwner
+            ? "You represent the company yourself, so no delegation paper is needed."
+            : "If you name a representative, upload the DARS delegation paper authorising them."}
         </Text>
 
+        {/* The owner representing their own company is the ordinary
+            small-business case: a verified owner's identity is reused outright,
+            and either way the declaration waives the DARS paper. Where Fayda is
+            mandatory it needs a verified owner first — there would be nothing
+            proven to copy, and a representative who could never satisfy the
+            gate. */}
         {identity && (
+          <LinkCheckboxCard
+            checked={poaSameAsOwner}
+            onToggle={togglePoaSameAsOwner}
+            disabled={
+              linkPending ||
+              mutation.isPending ||
+              (!poaSameAsOwner &&
+                (identity.faydaRequired ?? false) &&
+                !owner?.verified)
+            }
+            title={
+              owner?.verified
+                ? "Same as verified owner"
+                : "Same as business owner"
+            }
+            description={
+              (identity.faydaRequired ?? false) && !owner?.verified
+                ? "Verify the company owner with Fayda first — then you can reuse that identity here."
+                : owner?.verified
+                  ? "You represent the company yourself. Reuses the Fayda-verified owner's identity, and no DARS delegation paper is needed. Uncheck to name someone else."
+                  : "You represent the company yourself. Reuses the owner's name, email and phone, and no DARS delegation paper is needed. Uncheck to name someone else."
+            }
+          />
+        )}
+
+        {linkError && (
+          <Alert color="red" variant="light" icon={<XCircle size={18} />} mt="md">
+            {linkError}
+          </Alert>
+        )}
+
+        {/* Verifying a second person only means something when the
+            representative is someone other than the owner. */}
+        {identity && !poaSameAsOwner && (
           <FaydaVerifyPanel
             subject="poa"
             title="Power of Attorney"
             state={identity.poa}
             required={requirePoa}
-            disabled={mutation.isPending}
+            disabled={mutation.isPending || linkPending}
           />
         )}
 
@@ -284,7 +376,7 @@ export default function TabPowerOfAttorney({
           {/* ------------------------ Delegation letter ------------------------ */}
           {/* The paper authorises the representative the verification named,
               so it only has meaning once one exists. */}
-          {poaProvided && (
+          {poaProvided && !poaSameAsOwner && (
           <Stack gap="sm" mt="xl">
             <Group justify="space-between" align="center">
               <Group gap="sm">
@@ -459,8 +551,12 @@ export default function TabPowerOfAttorney({
               )}
             </Group>
             <Group gap="md">
+              {/* Not offered against a "same as owner" declaration: unchecking
+                  the card above is the way out of that one, and it leaves the
+                  paper alone. */}
               {mode === "edit" &&
                 identity?.poa.verified &&
+                !poaSameAsOwner &&
                 !requirePoa && (
                   <Button
                     type="button"
diff --git a/apps/edr-freight-web/portal/src/pages/support/DocShell.tsx b/apps/edr-freight-web/portal/src/pages/support/DocShell.tsx
new file mode 100644
index 000000000..b4646e0cc
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/DocShell.tsx
@@ -0,0 +1,125 @@
+import type { PortalDocSection } from "@edr/types";
+import { ArrowLeft, Train } from "lucide-react";
+import type { ReactNode } from "react";
+import { Link } from "react-router-dom";
+
+import { Markdown } from "./Markdown";
+
+/** Public pages reachable from every doc page's header and footer. */
+const DOC_LINKS = [
+  { to: "/help", label: "Help & Support" },
+  { to: "/faq", label: "FAQ" },
+  { to: "/privacy", label: "Privacy Policy" },
+  { to: "/terms", label: "Terms of Service" },
+];
+
+interface DocShellProps {
+  title: string;
+  subtitle: string;
+  /** Rendered under the title, e.g. "Last updated 6 August 2026". */
+  meta?: string;
+  /** Path of the current page, so it is not linked to itself. */
+  current: string;
+  /** Contents column, mirroring the page list editors see in the backoffice. */
+  sidebar?: ReactNode;
+  children: ReactNode;
+}
+
+/**
+ * Chrome shared by the help, FAQ and legal pages. These routes are public —
+ * the auth screens link to them before a session exists — so the shell carries
+ * its own header instead of relying on the authenticated app layout.
+ */
+export function DocShell({
+  title,
+  subtitle,
+  meta,
+  current,
+  sidebar,
+  children,
+}: DocShellProps) {
+  return (
+    <div className="min-h-screen bg-background text-foreground">
+      <header className="sticky top-0 z-50 border-b border-border bg-background/80 backdrop-blur-xl">
+        <div className="mx-auto flex max-w-6xl items-center justify-between gap-4 px-6 py-4">
+          <Link to="/" className="flex items-center gap-3">
+            <div className="flex size-10 items-center justify-center rounded-2xl bg-primary text-primary-foreground">
+              <Train className="size-5" />
+            </div>
+            <span className="font-bold">EDR Freight</span>
+          </Link>
+
+          <Link
+            to="/portal"
+            className="inline-flex items-center gap-2 rounded-2xl border border-border px-4 py-2 text-sm font-semibold transition hover:bg-accent"
+          >
+            <ArrowLeft className="size-4" />
+            Back to portal
+          </Link>
+        </div>
+      </header>
+
+      <main className="mx-auto max-w-6xl px-6 py-12">
+        <h1 className="text-4xl font-black tracking-tight">{title}</h1>
+        <p className="mt-4 text-lg leading-8 text-muted-foreground">
+          {subtitle}
+        </p>
+        {meta && (
+          <p className="mt-2 text-sm text-muted-foreground">{meta}</p>
+        )}
+
+        {sidebar ? (
+          <div className="mt-10 flex flex-col gap-8 lg:flex-row lg:gap-10">
+            {sidebar}
+            <div className="min-w-0 flex-1">{children}</div>
+          </div>
+        ) : (
+          <div className="mt-10">{children}</div>
+        )}
+      </main>
+
+      <footer className="border-t border-border py-8">
+        <div className="mx-auto flex max-w-6xl flex-col items-center justify-between gap-4 px-6 text-sm text-muted-foreground md:flex-row">
+          <span>© 2026 EDR Freight. All rights reserved.</span>
+          <nav className="flex flex-wrap items-center justify-center gap-x-6 gap-y-2">
+            {DOC_LINKS.filter((l) => l.to !== current).map((link) => (
+              <Link
+                key={link.to}
+                to={link.to}
+                className="font-semibold text-foreground transition-colors hover:text-primary"
+              >
+                {link.label}
+              </Link>
+            ))}
+          </nav>
+        </div>
+      </footer>
+    </div>
+  );
+}
+
+/**
+ * Renders a legal document's numbered sections. Bodies are markdown, so the
+ * paragraph and bullet arrays this used to walk are one string now — keyed by
+ * `id` rather than by heading, which admin-authored text can duplicate.
+ */
+export function DocSections({ sections }: { sections: PortalDocSection[] }) {
+  return (
+    <div className="space-y-10">
+      {/* Guarded: this is API-supplied, and these routes are public. */}
+      {(sections ?? []).map((section) => (
+        // `id` doubles as the anchor the contents list and #deep-links target;
+        // `scroll-mt` keeps the heading clear of the sticky header.
+        <section key={section.id} id={section.id} className="scroll-mt-24">
+          <h2 className="text-xl font-bold tracking-tight">
+            {section.heading}
+          </h2>
+
+          <Markdown>{section.body}</Markdown>
+        </section>
+      ))}
+    </div>
+  );
+}
+
+export default DocShell;
diff --git a/apps/edr-freight-web/portal/src/pages/support/DocSidebar.tsx b/apps/edr-freight-web/portal/src/pages/support/DocSidebar.tsx
new file mode 100644
index 000000000..eec27c28b
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/DocSidebar.tsx
@@ -0,0 +1,117 @@
+import { useEffect, useState } from "react";
+
+export interface DocNavItem {
+  id: string;
+  label: string;
+}
+
+/**
+ * Highlights whichever section is currently on screen, so a long policy tells
+ * the reader where they are. Watches the top band of the viewport, which is
+ * what makes the highlight change as a heading scrolls past rather than only
+ * when a whole section fits.
+ */
+export function useActiveSection(ids: string[]): string | null {
+  const [active, setActive] = useState<string | null>(ids[0] ?? null);
+
+  useEffect(() => {
+    if (ids.length === 0) return;
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        const visible = entries
+          .filter((entry) => entry.isIntersecting)
+          .sort((a, b) => a.boundingClientRect.top - b.boundingClientRect.top);
+        if (visible[0]) setActive(visible[0].target.id);
+      },
+      // Top ~quarter of the viewport, below the sticky header.
+      { rootMargin: "-80px 0px -70% 0px", threshold: 0 },
+    );
+
+    for (const id of ids) {
+      const element = document.getElementById(id);
+      if (element) observer.observe(element);
+    }
+    return () => observer.disconnect();
+  }, [ids.join("|")]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return active;
+}
+
+interface DocSidebarProps {
+  items: DocNavItem[];
+  activeId: string | null;
+  /**
+   * Paged mode (the help page): selecting swaps the visible section. Omit for
+   * table-of-contents mode, where entries are anchors into one long document.
+   */
+  onSelect?: (id: string) => void;
+  heading?: string;
+}
+
+/**
+ * The document's contents, mirroring the page list an editor sees in the
+ * backoffice. Sticky on wide screens; above the content on narrow ones, where
+ * a fixed column would eat the reading width.
+ */
+export function DocSidebar({
+  items,
+  activeId,
+  onSelect,
+  heading = "Contents",
+}: DocSidebarProps) {
+  if (items.length === 0) return null;
+
+  return (
+    <nav
+      aria-label={heading}
+      // Divider: a right edge once the columns sit side by side, a bottom edge
+      // while they are stacked — so the contents always reads as its own
+      // column rather than as text that happens to be to the left.
+      className="border-b border-border pb-6 lg:sticky lg:top-24 lg:w-64 lg:shrink-0 lg:self-start lg:border-b-0 lg:border-r lg:pb-0 lg:pr-6"
+    >
+      <p className="px-3 text-xs font-bold uppercase tracking-wider text-foreground/60">
+        {heading}
+      </p>
+
+      <ul className="mt-3 max-h-[60vh] space-y-1 overflow-y-auto lg:max-h-[calc(100vh-10rem)]">
+        {items.map((item) => {
+          const active = item.id === activeId;
+          // Inactive entries were `muted-foreground`, which is the same tone as
+          // body copy and left the list looking disabled. These are navigation,
+          // so they sit closer to full foreground and darken on hover.
+          const className = `block w-full rounded-xl px-3 py-2 text-left text-sm transition ${
+            active
+              ? "bg-accent font-semibold text-foreground"
+              : "text-foreground/75 hover:bg-accent/60 hover:text-foreground"
+          }`;
+
+          return (
+            <li key={item.id}>
+              {onSelect ? (
+                <button
+                  type="button"
+                  onClick={() => onSelect(item.id)}
+                  aria-current={active ? "page" : undefined}
+                  className={className}
+                >
+                  {item.label}
+                </button>
+              ) : (
+                <a
+                  href={`#${item.id}`}
+                  aria-current={active ? "true" : undefined}
+                  className={className}
+                >
+                  {item.label}
+                </a>
+              )}
+            </li>
+          );
+        })}
+      </ul>
+    </nav>
+  );
+}
+
+export default DocSidebar;
diff --git a/apps/edr-freight-web/portal/src/pages/support/FaqPage.tsx b/apps/edr-freight-web/portal/src/pages/support/FaqPage.tsx
new file mode 100644
index 000000000..2edf69c9e
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/FaqPage.tsx
@@ -0,0 +1,74 @@
+import { ChevronDown } from "lucide-react";
+import { Link } from "react-router-dom";
+
+import { usePortalContent } from "@/hooks/usePortalContent";
+
+import { DocShell } from "./DocShell";
+import { DocSidebar, useActiveSection } from "./DocSidebar";
+import { Markdown } from "./Markdown";
+
+export default function FaqPage() {
+  // Never undefined — see TermsPage.
+  const { data } = usePortalContent();
+  const faq = data!.faq;
+  const groups = faq.groups ?? [];
+
+  // Contents lists the groups; individual questions stay as the disclosure
+  // rows below, which is already the fastest way to scan them.
+  const activeId = useActiveSection(groups.map((group) => group.id));
+
+  return (
+    <DocShell
+      current="/faq"
+      title={faq.title}
+      subtitle={faq.subtitle}
+      sidebar={
+        <DocSidebar
+          items={groups.map((group) => ({ id: group.id, label: group.title }))}
+          activeId={activeId}
+        />
+      }
+    >
+      <div className="space-y-10">
+        {groups.map((group) => (
+          <section key={group.id} id={group.id} className="scroll-mt-24">
+            <h2 className="text-xl font-bold tracking-tight">{group.title}</h2>
+
+            <div className="mt-4 space-y-3">
+              {(group.items ?? []).map((item) => (
+                // Native disclosure: keyboard- and screen-reader-accessible
+                // without any state of our own.
+                <details
+                  key={item.id}
+                  className="group rounded-2xl border border-border bg-card px-5 py-4 transition hover:border-primary/40"
+                >
+                  <summary className="flex cursor-pointer list-none items-center justify-between gap-4 font-semibold">
+                    {item.question}
+                    <ChevronDown className="size-5 shrink-0 text-muted-foreground transition-transform group-open:rotate-180" />
+                  </summary>
+
+                  <Markdown>{item.answer}</Markdown>
+                </details>
+              ))}
+            </div>
+          </section>
+        ))}
+      </div>
+
+      {faq.footer && (
+        <div className="mt-12 rounded-[32px] border border-border bg-card p-8">
+          <h2 className="text-xl font-bold tracking-tight">
+            {faq.footer.heading}
+          </h2>
+          <Markdown>{faq.footer.body}</Markdown>
+          <Link
+            to={faq.footer.ctaTo}
+            className="mt-6 inline-flex rounded-2xl bg-primary px-6 py-3 font-semibold text-primary-foreground transition hover:opacity-90"
+          >
+            {faq.footer.ctaLabel}
+          </Link>
+        </div>
+      )}
+    </DocShell>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/support/HelpPage.tsx b/apps/edr-freight-web/portal/src/pages/support/HelpPage.tsx
new file mode 100644
index 000000000..f55b9145f
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/HelpPage.tsx
@@ -0,0 +1,75 @@
+import { useEffect, useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+
+import { usePortalContent } from "@/hooks/usePortalContent";
+
+import { DocShell } from "./DocShell";
+import { DocSidebar } from "./DocSidebar";
+import { Markdown } from "./Markdown";
+
+/**
+ * Help is browsed a page at a time, mirroring how it is written: the sidebar is
+ * the list of pages, and picking one swaps the panel. Unlike the legal
+ * documents nobody reads help end to end — they arrive with one question — so
+ * showing a single answer beats a wall of every topic at once.
+ */
+export default function HelpPage() {
+  // Never undefined — see TermsPage.
+  const { data } = usePortalContent();
+  const help = data!.help;
+  const sections = help.sections ?? [];
+
+  const navigate = useNavigate();
+  const { hash } = useLocation();
+
+  // The open page lives in the URL, so a link to a specific topic works and
+  // Back steps between topics.
+  const fromHash = hash ? decodeURIComponent(hash.slice(1)) : "";
+  const [selectedId, setSelectedId] = useState(
+    () => fromHash || sections[0]?.id || "",
+  );
+
+  useEffect(() => {
+    const valid = sections.some((section) => section.id === selectedId);
+    if (!valid) setSelectedId(fromHash || sections[0]?.id || "");
+  }, [sections, selectedId, fromHash]);
+
+  useEffect(() => {
+    if (fromHash && fromHash !== selectedId) setSelectedId(fromHash);
+  }, [fromHash]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  const selected =
+    sections.find((section) => section.id === selectedId) ?? sections[0];
+
+  return (
+    <DocShell
+      current="/help"
+      title={help.title}
+      subtitle={help.subtitle}
+      sidebar={
+        <DocSidebar
+          heading="Topics"
+          items={sections.map((section) => ({
+            id: section.id,
+            label: section.heading,
+          }))}
+          activeId={selected?.id ?? null}
+          onSelect={(id) => {
+            setSelectedId(id);
+            navigate(`#${id}`);
+            window.scrollTo({ top: 0, behavior: "smooth" });
+          }}
+        />
+      }
+    >
+      {selected && (
+        <section>
+          <h2 className="text-2xl font-bold tracking-tight">
+            {selected.heading}
+          </h2>
+          <Markdown>{selected.body}</Markdown>
+        </section>
+      )}
+    </DocShell>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/support/Markdown.tsx b/apps/edr-freight-web/portal/src/pages/support/Markdown.tsx
new file mode 100644
index 000000000..646187f6c
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/Markdown.tsx
@@ -0,0 +1,115 @@
+import { isPortalVideoSrc } from "@edr/types";
+import ReactMarkdown from "react-markdown";
+
+import { safeMediaSrc } from "./portal-content";
+
+/**
+ * Renders admin-authored markdown from the support-content API.
+ *
+ * Deliberately plain `react-markdown`: it builds React elements directly, so
+ * unlike a markdown→HTML-string library it needs no `dangerouslySetInnerHTML`
+ * and no sanitizer, and the portal keeps its zero HTML-injection surface.
+ *
+ * Two things must stay absent for that to hold:
+ *   - `rehype-raw`, which would start rendering raw HTML embedded in the copy;
+ *   - a custom `urlTransform`, which would override the built-in stripping of
+ *     `javascript:` and `data:` hrefs. That transform is now the *only* thing
+ *     vetting embedded media URLs, since they are authored inside the markdown
+ *     rather than validated field-by-field on the API.
+ *
+ * `remark-gfm` is also left out: tables and strikethrough are not used in the
+ * legal or FAQ copy, and CommonMark already covers lists, emphasis and links.
+ *
+ * The component map reproduces the Tailwind classes the pages used when this
+ * copy was hardcoded, so switching to markdown changed nothing visually.
+ */
+export function Markdown({ children }: { children: string }) {
+  return (
+    <ReactMarkdown
+      components={{
+        p: ({ children: content }) => (
+          <p className="mt-4 leading-7 text-muted-foreground">{content}</p>
+        ),
+        ul: ({ children: content }) => (
+          <ul className="mt-4 list-disc space-y-2 pl-5 leading-7 text-muted-foreground">
+            {content}
+          </ul>
+        ),
+        ol: ({ children: content }) => (
+          <ol className="mt-4 list-decimal space-y-2 pl-5 leading-7 text-muted-foreground">
+            {content}
+          </ol>
+        ),
+        li: ({ children: content }) => <li>{content}</li>,
+        a: ({ href, children: content }) => (
+          <a
+            href={href}
+            className="font-semibold text-foreground transition-colors hover:text-primary"
+          >
+            {content}
+          </a>
+        ),
+        strong: ({ children: content }) => (
+          <strong className="font-semibold text-foreground">{content}</strong>
+        ),
+        em: ({ children: content }) => <em className="italic">{content}</em>,
+        h3: ({ children: content }) => (
+          <h3 className="mt-6 font-bold tracking-tight">{content}</h3>
+        ),
+        /**
+         * Images *and* videos: both are written with markdown's image syntax,
+         * and the element is chosen from the file extension. `src` here has
+         * already been through react-markdown's url transform; `safeMediaSrc`
+         * narrows it further to same-origin paths and https.
+         */
+        img: ({ src, alt }) => {
+          const resolved =
+            typeof src === "string" ? safeMediaSrc(src) : null;
+          if (!resolved) return null;
+
+          // Spans, not <figure>/<figcaption>: markdown wraps an image in a
+          // paragraph, and a <figure> inside a <p> is invalid HTML that the
+          // browser silently re-parents, which drops sibling content.
+          const caption = alt ? (
+            <span className="mt-2 block text-sm text-muted-foreground">
+              {alt}
+            </span>
+          ) : null;
+
+          if (isPortalVideoSrc(resolved)) {
+            return (
+              <span className="mt-6 block">
+                {/* preload="metadata" so a large file is not pulled on every
+                    visit; the browser fetches it once playback starts. */}
+                <video
+                  controls
+                  preload="metadata"
+                  className="w-full rounded-[32px] border border-border bg-black"
+                >
+                  <source src={resolved} />
+                </video>
+                {caption}
+              </span>
+            );
+          }
+
+          return (
+            <span className="mt-6 block">
+              <img
+                src={resolved}
+                alt={alt ?? ""}
+                loading="lazy"
+                className="w-full rounded-[32px] border border-border"
+              />
+              {caption}
+            </span>
+          );
+        },
+      }}
+    >
+      {children}
+    </ReactMarkdown>
+  );
+}
+
+export default Markdown;
diff --git a/apps/edr-freight-web/portal/src/pages/support/PrivacyPolicyPage.tsx b/apps/edr-freight-web/portal/src/pages/support/PrivacyPolicyPage.tsx
new file mode 100644
index 000000000..a924d6514
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/PrivacyPolicyPage.tsx
@@ -0,0 +1,33 @@
+import { usePortalContent } from "@/hooks/usePortalContent";
+
+import { DocSections, DocShell } from "./DocShell";
+import { DocSidebar, useActiveSection } from "./DocSidebar";
+
+export default function PrivacyPolicyPage() {
+  // Never undefined — see TermsPage.
+  const { data } = usePortalContent();
+  const privacy = data!.privacy;
+  const sections = privacy.sections ?? [];
+
+  const activeId = useActiveSection(sections.map((section) => section.id));
+
+  return (
+    <DocShell
+      current="/privacy"
+      title={privacy.title}
+      subtitle={privacy.subtitle}
+      meta={`Last updated ${privacy.lastUpdated}`}
+      sidebar={
+        <DocSidebar
+          items={sections.map((section) => ({
+            id: section.id,
+            label: section.heading,
+          }))}
+          activeId={activeId}
+        />
+      }
+    >
+      <DocSections sections={sections} />
+    </DocShell>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/support/TermsPage.tsx b/apps/edr-freight-web/portal/src/pages/support/TermsPage.tsx
new file mode 100644
index 000000000..671882ff1
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/TermsPage.tsx
@@ -0,0 +1,36 @@
+import { usePortalContent } from "@/hooks/usePortalContent";
+
+import { DocSections, DocShell } from "./DocShell";
+import { DocSidebar, useActiveSection } from "./DocSidebar";
+
+export default function TermsPage() {
+  // Never undefined — the hook seeds it with the shipped copy, so this public
+  // page renders instantly and survives the API being unreachable.
+  const { data } = usePortalContent();
+  const terms = data!.terms;
+  const sections = terms.sections ?? [];
+
+  // A contents list, not a pager: the whole document stays on one page so it
+  // can be searched, printed and deep-linked to a clause.
+  const activeId = useActiveSection(sections.map((section) => section.id));
+
+  return (
+    <DocShell
+      current="/terms"
+      title={terms.title}
+      subtitle={terms.subtitle}
+      meta={`Last updated ${terms.lastUpdated}`}
+      sidebar={
+        <DocSidebar
+          items={sections.map((section) => ({
+            id: section.id,
+            label: section.heading,
+          }))}
+          activeId={activeId}
+        />
+      }
+    >
+      <DocSections sections={sections} />
+    </DocShell>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/support/portal-content.test.ts b/apps/edr-freight-web/portal/src/pages/support/portal-content.test.ts
new file mode 100644
index 000000000..07b2c09b6
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/portal-content.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  applyPortalVars,
+  FALLBACK_PORTAL_CONTENT,
+  safeMediaSrc,
+  withSupportVars,
+} from "./portal-content";
+
+const contact = {
+  email: "support@edrfreight.com",
+  phone: "+251 11 000 0000",
+  office: "Addis Ababa, Ethiopia",
+  hours: "Monday – Saturday, 8:30 AM – 5:30 PM (EAT)",
+};
+
+describe("applyPortalVars", () => {
+  it("substitutes every known token", () => {
+    expect(
+      applyPortalVars(
+        "Mail {{supportEmail}}, call {{supportPhone}}, visit {{supportOffice}}, open {{supportHours}}.",
+        contact,
+      ),
+    ).toBe(
+      "Mail support@edrfreight.com, call +251 11 000 0000, visit Addis Ababa, Ethiopia, open Monday – Saturday, 8:30 AM – 5:30 PM (EAT).",
+    );
+  });
+
+  it("strips spacing for the tel: variant", () => {
+    expect(applyPortalVars("tel:{{supportPhoneTel}}", contact)).toBe(
+      "tel:+251110000000",
+    );
+  });
+
+  it("leaves an unknown token verbatim so the typo is visible", () => {
+    expect(applyPortalVars("Mail {{supportEmial}}.", contact)).toBe(
+      "Mail {{supportEmial}}.",
+    );
+  });
+
+  it("does not let $& in a contact value corrupt the output", () => {
+    // Guards the replace-callback choice: with a replacement *string*, `$&`
+    // would expand to the matched token and the address would come out wrong.
+    expect(
+      applyPortalVars("Write to {{supportOffice}}.", {
+        ...contact,
+        office: "Bole $& Road",
+      }),
+    ).toBe("Write to Bole $& Road.");
+  });
+});
+
+describe("withSupportVars", () => {
+  it("resolves placeholders buried in the shipped legal copy", () => {
+    const resolved = withSupportVars(FALLBACK_PORTAL_CONTENT);
+    const contactSection = resolved.privacy.sections.at(-1)!;
+
+    expect(contactSection.body).toContain(contact.email);
+    expect(contactSection.body).not.toContain("{{");
+  });
+
+  it("leaves the contact block itself alone — it is the substitution source", () => {
+    expect(withSupportVars(FALLBACK_PORTAL_CONTENT).contact).toEqual(
+      FALLBACK_PORTAL_CONTENT.contact,
+    );
+  });
+});
+
+describe("safeMediaSrc", () => {
+  it("keeps same-origin paths and http(s) sources", () => {
+    expect(safeMediaSrc("/assets/guide.webm")).toBe("/assets/guide.webm");
+    expect(safeMediaSrc("https://minio.internal/support-content/a.png?sig=x")).toBe(
+      "https://minio.internal/support-content/a.png?sig=x",
+    );
+    // Signed object-store URLs are plain http in dev — rejecting them hid
+    // every upload.
+    expect(safeMediaSrc("http://localhost:9000/fhc/support-content/a.mp4")).toBe(
+      "http://localhost:9000/fhc/support-content/a.mp4",
+    );
+  });
+
+  it("drops javascript: and protocol-relative sources", () => {
+    expect(safeMediaSrc("javascript:alert(1)")).toBeNull();
+    expect(safeMediaSrc("//evil.example.com/g.webm")).toBeNull();
+    // A bare object key means the API failed to sign it — render nothing
+    // rather than a broken relative URL.
+    expect(safeMediaSrc("support-content/a.png")).toBeNull();
+  });
+});
diff --git a/apps/edr-freight-web/portal/src/pages/support/portal-content.ts b/apps/edr-freight-web/portal/src/pages/support/portal-content.ts
new file mode 100644
index 000000000..66c5910f8
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/support/portal-content.ts
@@ -0,0 +1,106 @@
+import {
+  SUPPORT_CONTENT_DEFAULTS,
+  type PortalContentBundle,
+  type PortalContentVar,
+  type PortalSupportContact,
+} from "@edr/types";
+
+/**
+ * Copy for the public help/FAQ/legal pages now lives in the database and is
+ * edited from the backoffice. This module holds what is left in the app: the
+ * shipped copy as a fallback, and the two pure helpers the pages need.
+ *
+ * The fallback matters because these four routes are public and linked from
+ * the sign-up screen — they are often the first thing an anonymous visitor
+ * sees. Rendering the shipped text while the request is in flight (or if the
+ * API is down) beats showing them a spinner or an error card, and it is why
+ * none of the four pages carry loading or error branches.
+ */
+export const FALLBACK_PORTAL_CONTENT: PortalContentBundle = {
+  contact: SUPPORT_CONTENT_DEFAULTS.CONTACT,
+  help: SUPPORT_CONTENT_DEFAULTS.HELP,
+  faq: SUPPORT_CONTENT_DEFAULTS.FAQ,
+  privacy: SUPPORT_CONTENT_DEFAULTS.PRIVACY,
+  terms: SUPPORT_CONTENT_DEFAULTS.TERMS,
+};
+
+const VAR_PATTERN =
+  /\{\{(supportEmail|supportPhone|supportPhoneTel|supportOffice|supportHours)\}\}/g;
+
+function resolveVar(name: PortalContentVar, contact: PortalSupportContact) {
+  switch (name) {
+    case "supportEmail":
+      return contact.email;
+    case "supportPhone":
+      return contact.phone;
+    case "supportPhoneTel":
+      // tel: hrefs must not carry the display spacing.
+      return contact.phone.replace(/\s/g, "");
+    case "supportOffice":
+      return contact.office;
+    case "supportHours":
+      return contact.hours;
+  }
+}
+
+/**
+ * Substitutes `{{supportEmail}}`-style placeholders against the editable
+ * contact block. The support address used to be interpolated into the privacy
+ * and terms prose at build time, which meant editing it would have left those
+ * paragraphs quoting a stale one.
+ *
+ * Uses a replacement *callback* on purpose: with a replacement string, a `$&`
+ * or `$1` inside an admin-typed office address would be treated as a
+ * backreference and corrupt the output.
+ *
+ * Unknown tokens are left verbatim — the pattern only matches the four known
+ * names — so a typo shows up as `{{supportEmial}}` rather than a blank.
+ */
+export function applyPortalVars(
+  text: string,
+  contact: PortalSupportContact,
+): string {
+  return text.replace(VAR_PATTERN, (_match, name: PortalContentVar) =>
+    resolveVar(name, contact),
+  );
+}
+
+/**
+ * Applies {@link applyPortalVars} to every string in the bundle except the
+ * contact block itself, which is the substitution source. Walking the whole
+ * object means a placeholder works in any field, including ones added later.
+ */
+export function withSupportVars(
+  bundle: PortalContentBundle,
+): PortalContentBundle {
+  const { contact, ...rest } = bundle;
+
+  const walk = (value: unknown): unknown => {
+    if (typeof value === "string") return applyPortalVars(value, contact);
+    if (Array.isArray(value)) return value.map(walk);
+    if (value && typeof value === "object") {
+      return Object.fromEntries(
+        Object.entries(value).map(([key, inner]) => [key, walk(inner)]),
+      );
+    }
+    return value;
+  };
+
+  return { contact, ...(walk(rest) as Omit<PortalContentBundle, "contact">) };
+}
+
+/**
+ * Accepts a same-origin path or an http(s) URL for an attached image or video,
+ * returning null for anything else so the caller renders nothing.
+ *
+ * The point is to exclude `javascript:` and `data:`, not to require TLS: the
+ * signed MinIO URLs the API hands back are plain http wherever the object
+ * store is (dev, and any deployment terminating TLS elsewhere), and rejecting
+ * those made every uploaded picture and video vanish from the page.
+ *
+ * `(?!\/)` still rejects protocol-relative `//host/...`, which would otherwise
+ * pass as a path.
+ */
+export function safeMediaSrc(src: string): string | null {
+  return /^(https?:\/\/|\/(?!\/))/.test(src) ? src : null;
+}
diff --git a/apps/edr-freight-web/portal/src/services/api.ts b/apps/edr-freight-web/portal/src/services/api.ts
index 7546fedbc..0d0035b87 100644
--- a/apps/edr-freight-web/portal/src/services/api.ts
+++ b/apps/edr-freight-web/portal/src/services/api.ts
@@ -15,6 +15,8 @@ import {
   GeneratePriceResponse,
   type MyBookingWindow,
   SubmitBookingResponse,
+  type WagonCancellationListFilter,
+  type WagonCancellationListResponse,
 } from "./bookings.service";
 import {
   contractsService,
@@ -483,6 +485,22 @@ export const api = {
       bookingsService.getExportTrains(bookingId, date, cargo),
     ),
 
+    listWagonCancellations: endpoint<
+      { bookingId: string },
+      WagonCancellationListResponse
+    >("bookings", "listWagonCancellations", ({ bookingId }) =>
+      bookingsService.listWagonCancellations(bookingId),
+    ),
+
+    listMyWagonCancellations: endpoint<
+      WagonCancellationListFilter | void,
+      WagonCancellationListResponse
+    >(
+      "bookings",
+      "listMyWagonCancellations",
+      bookingsService.listMyWagonCancellations,
+    ),
+
     getMyBookingWindows: endpoint<void, MyBookingWindow[]>(
       "train-scheduling",
       "myBookingWindows",
@@ -610,10 +628,14 @@ export const api = {
     ),
 
     validateShipment: endpoint<
-      { id: string; dto: Freight.CreateBookingUnderContractDto },
+      {
+        id: string;
+        dto: Freight.CreateBookingUnderContractDto;
+        excludeBookingId?: string;
+      },
       ShipmentValidation
-    >("contracts", "validateShipment", ({ id, dto }) =>
-      contractsService.validateShipment(id, dto),
+    >("contracts", "validateShipment", ({ id, dto, excludeBookingId }) =>
+      contractsService.validateShipment(id, dto, excludeBookingId),
     ),
 
     getContractMilestones: endpoint<
diff --git a/apps/edr-freight-web/portal/src/services/bookings.service.ts b/apps/edr-freight-web/portal/src/services/bookings.service.ts
index 44da51c05..cad07b0c6 100644
--- a/apps/edr-freight-web/portal/src/services/bookings.service.ts
+++ b/apps/edr-freight-web/portal/src/services/bookings.service.ts
@@ -91,6 +91,8 @@ export interface MyBookingWindow {
   windowClosesAt: string | null;
   docReviewEndsAt: string | null;
   paymentPhaseEndsAt: string | null;
+  /** End of the payment drain tail — pending payments may settle until then. */
+  paymentDrainEndsAt: string | null;
   bookingWindowStatus: string;
   bookingCycleNo: number;
   departureDate: string;
@@ -193,6 +195,116 @@ export interface BookingListFilter {
   sortOrder?: "ASC" | "DESC";
 }
 
+export interface BookingWagonContainer {
+  containerNumber: string | null;
+  sealNumber: string | null;
+  positionOnWagon: number | null;
+  grossWeightTons: string | null;
+}
+
+/** One allocated wagon of a booking, as returned by GET /bookings/:id/wagons. */
+export interface BookingWagonAllocation {
+  /** wagon_booking_allocations id — the handle for cancelling this specific wagon. */
+  allocationId: string;
+  sequenceNo: number;
+  wagonNumber: string | null;
+  wagonType: string | null;
+  wagonTypeCode: string | null;
+  tareWeightTons: string | null;
+  capacityTons: string | null;
+  lengthMeters: string | null;
+  allocatedWeightTons: string | null;
+  loadType: "CONTAINER" | "BULK";
+  status: "PLANNED" | "RESERVED" | "LOADED" | "DEPARTED";
+  trainNumber: string | null;
+  departureAt: string | null;
+  originStation: string | null;
+  destinationStation: string | null;
+  bulkCargoDescription: string | null;
+  bulkQuantity: string | null;
+  containers: BookingWagonContainer[];
+}
+
+// ── Partial wagon cancellation (paid bookings) ──────────────────────────────
+
+export type WagonCancellationStatus =
+  | "FEE_PENDING"
+  | "CREDIT_AVAILABLE"
+  | "REBOOKED"
+  | "WITHDRAWN"
+  | "EXPIRED";
+
+/** One partial-cancellation ledger row of a paid booking. */
+export interface WagonCancellation {
+  id: string;
+  bookingId: string;
+  rebookedBookingId?: string | null;
+  wagonsCancelled: number;
+  weightTons: number;
+  /** What was cut: bulk tons, or container units per size (ft). */
+  cancelledQuantities: {
+    bulkTons?: number;
+    bySize?: Record<string, number>;
+    /** Exact physical containers leaving with the cancelled wagons. */
+    units?: Array<{
+      containerSize: string;
+      containerNumber: string;
+      sealNumber?: string | null;
+      vgmTons: number;
+      isHazardous: boolean;
+      isReefer: boolean;
+    }>;
+    /** Wagons already left the schedule when the request was made. */
+    releasedAtRequest?: boolean;
+  };
+  /** Rebooking credit — the cancelled share of the original freight price. */
+  creditAmount: number;
+  feeAmount: number;
+  feeCurrency: string;
+  feeInvoiceId?: string | null;
+  feePaidAt?: string | null;
+  status: WagonCancellationStatus;
+  reason?: string | null;
+  rebookedAt?: string | null;
+  createdAt: string;
+  booking?: { id: string; reference: string } | null;
+  rebookedBooking?: { id: string; reference: string } | null;
+}
+
+/** Fee/credit preview of a partial wagon cancellation (no writes). */
+export interface WagonCancellationPreview {
+  wagons: number;
+  weightTons: number;
+  feePerWagon: number;
+  feeAmount: number;
+  feeCurrency: string;
+  creditAmount: number;
+}
+
+export interface RequestWagonCancellationPayload {
+  /** Cancel SPECIFIC wagons: allocationIds from getWagons. Overrides the fields below. */
+  wagonAllocationIds?: string[];
+  /** BULK bookings: number of wagons to cancel (tons derived proportionally). */
+  wagons?: number;
+  /** CONTAINER bookings: units to cancel per size ("20"/"40", as stored on the line). */
+  containers?: Array<{ containerSize: string; quantity: number }>;
+  reason?: string;
+}
+
+export interface WagonCancellationListFilter {
+  statuses?: string[];
+  search?: string;
+  from?: string;
+  to?: string;
+  page?: number;
+  pageSize?: number;
+}
+
+export interface WagonCancellationListResponse {
+  items: WagonCancellation[];
+  total: number;
+}
+
 export const bookingsService = {
   list: async (
     filter: BookingListFilter | void = {},
@@ -315,6 +427,16 @@ export const bookingsService = {
     return data.data;
   },
 
+  customerCancel: async (
+    id: string,
+    reason?: string,
+  ): Promise<Freight.IBooking> => {
+    const { data } = await client.post(`/api/bookings/${id}/customer-cancel`, {
+      reason,
+    });
+    return data.data;
+  },
+
   reject: async (id: string, reason?: string): Promise<Freight.IBooking> => {
     const { data } = await client.post(`/api/bookings/${id}/reject`, { reason });
     return data.data;
@@ -548,6 +670,82 @@ export const bookingsService = {
     return data.data as Freight.DayAvailabilityResponse;
   },
 
+  /**
+   * Allocated wagons for a paid booking (empty until placed on a train).
+   * One row per wagon with its containers / bulk load.
+   */
+  getWagons: async (bookingId: string): Promise<BookingWagonAllocation[]> => {
+    const { data } = await client.get(`/api/bookings/${bookingId}/wagons`);
+    return (data.data ?? data) as BookingWagonAllocation[];
+  },
+
+  // ── Partial wagon cancellation ──
+  /** Fee/credit preview for the confirm dialog — same math as the request, no writes. */
+  previewWagonCancellation: async (
+    id: string,
+    payload: RequestWagonCancellationPayload,
+  ): Promise<WagonCancellationPreview> => {
+    const { data } = await client.post(
+      `/api/bookings/${id}/wagon-cancellations/preview`,
+      payload,
+    );
+    return data.data ?? data;
+  },
+
+  /** Open a cancellation: issues the fee invoice; wagons release once the fee settles. */
+  requestWagonCancellation: async (
+    id: string,
+    payload: RequestWagonCancellationPayload,
+  ): Promise<WagonCancellation> => {
+    const { data } = await client.post(
+      `/api/bookings/${id}/wagon-cancellations`,
+      payload,
+    );
+    return data.data ?? data;
+  },
+
+  /** Cancellation history of one booking (as source and as rebooked target). */
+  listWagonCancellations: async (
+    bookingId: string,
+  ): Promise<WagonCancellationListResponse> => {
+    const { data } = await client.get(
+      `/api/bookings/${bookingId}/wagon-cancellations`,
+    );
+    return data.data ?? data;
+  },
+
+  /** The signed-in customer's wagon cancellations (paginated, filterable). */
+  listMyWagonCancellations: async (
+    filter: WagonCancellationListFilter | void = {},
+  ): Promise<WagonCancellationListResponse> => {
+    const { data } = await client.get("/api/bookings/wagon-cancellations/my", {
+      params: filter,
+    });
+    return data.data ?? data;
+  },
+
+  /** Void a FEE_PENDING request — the fee invoice is cancelled, nothing was released. */
+  withdrawWagonCancellation: async (
+    cancellationId: string,
+  ): Promise<WagonCancellation> => {
+    const { data } = await client.post(
+      `/api/bookings/wagon-cancellations/${cancellationId}/withdraw`,
+    );
+    return data.data ?? data;
+  },
+
+  /** Rebook a CREDIT_AVAILABLE cancellation onto a shipment day → new PAID booking. */
+  rebookWagonCancellation: async (
+    cancellationId: string,
+    payload: { scheduledDate: string },
+  ): Promise<{ cancellation: WagonCancellation; bookingId: string }> => {
+    const { data } = await client.post(
+      `/api/bookings/wagon-cancellations/${cancellationId}/rebook`,
+      payload,
+    );
+    return data.data ?? data;
+  },
+
   /**
    * Upcoming/open booking windows on the signed-in customer's active-contract
    * lanes (import booking-day windows + export 24h pre-departure windows).
diff --git a/apps/edr-freight-web/portal/src/services/companies.service.ts b/apps/edr-freight-web/portal/src/services/companies.service.ts
index 5fba278dd..58de2bd16 100644
--- a/apps/edr-freight-web/portal/src/services/companies.service.ts
+++ b/apps/edr-freight-web/portal/src/services/companies.service.ts
@@ -162,6 +162,11 @@ export interface OnboardingLicenseProfile {
 export interface OnboardingPoaState {
   required: boolean;
   provided: boolean;
+  /**
+   * True when the DARS delegation paper is owed. False when the owner
+   * represents the company themselves — nobody delegates to themselves.
+   */
+  delegationLetterRequired: boolean;
   delegationLetterUploaded: boolean;
   /** True when a reviewer sent the DARS delegation paper back for correction. */
   delegationLetterFlagged: boolean;
@@ -194,11 +199,11 @@ export interface OnboardingRequirements {
 
 export interface CompanyProfileInput {
   type:
-    | "importer"
-    | "exporter"
-    | "freight_forwarder"
-    | "dj_freight_forwarder"
-    | "transporter";
+  | "importer"
+  | "exporter"
+  | "freight_forwarder"
+  | "dj_freight_forwarder"
+  | "transporter";
   businessLicense?: string;
 }
 
@@ -206,8 +211,6 @@ export interface CreateCompanyPayload {
   companyType?: string;
   nationality?: CompanyNationality;
   companyName: string;
-  companyEmail?: string;
-  companyPhone?: string;
   companyLocation?: string;
   companyAddress?: string;
   tin?: string;
@@ -460,9 +463,9 @@ export const companiesService = {
 
   /** The current company's open profile change request (pending/rejected), or null. */
   getChangeRequest: async (): Promise<ChangeRequestResponse | null> => {
-    const response = await client.get<ApiResponse<ChangeRequestResponse | null>>(
-      URL_CONSTANTS.COMPANIES_API.PROFILE_CHANGE_REQUEST,
-    );
+    const response = await client.get<
+      ApiResponse<ChangeRequestResponse | null>
+    >(URL_CONSTANTS.COMPANIES_API.PROFILE_CHANGE_REQUEST);
     return unwrap(response.data);
   },
 
diff --git a/apps/edr-freight-web/portal/src/services/contracts.service.ts b/apps/edr-freight-web/portal/src/services/contracts.service.ts
index 2ce09d4cc..3842296ef 100644
--- a/apps/edr-freight-web/portal/src/services/contracts.service.ts
+++ b/apps/edr-freight-web/portal/src/services/contracts.service.ts
@@ -400,8 +400,13 @@ export const contractsService = {
   validateShipment: async (
     id: string,
     dto: Freight.CreateBookingUnderContractDto,
+    // Completion/resubmit: exclude this booking's own containers from the
+    // same-train clash check.
+    excludeBookingId?: string,
   ): Promise<ShipmentValidation> => {
-    const { data } = await client.post(C.VALIDATE_SHIPMENT(id), dto);
+    const { data } = await client.post(C.VALIDATE_SHIPMENT(id), dto, {
+      params: excludeBookingId ? { bookingId: excludeBookingId } : undefined,
+    });
     return data.data ?? data;
   },
 
diff --git a/apps/edr-freight-web/portal/src/services/verifayda.service.ts b/apps/edr-freight-web/portal/src/services/verifayda.service.ts
index 38b225918..7dd96c571 100644
--- a/apps/edr-freight-web/portal/src/services/verifayda.service.ts
+++ b/apps/edr-freight-web/portal/src/services/verifayda.service.ts
@@ -41,6 +41,13 @@ export interface CompanyIdentityState {
   passportRequired: boolean;
   owner: OwnerIdentityState;
   poa: IdentityVerificationState;
+  /**
+   * True when the representative is the owner themselves, declared through
+   * "same as owner". Waives the DARS delegation paper — nobody delegates to
+   * themselves — and, where the owner is Fayda-verified, backs `poa.verified`
+   * with the owner's sub.
+   */
+  poaSameAsOwner: boolean;
   /**
    * General manager. `verified` covers both routes: the GM verifying in their
    * own right, and the company declaring the GM is the owner (in which case
@@ -143,6 +150,34 @@ export const verifaydaService = {
     return unwrap(response.data);
   },
 
+  /**
+   * Declare the Power of Attorney is the company's owner. A Fayda-verified
+   * owner's identity is copied server-side (the portal never supplies it); a
+   * foreign company's owner has nothing proven to copy, so the API records the
+   * declaration and the form types the representative's details as usual.
+   *
+   * Either way the declaration is what waives the DARS delegation paper.
+   */
+  setPoaSameAsOwner: async (): Promise<CompanyIdentityState> => {
+    const response = await client.post<ApiResponse<CompanyIdentityState>>(
+      "/api/companies/identity/poa/same-as-owner",
+    );
+    return unwrap(response.data);
+  },
+
+  /**
+   * Undo that declaration and the identity it copied, leaving the
+   * representative open to be verified in their own right. Unlike
+   * {@link removePoa} this is allowed for a freight forwarder — it is how they
+   * change who represents them — and leaves the delegation paper on file.
+   */
+  clearPoaSameAsOwner: async (): Promise<CompanyIdentityState> => {
+    const response = await client.delete<ApiResponse<CompanyIdentityState>>(
+      "/api/companies/identity/poa/same-as-owner",
+    );
+    return unwrap(response.data);
+  },
+
   /**
    * Drop the Power of Attorney — verified identity, details and delegation
    * paper together. A verified person's fields are locked, so blanking the form
diff --git a/apps/edr-freight-web/portal/src/types/profile.ts b/apps/edr-freight-web/portal/src/types/profile.ts
index 8f126ea1a..732dd13cf 100644
--- a/apps/edr-freight-web/portal/src/types/profile.ts
+++ b/apps/edr-freight-web/portal/src/types/profile.ts
@@ -7,8 +7,6 @@ export interface ProfileResponse {
   companyType: string;
   nationality: string | null;
   companyProfiles: CompanyProfileResponse[];
-  companyEmail: string | null;
-  companyPhone: string | null;
   companyLocation: string;
   companyAddress: string | null;
   tinNumber: string;
@@ -68,8 +66,6 @@ export interface ProfileResponse {
 export interface UpdateProfilePayload {
   nationality?: "ethiopian" | "foreign";
   companyName?: string;
-  companyEmail?: string;
-  companyPhone?: string;
   companyLocation?: string;
   companyAddress?: string;
   tin?: string;
diff --git a/apps/edr-freight-web/portal/src/utils/result.ts b/apps/edr-freight-web/portal/src/utils/result.ts
index 54104442c..3c0bddf34 100644
--- a/apps/edr-freight-web/portal/src/utils/result.ts
+++ b/apps/edr-freight-web/portal/src/utils/result.ts
@@ -34,6 +34,16 @@ function humanizeApiMessage(raw: string): string {
   return raw;
 }
 
+/**
+ * NestJS's ValidationPipe reports every failed constraint at once, so `message`
+ * arrives as a string[] rather than a string. Flatten it — passing the array
+ * through left the UI rendering its entries run together with no separator.
+ */
+function asMessage(value: unknown): string {
+  if (Array.isArray(value)) return value.filter(Boolean).join(". ");
+  return typeof value === "string" ? value : "";
+}
+
 export function extractApiError(err: unknown): ApiError {
   if (err && typeof err === "object") {
     const obj = err as Record<string, unknown>;
@@ -41,13 +51,10 @@ export function extractApiError(err: unknown): ApiError {
     if (response) {
       const statusCode = response.status as number | undefined;
       const data = response.data as Record<string, unknown> | undefined;
+      const raw = asMessage(data?.message) || asMessage(data?.error);
       return {
-        code: (data?.message as string) || (data?.error as string) || "api_error",
-        message: humanizeApiMessage(
-          (data?.message as string) ||
-            (data?.error as string) ||
-            "An unexpected error occurred",
-        ),
+        code: raw || "api_error",
+        message: humanizeApiMessage(raw || "An unexpected error occurred"),
         statusCode,
       };
     }
diff --git a/apps/edr-passenger-api/src/common/utils/payment-deadline.utils.ts b/apps/edr-passenger-api/src/common/utils/payment-deadline.utils.ts
index 858f9c97a..8c391aef1 100644
--- a/apps/edr-passenger-api/src/common/utils/payment-deadline.utils.ts
+++ b/apps/edr-passenger-api/src/common/utils/payment-deadline.utils.ts
@@ -8,7 +8,7 @@
  */
 
 /** Maximum time (hours) a passenger has to pay after booking. */
-export const MAX_PAYMENT_HOURS = 240;
+export const MAX_PAYMENT_HOURS = 2;
 /** Minutes before departure: cutoff for new bookings and payment deadline. */
 export const CUTOFF_MINUTES = 30;
 
diff --git a/apps/edr-passenger-api/src/modules/dashboard/dashboard.module.ts b/apps/edr-passenger-api/src/modules/dashboard/dashboard.module.ts
index 5a541452c..09b3717b4 100644
--- a/apps/edr-passenger-api/src/modules/dashboard/dashboard.module.ts
+++ b/apps/edr-passenger-api/src/modules/dashboard/dashboard.module.ts
@@ -1,13 +1,6 @@
 import { Module } from '@nestjs/common';
 import { DashboardController } from './dashboard.controller';
 import { DashboardService } from './dashboard.service';
-import { ReportsModule } from '../reports/reports.module';
 
-@Module({
-  // ReportsModule owns the blocked-seat revenue loss rule; the dashboard's roll-up
-  // reads it from there instead of keeping a second copy of the definition.
-  imports: [ReportsModule],
-  controllers: [DashboardController],
-  providers: [DashboardService],
-})
+@Module({ controllers: [DashboardController], providers: [DashboardService] })
 export class DashboardModule {}
diff --git a/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts b/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts
index 6a5d83b89..f7e015e11 100644
--- a/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts
+++ b/apps/edr-passenger-api/src/modules/dashboard/dashboard.service.ts
@@ -1,31 +1,17 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
 import { DataSource } from 'typeorm';
-import { BlockedSeatRevenueLossStat } from '@edr/types';
 import { PrismaService } from '../../common/prisma.service';
-import { ReportsService } from '../reports/reports.service';
-
-/** Shown when nothing is blocked, or when the loss roll-up could not be computed. */
-const EMPTY_BLOCKED_SEAT_LOSS: BlockedSeatRevenueLossStat = {
-  periodDays: null,
-  lossByCurrency: [],
-  schedulesAffected: 0,
-  blockedSeatCount: 0,
-  topReasonCategory: null,
-};
 
 @Injectable()
 export class DashboardService {
-  private readonly logger = new Logger(DashboardService.name);
-
   constructor(
     private prisma: PrismaService,
     @InjectDataSource() private dataSource: DataSource,
-    private reports: ReportsService,
   ) {}
 
   async getBackofficeStats() {
-    const [totalBookings, totalPackageBookings, totalTickets, totalPassengers, blockedSeatsCount, revenueRows, packageRevenueRows, blockedSeatRevenueLoss] =
+    const [totalBookings, totalPackageBookings, totalTickets, totalPassengers, blockedSeatsCount, revenueRows, packageRevenueRows] =
       await Promise.all([
         this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] } } }),
         this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] }, packageId: { not: null } } }),
@@ -52,9 +38,6 @@ export class DashboardService {
             AND id IN (SELECT "bookingId" FROM passenger."PaymentIntent" WHERE status = 'SUCCEEDED')
           GROUP BY COALESCE("displayCurrency"::text, "currency"::text)
         `,
-        // Joined into this same call on purpose: the dashboard's request count stays
-        // exactly where it was, and the card renders from the payload it already fetches.
-        this.getBlockedSeatRevenueLossStat(),
       ]);
 
     const totalPackageTickets = await this.prisma.ticket.count({
@@ -75,43 +58,11 @@ export class DashboardService {
       totalNormalTickets: totalTickets - totalPackageTickets,
       totalPassengers,
       blockedSeatsCount,
-      blockedSeatRevenueLoss,
       revenueByCurrency: toMap(revenueRows),
       packageRevenueByCurrency: toMap(packageRevenueRows),
     };
   }
 
-  /**
-   * Compact roll-up of the Blocked Seat Revenue Loss report over its full history.
-   *
-   * Reuses the report service rather than re-deriving the rule — there is exactly one
-   * definition of what a blocked seat costs. A failure here degrades to zeroes instead of
-   * taking the whole dashboard down with it.
-   */
-  private async getBlockedSeatRevenueLossStat(): Promise<BlockedSeatRevenueLossStat> {
-    try {
-      // pageSize 1: only the summary is read, and paging does not change what it covers.
-      const report = await this.reports.getBlockedSeatsRevenueLoss({ page: 1, pageSize: 1 });
-      const { summary } = report;
-
-      return {
-        periodDays: null,
-        lossByCurrency: summary.lossByCurrency,
-        schedulesAffected: summary.schedulesAffected,
-        blockedSeatCount: summary.blockedSeatCount,
-        // topReasonCategories is already sorted by estimated loss, descending.
-        topReasonCategory: summary.topReasonCategories[0]?.reasonCategory ?? null,
-      };
-    } catch (err) {
-      this.logger.warn(
-        `Blocked-seat revenue loss roll-up unavailable — ${
-          err instanceof Error ? err.message : String(err)
-        }`,
-      );
-      return EMPTY_BLOCKED_SEAT_LOSS;
-    }
-  }
-
   async getHomeDashboard(passengerId: string) {
     const now = new Date();
     const [passenger, upcomingBooking, wallet, promos, weatherAlerts, stationSignals, savedRoutes] = await Promise.all([
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts b/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts
index 186383335..9b94053b6 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.service.spec.ts
@@ -40,6 +40,7 @@ describe("PaymentsService", () => {
       findUniqueOrThrow: jest.fn(),
       upsert: jest.fn(),
       update: jest.fn(),
+      updateMany: jest.fn(),
       create: jest.fn(),
     },
     paymentMethod: {
@@ -81,6 +82,7 @@ describe("PaymentsService", () => {
   const mockPaymentClient = {
     initiate: jest.fn(),
     getIntentByReference: jest.fn(),
+    reconcileByReference: jest.fn(),
   };
 
   // Mirrors the real ETB→major conversion: minor units → major price (TELEBIRR settles in ETB).
@@ -242,6 +244,14 @@ describe("PaymentsService", () => {
         merchantOrderId: "PSG-MERCH-123",
         clientAction: { type: "REDIRECT", url: "https://provider.example/pay" },
       });
+      // syncIntentProjection applies the status in a separate guarded write (never demoting a
+      // SUCCEEDED row), then reads the projection back — so this is what it returns.
+      mockPrisma.paymentIntent.findUniqueOrThrow.mockResolvedValue({
+        id: "intent-1",
+        status: PaymentIntentStatus.REQUIRES_ACTION,
+        merchantOrderId: "PSG-MERCH-123",
+        clientAction: { type: "REDIRECT", url: "https://provider.example/pay" },
+      });
 
       const result = await service.initiatePayment({
         bookingId: "booking-1",
@@ -479,6 +489,14 @@ describe("PaymentsService", () => {
         merchantOrderId: "PSG-MERCH-123",
         clientAction: { type: "REDIRECT", url: "https://provider.example/pay" },
       });
+      // See above: the projection is read back after the guarded status write.
+      mockPrisma.paymentIntent.findUniqueOrThrow.mockResolvedValue({
+        id: "intent-1",
+        bookingId: "booking-1",
+        status: PaymentIntentStatus.REQUIRES_ACTION,
+        merchantOrderId: "PSG-MERCH-123",
+        clientAction: { type: "REDIRECT", url: "https://provider.example/pay" },
+      });
 
       const result = await service.getIntentByBookingId("booking-1");
 
@@ -499,4 +517,49 @@ describe("PaymentsService", () => {
       );
     });
   });
+
+  // Regression: a booking confirmed between a sweep's candidate query and its turn in the loop
+  // used to have its SUCCEEDED projection demoted to PROCESSING by the re-sync, with nothing
+  // able to restore it (finalizePaymentSuccess only writes SUCCEEDED while the booking is still
+  // PENDING_PAYMENT). A later stale payment.failed from an abandoned sibling attempt could then
+  // push that same row to FAILED, because markPaymentFailed only shields SUCCEEDED/CANCELLED.
+  describe("confirmed-booking projection integrity", () => {
+    it("does not re-sync or cancel a booking confirmed since the caller's snapshot", async () => {
+      mockPrisma.booking.findUnique.mockResolvedValue({ status: "CONFIRMED" });
+
+      const result = await service.reconcileAndConfirmIfPaid("booking-1");
+
+      expect(result).toEqual({ paid: true, verified: true });
+      // Neither the payment service nor the projection is touched.
+      expect(mockPaymentClient.reconcileByReference).not.toHaveBeenCalled();
+      expect(mockPrisma.paymentIntent.upsert).not.toHaveBeenCalled();
+    });
+
+    it("writes the mirrored status only where the row is not already SUCCEEDED", async () => {
+      mockPrisma.paymentIntent.findUnique.mockResolvedValue(null);
+      mockPaymentClient.getIntentByReference.mockResolvedValue(
+        requiresActionSnapshot(ProviderMethod.TELEBIRR),
+      );
+      mockPrisma.paymentIntent.findUniqueOrThrow.mockResolvedValue({
+        id: "intent-1",
+        bookingId: "booking-1",
+        status: PaymentIntentStatus.REQUIRES_ACTION,
+      });
+
+      await service.getIntentByBookingId("booking-1");
+
+      // The upsert must never carry a status on its update path...
+      const upsertArg = mockPrisma.paymentIntent.upsert.mock.calls[0][0];
+      expect(upsertArg.update).not.toHaveProperty("status");
+      // ...the status arrives through a write guarded on the row not being SUCCEEDED, which is
+      // what makes demoting the confirming payment structurally impossible.
+      expect(mockPrisma.paymentIntent.updateMany).toHaveBeenCalledWith(
+        expect.objectContaining({
+          where: expect.objectContaining({
+            status: { not: PaymentIntentStatus.SUCCEEDED },
+          }),
+        }),
+      );
+    });
+  });
 });
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.service.ts b/apps/edr-passenger-api/src/modules/payments/payments.service.ts
index 62b45bdd8..137df45ee 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.service.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.service.ts
@@ -668,12 +668,13 @@ export class PaymentsService {
     bookingId: string,
     snapshot: PaymentIntentSnapshot,
   ) {
+    // Writing SUCCEEDED is finalizePaymentSuccess's job alone — it is the only place that can
+    // enforce confirm-once atomically — so a SUCCEEDED snapshot syncs as PROCESSING here.
     const status =
       snapshot.status === ProviderPaymentStatus.SUCCEEDED
         ? PaymentIntentStatus.PROCESSING
         : (snapshot.status as unknown as PaymentIntentStatus);
     const data = {
-      status,
       method: snapshot.provider as unknown as PaymentMethodType,
       merchantOrderId: snapshot.merchantOrderId,
       clientAction: snapshot.clientAction
@@ -688,7 +689,7 @@ export class PaymentsService {
             .providerResponse as unknown as Prisma.InputJsonValue)
         : Prisma.DbNull,
     };
-    return this.prisma.paymentIntent.upsert({
+    await this.prisma.paymentIntent.upsert({
       where: { bookingId },
       // amountMinor/currency are refreshed on update too: a cross-currency method switch
       // (e.g. Waafi/USD → Telebirr/ETB) re-initiates over the same row, and the projection
@@ -702,9 +703,17 @@ export class PaymentsService {
         bookingId,
         amountMinor: snapshot.amountMinor,
         currency: snapshot.currency,
+        status,
         ...data,
       },
     });
+
+    await this.prisma.paymentIntent.updateMany({
+      where: { bookingId, status: { not: PaymentIntentStatus.SUCCEEDED } },
+      data: { status },
+    });
+
+    return this.prisma.paymentIntent.findUniqueOrThrow({ where: { bookingId } });
   }
 
   private async initiateWalletPayment(
@@ -1111,6 +1120,14 @@ export class PaymentsService {
   async reconcileAndConfirmIfPaid(
     bookingId: string,
   ): Promise<{ paid: boolean; verified: boolean }> {
+    const current = await this.prisma.booking.findUnique({
+      where: { id: bookingId },
+      select: { status: true },
+    });
+    if (current?.status === "CONFIRMED") {
+      return { paid: true, verified: true };
+    }
+
     const settlement = await this.paymentClient.reconcileByReference(
       PaymentReferenceType.BOOKING,
       bookingId,
@@ -1247,12 +1264,31 @@ export class PaymentsService {
     });
 
     if (confirmed === 0) {
-      // Booking already confirmed by another payment (or not payable and not forced). This capture
-      // is registered on the payment-api ledger; do not confirm, ticket, or touch this row.
-      this.logger.error(
-        `Capture on non-payable booking ${booking.id} (status=${booking.status}), intent ${intent.id} ` +
-          `txn=${input.providerTxnId ?? intent.providerTxnId ?? "n/a"} — registered in payment-api; not confirming`,
-      );
+      const recordsConfirmingCapture =
+        booking.status === "CONFIRMED" && intent.paidAt != null;
+      if (recordsConfirmingCapture) {
+        const { count } = await this.prisma.paymentIntent.updateMany({
+          where: { id: intent.id, status: { not: PaymentIntentStatus.SUCCEEDED } },
+          data: { status: PaymentIntentStatus.SUCCEEDED },
+        });
+        if (count > 0) {
+          this.logger.warn(
+            `Restored demoted payment projection for booking ${booking.id} ` +
+              `(intent ${intent.id}): ${intent.status} → SUCCEEDED`,
+          );
+        }
+      }
+
+      const duplicateCapture =
+        input.providerTxnId != null &&
+        intent.providerTxnId != null &&
+        input.providerTxnId !== intent.providerTxnId;
+      if (duplicateCapture || !recordsConfirmingCapture) {
+        this.logger.error(
+          `Capture on non-payable booking ${booking.id} (status=${booking.status}), intent ${intent.id} ` +
+            `txn=${input.providerTxnId ?? intent.providerTxnId ?? "n/a"} — registered in payment-api; not confirming`,
+        );
+      }
       return { alreadyFinalized: true };
     }
 
diff --git a/apps/edr-passenger-api/src/modules/reports/blocked-seats-loss.calculator.ts b/apps/edr-passenger-api/src/modules/reports/blocked-seats-loss.calculator.ts
index 6ce581067..efee9a11c 100644
--- a/apps/edr-passenger-api/src/modules/reports/blocked-seats-loss.calculator.ts
+++ b/apps/edr-passenger-api/src/modules/reports/blocked-seats-loss.calculator.ts
@@ -193,7 +193,10 @@ function supersedes(candidate: CountedBlock, existing: CountedBlock): boolean {
   return candidate.block.blockedAt.getTime() > existing.block.blockedAt.getTime();
 }
 
-function isGlobalBlockInEffectAt(block: LossBlock, departureAt: Date): boolean {
+export function isGlobalBlockInEffectAt(
+  block: Pick<LossBlock, 'blockedAt' | 'unblockAt'>,
+  departureAt: Date,
+): boolean {
   if (block.blockedAt.getTime() > departureAt.getTime()) return false;
   if (block.unblockAt === null) return true;
   return block.unblockAt.getTime() >= departureAt.getTime();
@@ -210,9 +213,10 @@ export function isPlaceholderSeat(seat: Pick<LossSeat, 'seatNumber'>): boolean {
  * inflates the blocked-seat count. Match on a substring of type *or* name so both the
  * documented convention and the data as it actually exists are covered.
  */
-export function isDiningCoach(
-  coach: Pick<LossCoach, 'coachTypeType' | 'coachTypeName'>,
-): boolean {
+export function isDiningCoach(coach: {
+  coachTypeType?: string | null;
+  coachTypeName?: string | null;
+}): boolean {
   const haystack = `${coach.coachTypeType ?? ''} ${coach.coachTypeName ?? ''}`.toLowerCase();
   return haystack.includes('dining');
 }
diff --git a/apps/edr-passenger-api/src/modules/reports/reports.service.ts b/apps/edr-passenger-api/src/modules/reports/reports.service.ts
index 8811a3855..e899fdb4b 100644
--- a/apps/edr-passenger-api/src/modules/reports/reports.service.ts
+++ b/apps/edr-passenger-api/src/modules/reports/reports.service.ts
@@ -15,12 +15,16 @@ import {
 } from "./reports.dto";
 import {
   assembleReport,
+  isDiningCoach,
+  isGlobalBlockInEffectAt,
+  isPlaceholderSeat,
   LossCalculatorInput,
   LossCoach,
   LossFare,
   LossSeat,
   selectCountedBlocks,
   soldKey,
+  TICKETING_BLOCK_REASON_PREFIX,
 } from "./blocked-seats-loss.calculator";
 
 /** Fares are quoted at the local tariff unless the caller asks otherwise. */
@@ -528,7 +532,8 @@ export class ReportsService {
   }
 
   async getSeatStatusReport(scheduleId: string) {
-    // Confirmed/boarded seats — exclude dining coaches
+    // Confirmed/boarded seats. Dining coaches are dropped in JS below — `CoachType.type`
+    // holds display names in real data, so an exact match here would not catch them.
     const bookingSeats = await this.prisma.bookingSeat.findMany({
       where: {
         OR: [
@@ -536,7 +541,6 @@ export class ReportsService {
           { leg: 2, booking: { returnScheduleId: scheduleId, status: { in: ['CONFIRMED', 'BOARDED', 'PENDING_PAYMENT'] } } },
           { scheduleId: null, leg: 1, booking: { scheduleId, status: { in: ['CONFIRMED', 'BOARDED', 'PENDING_PAYMENT'] } } },
         ],
-        seat: { coach: { coachType: { type: { not: 'dining' } } } },
       },
       include: {
         booking: {
@@ -565,12 +569,6 @@ export class ReportsService {
       orderBy: [{ seat: { coach: { number: 'asc' } } }, { seat: { seatNumber: 'asc' } }],
     });
 
-    // Active seat holds for this schedule
-    const activeHolds = await this.prisma.seatHold.findMany({
-      where: { scheduleId },
-      orderBy: { createdAt: 'desc' },
-    });
-
     // Expired holds (last 24h) — held but never converted to a booking
     const since24h = new Date(Date.now() - 24 * 60 * 60 * 1000);
     const expiredHolds = await this.prisma.seatHold.findMany({
@@ -581,35 +579,89 @@ export class ReportsService {
       orderBy: { expiresAt: 'desc' },
     });
 
-    // Manually blocked seats — schedule-scoped blocks for this schedule OR global blocks (scheduleId null)
-    // Exclude MAINTENANCE and booking-system-created blocks
-    const blocks = await this.prisma.seatBlock.findMany({
-      where: {
-        OR: [
-          { scheduleId },
-          { scheduleId: null },
-        ],
-        NOT: [
-          { reason: { startsWith: 'MAINTENANCE:' } },
-          { reason: { startsWith: 'Booked in tickets' } },
-        ],
-      },
-      include: {
-        seat: {
-          select: {
-            seatNumber: true,
-            bedPosition: true,
-            coach: {
-              select: {
-                number: true,
-                coachType: { select: { name: true, type: true, seatClasses: { select: { name: true, bedPosition: true } } } },
+    // Manually blocked seats. Counted the same way the blocked-seat revenue loss report
+    // counts them (see `selectCountedBlocks`), so the two reports never disagree:
+    //   - a schedule-scoped block naming this schedule, or
+    //   - a global block (scheduleId null) that was in effect at departure AND sits on a
+    //     coach actually assigned to this train.
+    // A global block on a coach that never joined this consist is not a blocked seat here.
+    // Excluded: dining coaches, placeholder seats, ticket-issuance bookkeeping blocks, and
+    // MAINTENANCE (a seat out of service, not one withheld by hand).
+    const [schedule, assignments, blockRows] = await Promise.all([
+      this.prisma.trainSchedule.findUnique({
+        where: { id: scheduleId },
+        select: { departureAt: true },
+      }),
+      this.prisma.coachAssignment.findMany({
+        where: { scheduleId },
+        select: { coachId: true },
+      }),
+      this.prisma.seatBlock.findMany({
+        where: {
+          OR: [
+            { scheduleId },
+            { scheduleId: null },
+          ],
+          NOT: [
+            { reason: { startsWith: 'MAINTENANCE:' } },
+            { reason: { startsWith: TICKETING_BLOCK_REASON_PREFIX } },
+          ],
+        },
+        include: {
+          seat: {
+            select: {
+              id: true,
+              coachId: true,
+              seatNumber: true,
+              bedPosition: true,
+              coach: {
+                select: {
+                  number: true,
+                  coachType: { select: { name: true, type: true, seatClasses: { select: { name: true, bedPosition: true } } } },
+                },
               },
             },
           },
         },
-      },
-      orderBy: { blockedAt: 'desc' },
-    });
+        orderBy: { blockedAt: 'desc' },
+      }),
+    ]);
+
+    const assignedCoachIds = new Set(assignments.map((a) => a.coachId));
+    const departureAt = schedule?.departureAt ?? null;
+
+    // One counted block per seat: a schedule-scoped block beats a global one, and between
+    // two of the same kind the most recent wins — the rows arrive newest-first, so the
+    // first of a kind seen for a seat is already the most recent.
+    const countedBySeat = new Map<string, (typeof blockRows)[number]>();
+    for (const block of blockRows) {
+      const seat = block.seat;
+      if (!seat || isPlaceholderSeat(seat)) continue;
+
+      const coachType = seat.coach?.coachType;
+      if (
+        isDiningCoach({
+          coachTypeType: coachType?.type ?? null,
+          coachTypeName: coachType?.name ?? null,
+        })
+      ) {
+        continue;
+      }
+
+      if (block.scheduleId === null) {
+        if (!assignedCoachIds.has(seat.coachId)) continue;
+        if (!departureAt || !isGlobalBlockInEffectAt(block, departureAt)) continue;
+      }
+
+      const existing = countedBySeat.get(seat.id);
+      if (!existing || (existing.scheduleId === null && block.scheduleId !== null)) {
+        countedBySeat.set(seat.id, block);
+      }
+    }
+
+    const blocks = [...countedBySeat.values()].sort(
+      (a, b) => b.blockedAt.getTime() - a.blockedAt.getTime(),
+    );
 
     const resolveSeatClass = (seat: any): string | null => {
       const classes = seat?.coach?.coachType?.seatClasses ?? [];
@@ -619,10 +671,18 @@ export class ReportsService {
       return (matched ?? classes[0])?.name ?? seat?.coach?.coachType?.name ?? null;
     };
 
-    const paidSeats = bookingSeats.filter(bs =>
+    const passengerSeats = bookingSeats.filter(
+      bs =>
+        !isDiningCoach({
+          coachTypeType: bs.seat?.coach?.coachType?.type ?? null,
+          coachTypeName: bs.seat?.coach?.coachType?.name ?? null,
+        }),
+    );
+
+    const paidSeats = passengerSeats.filter(bs =>
       bs.booking.status === 'CONFIRMED' || bs.booking.status === 'BOARDED'
     );
-    const unpaidSeats = bookingSeats.filter(bs =>
+    const unpaidSeats = passengerSeats.filter(bs =>
       bs.booking.status === 'PENDING_PAYMENT'
     );
 
@@ -645,7 +705,7 @@ export class ReportsService {
         paidCount: paidSeats.length,
         unpaidCount: unpaidSeats.length,
         expiredHoldCount: expiredHolds.length,
-        blockedCount: blocks.filter(b => b.seat?.coach?.coachType?.type !== 'dining').length,
+        blockedCount: blocks.length,
       },
       paidSeats: paidSeats.map(mapSeat),
       unpaidSeats: unpaidSeats.map(mapSeat),
@@ -655,18 +715,16 @@ export class ReportsService {
         expiresAt: h.expiresAt,
         createdAt: h.createdAt,
       })),
-      blockedSeats: blocks
-        .filter(b => b.seat?.coach?.coachType?.type !== 'dining')
-        .map(b => ({
-          id: b.id,
-          coachNumber: b.seat?.coach?.number ?? null,
-          seatNumber: b.seat?.seatNumber ?? null,
-          seatClassName: resolveSeatClass(b.seat),
-          reason: b.reason,
-          blockedBy: b.blockedBy,
-          blockedAt: b.blockedAt,
-          unblockAt: b.unblockAt,
-        })),
+      blockedSeats: blocks.map(b => ({
+        id: b.id,
+        coachNumber: b.seat?.coach?.number ?? null,
+        seatNumber: b.seat?.seatNumber ?? null,
+        seatClassName: resolveSeatClass(b.seat),
+        reason: b.reason,
+        blockedBy: b.blockedBy,
+        blockedAt: b.blockedAt,
+        unblockAt: b.unblockAt,
+      })),
     };
   }
 
diff --git a/apps/edr-passenger-api/src/modules/reports/seat-status-blocked.spec.ts b/apps/edr-passenger-api/src/modules/reports/seat-status-blocked.spec.ts
new file mode 100644
index 000000000..044ebe868
--- /dev/null
+++ b/apps/edr-passenger-api/src/modules/reports/seat-status-blocked.spec.ts
@@ -0,0 +1,261 @@
+import { ReportsService } from './reports.service';
+
+/**
+ * Covers the blocked-seat half of the seat status report.
+ *
+ * The count used to be a raw `SeatBlock` row count with an exact `type === 'dining'`
+ * exclusion. Real EDR data stores display names in `CoachType.type` ('Dining Coach '),
+ * so dining seats slipped through, and every global block counted even when its coach
+ * never joined the train. These cases pin the corrected rule.
+ */
+
+const SCHEDULE_ID = 'sched-1';
+const DEPARTURE = new Date('2026-03-10T06:00:00.000Z');
+
+interface CoachSpec {
+  id: string;
+  number: string;
+  typeType?: string;
+  typeName?: string;
+}
+
+const passengerCoach: CoachSpec = { id: 'coach-1', number: 'C1' };
+const diningCoach: CoachSpec = {
+  id: 'coach-dining',
+  number: 'D1',
+  // As the data actually looks: display name in `type`, trailing space included.
+  typeType: 'Dining Coach ',
+  typeName: 'Dining Coach',
+};
+
+function seatRow(
+  id: string,
+  coach: CoachSpec,
+  seatNumber: string,
+  bedPosition: string | null = null,
+) {
+  return {
+    id,
+    coachId: coach.id,
+    seatNumber,
+    bedPosition,
+    coach: {
+      number: coach.number,
+      coachType: {
+        name: coach.typeName ?? 'Standard',
+        type: coach.typeType ?? 'passenger',
+        seatClasses: [{ name: 'Economy', bedPosition: null }],
+      },
+    },
+  };
+}
+
+function blockRow(
+  overrides: Partial<{
+    id: string;
+    scheduleId: string | null;
+    reason: string;
+    blockedAt: Date;
+    unblockAt: Date | null;
+    seat: ReturnType<typeof seatRow>;
+  }> = {},
+) {
+  return {
+    id: 'block-1',
+    scheduleId: SCHEDULE_ID as string | null,
+    reason: 'VIP hold',
+    blockedBy: 'user-1',
+    blockedAt: new Date('2026-03-01T00:00:00.000Z'),
+    unblockAt: null as Date | null,
+    seat: seatRow('seat-1', passengerCoach, '1'),
+    ...overrides,
+  };
+}
+
+function makeService(opts: {
+  blocks: ReturnType<typeof blockRow>[];
+  assignedCoachIds?: string[];
+  departureAt?: Date | null;
+  bookingSeats?: any[];
+}) {
+  const prisma = {
+    bookingSeat: { findMany: jest.fn().mockResolvedValue(opts.bookingSeats ?? []) },
+    seatHold: { findMany: jest.fn().mockResolvedValue([]) },
+    trainSchedule: {
+      findUnique: jest.fn().mockResolvedValue(
+        opts.departureAt === null ? null : { departureAt: opts.departureAt ?? DEPARTURE },
+      ),
+    },
+    coachAssignment: {
+      findMany: jest
+        .fn()
+        .mockResolvedValue(
+          (opts.assignedCoachIds ?? [passengerCoach.id, diningCoach.id]).map((coachId) => ({
+            coachId,
+          })),
+        ),
+    },
+    seatBlock: { findMany: jest.fn().mockResolvedValue(opts.blocks) },
+  };
+
+  return {
+    service: new ReportsService(prisma as any, {} as any, {} as any),
+    prisma,
+  };
+}
+
+describe('getSeatStatusReport — blocked seats', () => {
+  it('counts a schedule-scoped block on a passenger coach', async () => {
+    const { service } = makeService({ blocks: [blockRow()] });
+
+    const report = await service.getSeatStatusReport(SCHEDULE_ID);
+
+    expect(report.summary.blockedCount).toBe(1);
+    expect(report.blockedSeats).toHaveLength(1);
+    expect(report.blockedSeats[0]).toMatchObject({ coachNumber: 'C1', seatNumber: '1' });
+  });
+
+  it('leaves out a dining coach whose type carries a display name', async () => {
+    const { service } = makeService({
+      blocks: [blockRow({ seat: seatRow('seat-d', diningCoach, '1') })],
+    });
+
+    const report = await service.getSeatStatusReport(SCHEDULE_ID);
+
+    expect(report.summary.blockedCount).toBe(0);
+    expect(report.blockedSeats).toEqual([]);
+  });
+
+  it('leaves out placeholder seats', async () => {
+    const { service } = makeService({
+      blocks: [blockRow({ seat: seatRow('seat-p', passengerCoach, '-1') })],
+    });
+
+    expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
+  });
+
+  it('counts a global block on a coach assigned to this train', async () => {
+    const { service } = makeService({
+      blocks: [blockRow({ scheduleId: null })],
+      assignedCoachIds: [passengerCoach.id],
+    });
+
+    expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(1);
+  });
+
+  it('ignores a global block whose coach never joined this train', async () => {
+    const { service } = makeService({
+      blocks: [blockRow({ scheduleId: null })],
+      assignedCoachIds: ['some-other-coach'],
+    });
+
+    expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
+  });
+
+  it('ignores a global block that had already been lifted by departure', async () => {
+    const { service } = makeService({
+      blocks: [
+        blockRow({
+          scheduleId: null,
+          unblockAt: new Date('2026-03-05T00:00:00.000Z'),
+        }),
+      ],
+      assignedCoachIds: [passengerCoach.id],
+    });
+
+    expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
+  });
+
+  it('ignores a global block created after departure', async () => {
+    const { service } = makeService({
+      blocks: [blockRow({ scheduleId: null, blockedAt: new Date('2026-03-20T00:00:00.000Z') })],
+      assignedCoachIds: [passengerCoach.id],
+    });
+
+    expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
+  });
+
+  it('counts a seat blocked both globally and for this schedule once', async () => {
+    const seat = seatRow('seat-1', passengerCoach, '1');
+    const { service } = makeService({
+      blocks: [
+        blockRow({ id: 'block-schedule', seat, reason: 'Crew seat' }),
+        blockRow({ id: 'block-global', scheduleId: null, seat, reason: 'Broken armrest' }),
+      ],
+      assignedCoachIds: [passengerCoach.id],
+    });
+
+    const report = await service.getSeatStatusReport(SCHEDULE_ID);
+
+    expect(report.summary.blockedCount).toBe(1);
+    // The schedule-scoped block is the more specific statement, so it is the one shown.
+    expect(report.blockedSeats[0].reason).toBe('Crew seat');
+  });
+
+  it('reports nothing blocked when the schedule does not exist', async () => {
+    const { service } = makeService({
+      blocks: [blockRow({ scheduleId: null })],
+      departureAt: null,
+    });
+
+    expect((await service.getSeatStatusReport(SCHEDULE_ID)).summary.blockedCount).toBe(0);
+  });
+
+  it('asks the database only for non-maintenance, non-ticketing blocks', async () => {
+    const { service, prisma } = makeService({ blocks: [] });
+
+    await service.getSeatStatusReport(SCHEDULE_ID);
+
+    const where = prisma.seatBlock.findMany.mock.calls[0][0].where;
+    expect(where.NOT).toEqual([
+      { reason: { startsWith: 'MAINTENANCE:' } },
+      { reason: { startsWith: 'Booked in tickets' } },
+    ]);
+  });
+});
+
+describe('getSeatStatusReport — booked seats', () => {
+  const booking = {
+    bookingRef: 'BK-1',
+    status: 'CONFIRMED',
+    totalMinor: 20000,
+    currency: 'ETB',
+    createdAt: new Date('2026-03-01T00:00:00.000Z'),
+    paymentIntent: { status: 'SUCCEEDED' },
+  };
+
+  it('keeps dining-coach seats out of the paid and unpaid counts', async () => {
+    const { service } = makeService({
+      blocks: [],
+      bookingSeats: [
+        {
+          passengerName: 'Abebe',
+          passengerCategory: 'ADULT',
+          fareMinor: 20000,
+          booking,
+          seat: seatRow('seat-1', passengerCoach, '1'),
+        },
+        {
+          passengerName: 'Diner',
+          passengerCategory: 'ADULT',
+          fareMinor: 0,
+          booking,
+          seat: seatRow('seat-d', diningCoach, '1'),
+        },
+        {
+          passengerName: 'Kebede',
+          passengerCategory: 'ADULT',
+          fareMinor: 20000,
+          booking: { ...booking, status: 'PENDING_PAYMENT', paymentIntent: null },
+          seat: seatRow('seat-2', passengerCoach, '2'),
+        },
+      ],
+    });
+
+    const report = await service.getSeatStatusReport(SCHEDULE_ID);
+
+    expect(report.summary.paidCount).toBe(1);
+    expect(report.summary.unpaidCount).toBe(1);
+    expect(report.paidSeats.map((s) => s.passengerName)).toEqual(['Abebe']);
+  });
+});
diff --git a/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx b/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx
index 649796cc5..7eede0089 100644
--- a/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx
@@ -10,9 +10,7 @@ import {
   Banknote,
   ArrowRight,
   ScanLine,
-  Ban,
 } from "lucide-react";
-import { SEAT_BLOCK_REASON_CATEGORY_LABELS } from "@edr/types";
 import { dashboardApi } from "@/lib/api/dashboard";
 import { apiClient } from "@/lib/api-client";
 import { formatCurrency } from "@/lib/utils";
@@ -163,10 +161,6 @@ function DashboardPageContent() {
       return rate !== null ? sum + Math.round(totalMinor * rate) : sum;
     }, 0);
 
-  const blockedLoss = stats?.blockedSeatRevenueLoss;
-  // Never summed across currencies — each is shown on its own line, largest first.
-  const blockedLossRows = blockedLoss?.lossByCurrency ?? [];
-
   const normalRows = stats?.revenueByCurrency ?? [];
   const packageRows = stats?.packageRevenueByCurrency ?? [];
   const normalGrand = calcGrand(normalRows);
@@ -326,73 +320,6 @@ function DashboardPageContent() {
             </>
           )}
         </div>
-
-        {/* Blocked-seat revenue loss — rides the same backoffice-stats payload, so the
-            dashboard makes no extra request for it. */}
-        <div className="card flex flex-col gap-3 border-rose-200 bg-rose-50/60 dark:border-rose-900/50 dark:bg-rose-950/20">
-          <div className="flex items-center gap-2">
-            <div className="rounded-lg bg-rose-100 dark:bg-rose-900/40 p-1.5">
-              <Ban className="h-4 w-4 text-rose-600 dark:text-rose-400" />
-            </div>
-            <span className="text-xs font-semibold uppercase tracking-wider text-rose-700 dark:text-rose-400">
-              Blocked Seats / Revenue Not Collected
-            </span>
-            <span className="ml-auto text-[11px] text-muted-foreground">
-              {blockedLoss?.periodDays ? `Last ${blockedLoss.periodDays}d` : "All time"}
-            </span>
-          </div>
-          {statsLoading ? (
-            <p className="text-muted-foreground text-sm">Loading…</p>
-          ) : (
-            <>
-              {blockedLossRows.length === 0 ? (
-                <p className="text-3xl font-bold text-foreground tabular-nums">
-                  {formatCurrency(0, "ETB")}
-                </p>
-              ) : (
-                blockedLossRows.map((row, i) => (
-                  <p
-                    key={row.currency}
-                    className={
-                      i === 0
-                        ? "text-3xl font-bold text-rose-600 dark:text-rose-400 tabular-nums"
-                        : "text-lg font-semibold text-rose-600/80 dark:text-rose-400/80 tabular-nums"
-                    }
-                  >
-                    {formatCurrency(row.estimatedLossMinor, row.currency)}
-                  </p>
-                ))
-              )}
-              <p className="text-xs text-muted-foreground -mt-1">
-                Estimated potential revenue never earned
-              </p>
-              <div className="flex flex-col gap-2 border-t border-border pt-3">
-                <div className="flex items-center justify-between">
-                  <span className="text-xs text-muted-foreground">Seats blocked</span>
-                  <span className="text-sm font-semibold text-foreground tabular-nums">
-                    {(blockedLoss?.blockedSeatCount ?? 0).toLocaleString()} across{" "}
-                    {(blockedLoss?.schedulesAffected ?? 0).toLocaleString()} schedules
-                  </span>
-                </div>
-                <div className="flex items-center justify-between">
-                  <span className="text-xs text-muted-foreground">Top reason</span>
-                  <span className="text-sm font-semibold text-foreground">
-                    {blockedLoss?.topReasonCategory
-                      ? (SEAT_BLOCK_REASON_CATEGORY_LABELS[blockedLoss.topReasonCategory] ??
-                        blockedLoss.topReasonCategory)
-                      : "—"}
-                  </span>
-                </div>
-              </div>
-              <Link
-                href="/reports/blocked-seats"
-                className="flex items-center justify-center gap-1.5 rounded-md bg-rose-600 hover:bg-rose-700 dark:bg-rose-600 dark:hover:bg-rose-500 px-3 py-2 text-sm font-semibold text-white shadow-sm transition-colors mt-auto"
-              >
-                View full report <ArrowRight className="h-3.5 w-3.5" />
-              </Link>
-            </>
-          )}
-        </div>
       </div>
 
       {/* Revenue breakdown */}
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/dashboard.ts b/apps/edr-passenger-web/backoffice/src/lib/api/dashboard.ts
index 0a9737041..bff0eaf08 100644
--- a/apps/edr-passenger-web/backoffice/src/lib/api/dashboard.ts
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/dashboard.ts
@@ -1,5 +1,4 @@
 import { apiClient } from '@/lib/api-client';
-import type { BlockedSeatRevenueLossStat } from '@edr/types';
 import { DashboardStats, RevenueData } from '@/types';
 
 export const dashboardApi = {
@@ -13,7 +12,6 @@ export const dashboardApi = {
       totalPackageTickets: number;
       totalPassengers: number;
       blockedSeatsCount: number;
-      blockedSeatRevenueLoss: BlockedSeatRevenueLossStat;
       revenueByCurrency: { currency: string; totalMinor: number }[];
       packageRevenueByCurrency: { currency: string; totalMinor: number }[];
     }>('/dashboard/backoffice-stats');
diff --git a/apps/edr-passenger-web/portal/tailwind.config.js b/apps/edr-passenger-web/portal/tailwind.config.js
index d0cb89d19..651afb46f 100644
--- a/apps/edr-passenger-web/portal/tailwind.config.js
+++ b/apps/edr-passenger-web/portal/tailwind.config.js
@@ -1,4 +1,3 @@
-
 /** @type {import('tailwindcss').Config} */
 export default {
   darkMode: "class",
@@ -86,5 +85,5 @@ export default {
     },
   },
   plugins: [],
-};                                                                                                                                                                                                                                                                                                                                                          
+};
 
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/bill-resolver.service.ts b/apps/edr-payment-api/src/modules/cbe-bill/bill-resolver.service.ts
index f46571c6b..342fee04a 100644
--- a/apps/edr-payment-api/src/modules/cbe-bill/bill-resolver.service.ts
+++ b/apps/edr-payment-api/src/modules/cbe-bill/bill-resolver.service.ts
@@ -48,35 +48,23 @@ export function defaultPaymentReason(
     : "Freight invoice";
 }
 
-/**
- * CBE reads Response_Description back to the payer at the counter or in the USSD prompt, so it
- * has to name the thing they are actually holding — a passenger booking or a freight invoice —
- * rather than our internal "bill" abstraction (plan §6.6).
- */
-function subjectOf(referenceType: PaymentReferenceType): string {
-  return referenceType === PaymentReferenceType.BOOKING ? "booking" : "invoice";
-}
-
-export function reasonToDescription(
-  reason: string | null | undefined,
-  referenceType: PaymentReferenceType,
-): string {
-  const subject = subjectOf(referenceType);
+/** Short descriptions per CBE integration request — CBE's channel renders them as-is. */
+export function reasonToDescription(reason: string | null | undefined): string {
   switch (reason) {
     case "ALREADY_PAID":
-      return `This ${subject} has already been paid.`;
+      return "Already paid";
     case "CANCELLED":
-      return `This ${subject} has been cancelled.`;
+      return "Cancelled";
     case "REFUNDED":
-      return `This ${subject} has been refunded.`;
+      return "Refunded";
     case "EXPIRED":
-      return `This ${subject} has expired and can no longer be paid.`;
+      return "Expired";
     // A bill reference we issued whose order has since vanished from the domain app. Same
     // wording as an unknown Bill_Id — from the teller's side it is the same situation.
     case "NOT_FOUND":
-      return "Bill not found.";
+      return "Bill not found";
     default:
-      return `This ${subject} is no longer payable.`;
+      return "Not payable";
   }
 }
 
@@ -135,7 +123,7 @@ export class BillResolverService {
         }`,
       );
       // TRANSIENT so CBE may retry the same End_To_End_Txn_Id once we recover (plan R5).
-      throw new CbeBillError("Service temporarily unavailable.", "TRANSIENT");
+      throw new CbeBillError("Service unavailable", "TRANSIENT");
     }
   }
 }
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.amount.spec.ts b/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.amount.spec.ts
new file mode 100644
index 000000000..aabf4f416
--- /dev/null
+++ b/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.amount.spec.ts
@@ -0,0 +1,22 @@
+import { amountsMatchToTheCent } from "./cbe-bill.service";
+
+describe("amountsMatchToTheCent (CBE payment amount gate)", () => {
+  it("accepts the exact amount", () => {
+    expect(amountsMatchToTheCent(1234.34, 1234.34)).toBe(true);
+  });
+
+  it("rejects a cents-only difference (the 1234.89 vs 1234.34 bug)", () => {
+    expect(amountsMatchToTheCent(1234.89, 1234.34)).toBe(false);
+    expect(amountsMatchToTheCent(1234.35, 1234.34)).toBe(false);
+  });
+
+  it("rejects whole-unit differences", () => {
+    expect(amountsMatchToTheCent(1235.34, 1234.34)).toBe(false);
+  });
+
+  it("absorbs double-precision storage noise", () => {
+    expect(amountsMatchToTheCent(1234.34, 1234.3399999999999)).toBe(true);
+    // classic float artifact: 0.1 + 0.2 !== 0.3
+    expect(amountsMatchToTheCent(0.1 + 0.2, 0.3)).toBe(true);
+  });
+});
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.controller.ts b/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.controller.ts
index 46b8f9009..86f8f1475 100644
--- a/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.controller.ts
+++ b/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.controller.ts
@@ -22,7 +22,7 @@ import { CbePaymentResponseDto } from "./dto/cbe-payment-response.dto";
  * CBE Unified Bill Payment — the INBOUND surface CBE core banking calls (docs/cbe/). We are
  * the biller: CBE authenticates against /cbe/oauth/token with credentials we issued, then
  * presents the bearer token on /cbe/query and /cbe/payment. Business failures answer HTTP 200
- * with Response_Code "3"; only authentication answers 401 (plan D6/D7).
+ * with Response_Code "2"; only authentication answers 401 (plan D6/D7).
  */
 @ApiTags("CBE Unified Bill (inbound)")
 @Controller("cbe")
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.service.ts b/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.service.ts
index 478f60d0c..d7f9eb8d6 100644
--- a/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.service.ts
+++ b/apps/edr-payment-api/src/modules/cbe-bill/cbe-bill.service.ts
@@ -38,8 +38,15 @@ import {
 /** Postgres unique_violation — the DB-level idempotency backstop firing on a concurrent duplicate. */
 const PG_UNIQUE_VIOLATION = "23505";
 
-/** Mirrors the short-pay tolerance already applied in handlePaymentEvent. */
-const AMOUNT_TOLERANCE = 0.01;
+/**
+ * CBE must pay the bill to the exact cent — compare in integer cents so
+ * double-precision storage noise (1234.34 stored as 1234.33999…) can neither
+ * mask nor fabricate a difference. A relative tolerance is wrong here: 1% of a
+ * 1234.34 bill would wave through anything up to ±12.34.
+ */
+export function amountsMatchToTheCent(a: number, b: number): boolean {
+  return Math.round(a * 100) === Math.round(b * 100);
+}
 
 /**
  * Translate an intent's own terminal state into the same reason vocabulary the domain apps
@@ -59,7 +66,7 @@ function localReason(intent: PaymentIntent): BillNotPayableReason {
 
 /**
  * Orchestration for CBE's three inbound calls (docs/cbe/CBE_IMPLEMENTATION_PLAN.md Phase 3).
- * Business failures return HTTP 200 + Response_Code "3" envelopes (never throw past the
+ * Business failures return HTTP 200 + Response_Code "2" envelopes (never throw past the
  * controller); the exception filter only catches auth, validation, and the unexpected.
  */
 @Injectable()
@@ -130,7 +137,7 @@ export class CbeBillService {
       const billQuery = await this.billResolver.billQuery(intent);
       if (!billQuery.stillPayable) {
         throw new CbeBillError(
-          reasonToDescription(billQuery.reason, intent.referenceType),
+          reasonToDescription(billQuery.reason),
           "BUSINESS",
         );
       }
@@ -184,11 +191,15 @@ export class CbeBillService {
     );
     if (prior) {
       if (prior.tradeStatus === "SUCCESS") {
-        // Replay the stored body verbatim. Never re-settle.
-        return prior.responsePayload as unknown as CbePaymentResponseDto;
+        // Per CBE integration request: a settled End_To_End_Txn_Id never replays the stored
+        // success — every repeat answers "Already paid". Money moved exactly once (the first
+        // call); this only changes what a duplicate hears back. NOTE this diverges from the
+        // original §6.5 replay design: if CBE retries because our SUCCESS response was lost
+        // in transit, it now sees FAILED for a debit we kept — reconcile such cases manually.
+        return mapPaymentFailure(dto, "Already paid");
       }
       if (prior.tradeStatus === "PENDING") {
-        return mapPaymentFailure(dto, "Payment is being processed.");
+        return mapPaymentFailure(dto, "Payment in progress");
       }
       if (prior.failureClass === "BUSINESS") {
         // Final — retrying cannot change the answer. Same End_To_End_Txn_Id was already
@@ -196,7 +207,7 @@ export class CbeBillService {
         // echoing the original reason, which no longer describes this request.
         return mapPaymentFailure(
           dto,
-          `End_To_End_Txn_Id ${dto.End_To_End_Txn_Id} was already processed and failed: ${prior.responseDescription ?? "unknown reason"}.`,
+          `Already processed: ${prior.responseDescription ?? "failed"}`,
         );
       }
       // FAILED + TRANSIENT: allowed retry — fall through and re-run the settlement.
@@ -209,7 +220,7 @@ export class CbeBillService {
     if (settled) {
       return mapPaymentFailure(
         dto,
-        `Invalid transaction reference number ${dto.Cbe_Txn_Ref}.`,
+        "Duplicate transaction ref",
       );
     }
 
@@ -237,7 +248,7 @@ export class CbeBillService {
       } catch (err) {
         if ((err as { code?: string }).code === PG_UNIQUE_VIOLATION) {
           // Concurrent duplicate of the same attempt lost the insert race.
-          return mapPaymentFailure(dto, "Payment is being processed.");
+          return mapPaymentFailure(dto, "Payment in progress");
         }
         throw err;
       }
@@ -248,7 +259,7 @@ export class CbeBillService {
       intent = await this.resolveIntent(dto.Bill_Id);
 
       if (dto.Currency && dto.Currency !== intent.currency) {
-        throw new CbeBillError("Payment currency does not match.", "BUSINESS");
+        throw new CbeBillError("Currency mismatch", "BUSINESS");
       }
 
       // Re-run bill-query — fresh, never cached. Last legitimate point for a synchronous
@@ -256,18 +267,22 @@ export class CbeBillService {
       const billQuery = await this.billResolver.billQuery(intent);
       if (!billQuery.stillPayable) {
         throw new CbeBillError(
-          reasonToDescription(billQuery.reason, intent.referenceType),
+          reasonToDescription(billQuery.reason),
           "BUSINESS",
         );
       }
 
+      // Validate against the freshly-quoted amount — the same figure bill-query
+      // just showed the payer — not the intent's amount asserted at creation,
+      // which can go stale when the domain re-prices the invoice. Fallback to
+      // the intent amount only for domain builds that return no current amount.
+      const expectedAmount = billQuery.currentAmountMinor ?? intent.amountMinor;
       const amount = Number(dto.Amount);
       if (
         !Number.isFinite(amount) ||
-        Math.abs(amount - intent.amountMinor) >
-          intent.amountMinor * AMOUNT_TOLERANCE
+        !amountsMatchToTheCent(amount, expectedAmount)
       ) {
-        throw new CbeBillError("Payment amount does not match.", "BUSINESS");
+        throw new CbeBillError("Amount mismatch", "BUSINESS");
       }
 
       const paidAt = new Date(dto.Timestamp);
@@ -325,10 +340,10 @@ export class CbeBillService {
   private assertIntentPayable(intent: PaymentIntent): void {
     if (intent.status === ProviderPaymentStatus.REQUIRES_ACTION) return;
     if (intent.status === ProviderPaymentStatus.PROCESSING) {
-      throw new CbeBillError("Payment is being processed.", "BUSINESS");
+      throw new CbeBillError("Payment in progress", "BUSINESS");
     }
     throw new CbeBillError(
-      reasonToDescription(localReason(intent), intent.referenceType),
+      reasonToDescription(localReason(intent)),
       "BUSINESS",
     );
   }
@@ -336,11 +351,11 @@ export class CbeBillService {
   /** Check digit first (cheap reject), then the unique bill_reference lookup. */
   private async resolveIntent(billId: string): Promise<PaymentIntent> {
     if (!this.billReferenceService.isValid(billId)) {
-      throw new CbeBillError("Bill not found.", "BUSINESS");
+      throw new CbeBillError("Bill not found", "BUSINESS");
     }
     const intent = await this.intentsRepository.findByBillReference(billId);
     if (!intent || intent.provider !== ProviderMethod.CBE_BILL) {
-      throw new CbeBillError("Bill not found.", "BUSINESS");
+      throw new CbeBillError("Bill not found", "BUSINESS");
     }
     return intent;
   }
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/cbe-exception.filter.ts b/apps/edr-payment-api/src/modules/cbe-bill/cbe-exception.filter.ts
index dcbb5d82a..5024c8cf3 100644
--- a/apps/edr-payment-api/src/modules/cbe-bill/cbe-exception.filter.ts
+++ b/apps/edr-payment-api/src/modules/cbe-bill/cbe-exception.filter.ts
@@ -40,7 +40,7 @@ export class CbeExceptionFilter implements ExceptionFilter {
       response.status(HttpStatus.SERVICE_UNAVAILABLE).json({
         Status: "FAILED",
         Response_Code: "9",
-        Response_Description: "Service temporarily unavailable.",
+        Response_Description: "Service unavailable",
       });
       return;
     }
@@ -54,7 +54,7 @@ export class CbeExceptionFilter implements ExceptionFilter {
           : exception.message;
       response.status(HttpStatus.OK).json({
         Status: "FAILED",
-        Response_Code: "3",
+        Response_Code: "2",
         Response_Description: message || "Invalid request",
       });
       return;
@@ -65,8 +65,8 @@ export class CbeExceptionFilter implements ExceptionFilter {
     );
     response.status(HttpStatus.OK).json({
       Status: "FAILED",
-      Response_Code: "3",
-      Response_Description: "Internal server error.",
+      Response_Code: "2",
+      Response_Description: "Internal error",
     });
   }
 }
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-error.mapper.ts b/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-error.mapper.ts
index 7cda33117..e2ec58114 100644
--- a/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-error.mapper.ts
+++ b/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-error.mapper.ts
@@ -16,8 +16,8 @@ export class CbeBillError extends Error {
 }
 
 /**
- * Every failure maps to Response_Code "3" — the AAFDA spec (§2.10, §3.10) defines only
- * 0 (success), 1 (auth), 3 (business); only the description is specific (plan §6.6).
+ * Every failure maps to Response_Code "2" (per current CBE integration requirement; the
+ * original AAFDA plan used 3); only the description is specific (plan §6.6).
  */
 export function toCbeFailure(err: unknown): {
   description: string;
@@ -26,5 +26,5 @@ export function toCbeFailure(err: unknown): {
   if (err instanceof CbeBillError) {
     return { description: err.message, failureClass: err.failureClass };
   }
-  return { description: "Internal server error.", failureClass: "TRANSIENT" };
+  return { description: "Internal error", failureClass: "TRANSIENT" };
 }
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-payment.mapper.ts b/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-payment.mapper.ts
index d90d94c91..5b479a8cc 100644
--- a/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-payment.mapper.ts
+++ b/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-payment.mapper.ts
@@ -10,7 +10,7 @@ export function mapPaymentSuccess(
     End_To_End_Txn_Id: request.End_To_End_Txn_Id,
     Cbe_Txn_Ref: request.Cbe_Txn_Ref,
     Destination_Txn_Ref: destinationTxnRef,
-    Status: "SUCCESS",
+    Status: "Success",
     Response_Code: "0",
     Response_Description: "Success",
     Additional_Fields: [],
@@ -27,7 +27,7 @@ export function mapPaymentFailure(
     Cbe_Txn_Ref: request.Cbe_Txn_Ref,
     Destination_Txn_Ref: "",
     Status: "FAILED",
-    Response_Code: "3",
+    Response_Code: "2",
     Response_Description: description,
     Additional_Fields: [],
   };
diff --git a/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-query.mapper.ts b/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-query.mapper.ts
index 95caadc75..ac96c3ce1 100644
--- a/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-query.mapper.ts
+++ b/apps/edr-payment-api/src/modules/cbe-bill/mappers/cbe-query.mapper.ts
@@ -21,7 +21,7 @@ export function mapQuerySuccess(
     Credit_Acct_Number: "",
     Transaction_Type: "",
     Timestamp: new Date().toISOString(),
-    Status: "SUCCESS",
+    Status: "Success",
     Response_Code: "0",
     Response_Description: "Success",
     Additional_Fields: [],
@@ -48,7 +48,7 @@ export function mapQueryFailure(
     Transaction_Type: "",
     Timestamp: new Date().toISOString(),
     Status: "FAILED",
-    Response_Code: "3",
+    Response_Code: "2",
     Response_Description: description,
     Additional_Fields: [],
   };
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3659e963f..5d5faa2de 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,7 +3,7 @@
 # Copy apps/*/env.example to .env and set real values before `docker compose up`.
 #
 # Build:  DOCKER_BUILDKIT=1 docker compose build
-# Run:    docker compose up -d
+
 services:
   freight-api:
     build:
diff --git a/dump-edr_prod-202608092016.sql b/dump-edr_prod-202608092016.sql
new file mode 100644
index 000000000..19454d882
Binary files /dev/null and b/dump-edr_prod-202608092016.sql differ
diff --git a/dump-smart_office_prod-202608092053.sql b/dump-smart_office_prod-202608092053.sql
new file mode 100644
index 000000000..7409b63d0
Binary files /dev/null and b/dump-smart_office_prod-202608092053.sql differ
diff --git a/final_migration/edr_dev-freight-portable.sql b/final_migration/edr_dev-freight-portable.sql
new file mode 100644
index 000000000..f78184570
--- /dev/null
+++ b/final_migration/edr_dev-freight-portable.sql
@@ -0,0 +1,12736 @@
+--
+-- PostgreSQL database dump
+--
+
+
+-- Dumped from database version 16.14 (Ubuntu 16.14-0ubuntu0.24.04.1)
+-- Dumped by pg_dump version 17.10
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+ALTER TABLE IF EXISTS ONLY freight.yard_locations DROP CONSTRAINT IF EXISTS yard_locations_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.yard_facilities DROP CONSTRAINT IF EXISTS yard_facilities_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.yard_distances DROP CONSTRAINT IF EXISTS yard_distances_to_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.yard_distances DROP CONSTRAINT IF EXISTS yard_distances_from_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_zones DROP CONSTRAINT IF EXISTS warehouse_zones_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_yards DROP CONSTRAINT IF EXISTS warehouse_yards_warehouse_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_yard_cargo_types DROP CONSTRAINT IF EXISTS warehouse_yard_cargo_types_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_yard_cargo_types DROP CONSTRAINT IF EXISTS warehouse_yard_cargo_types_cargo_type_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_loadings DROP CONSTRAINT IF EXISTS warehouse_loadings_warehouse_inventory_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_inventory DROP CONSTRAINT IF EXISTS warehouse_inventory_zone_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_inventory DROP CONSTRAINT IF EXISTS warehouse_inventory_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_inventory DROP CONSTRAINT IF EXISTS warehouse_inventory_warehouse_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_inventory_movement DROP CONSTRAINT IF EXISTS warehouse_inventory_movement_inventory_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_status_logs DROP CONSTRAINT IF EXISTS wagon_status_logs_wagon_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_movements DROP CONSTRAINT IF EXISTS wagon_movements_wagon_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_movements DROP CONSTRAINT IF EXISTS wagon_movements_train_schedule_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_movements DROP CONSTRAINT IF EXISTS wagon_movements_to_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_movements DROP CONSTRAINT IF EXISTS wagon_movements_from_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_movements DROP CONSTRAINT IF EXISTS wagon_movements_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.train_set_wagons DROP CONSTRAINT IF EXISTS train_set_wagons_board_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.train_set_wagons DROP CONSTRAINT IF EXISTS train_set_wagons_alight_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.train_checkpoint_events DROP CONSTRAINT IF EXISTS train_checkpoint_events_train_schedule_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.support_document_versions DROP CONSTRAINT IF EXISTS support_document_versions_document_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.routes DROP CONSTRAINT IF EXISTS routes_origin_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.routes DROP CONSTRAINT IF EXISTS routes_destination_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.route_milestones DROP CONSTRAINT IF EXISTS route_milestones_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.route_milestones DROP CONSTRAINT IF EXISTS route_milestones_route_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.rate_change_requests DROP CONSTRAINT IF EXISTS rate_change_requests_rate_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.priority_rule_change_requests DROP CONSTRAINT IF EXISTS priority_rule_change_requests_priority_config_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.maintenance_intervals DROP CONSTRAINT IF EXISTS maintenance_intervals_vehicle_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.last_mile_vehicle_containers DROP CONSTRAINT IF EXISTS last_mile_vehicle_containers_assignment_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.last_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS last_mile_vehicle_assignments_vehicle_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.last_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS last_mile_vehicle_assignments_last_mile_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.gps_devices DROP CONSTRAINT IF EXISTS gps_devices_vehicle_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_transfer_requests DROP CONSTRAINT IF EXISTS fk_wtr_wagon_type;
+ALTER TABLE IF EXISTS ONLY freight.wagon_transfer_requests DROP CONSTRAINT IF EXISTS fk_wtr_to_yard;
+ALTER TABLE IF EXISTS ONLY freight.wagon_transfer_requests DROP CONSTRAINT IF EXISTS fk_wtr_from_yard;
+ALTER TABLE IF EXISTS ONLY freight.wagon_movements DROP CONSTRAINT IF EXISTS fk_wm_transfer_request;
+ALTER TABLE IF EXISTS ONLY freight.wagons DROP CONSTRAINT IF EXISTS fk_wagons_train_set_wagon;
+ALTER TABLE IF EXISTS ONLY freight.wagons DROP CONSTRAINT IF EXISTS fk_wagons_current_train_schedule;
+ALTER TABLE IF EXISTS ONLY freight.wagon_booking_allocations DROP CONSTRAINT IF EXISTS fk_wagon_booking_allocations_wagon;
+ALTER TABLE IF EXISTS ONLY freight.wagon_booking_allocations DROP CONSTRAINT IF EXISTS fk_wagon_booking_allocations_booking;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_container_items DROP CONSTRAINT IF EXISTS fk_waci_container_type;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_container_items DROP CONSTRAINT IF EXISTS fk_waci_container;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_container_items DROP CONSTRAINT IF EXISTS fk_waci_booking_container;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_container_items DROP CONSTRAINT IF EXISTS fk_waci_allocation;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_bulk_loads DROP CONSTRAINT IF EXISTS fk_wabl_cargo_type;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_bulk_loads DROP CONSTRAINT IF EXISTS fk_wabl_booking;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_bulk_loads DROP CONSTRAINT IF EXISTS fk_wabl_allocation;
+ALTER TABLE IF EXISTS ONLY freight.vehicles DROP CONSTRAINT IF EXISTS fk_vehicles_truck_type;
+ALTER TABLE IF EXISTS ONLY freight.train_sets DROP CONSTRAINT IF EXISTS fk_train_sets_locomotive;
+ALTER TABLE IF EXISTS ONLY freight.train_set_wagons DROP CONSTRAINT IF EXISTS fk_train_set_wagons_wagon_type;
+ALTER TABLE IF EXISTS ONLY freight.train_set_wagons DROP CONSTRAINT IF EXISTS fk_train_set_wagons_train_set;
+ALTER TABLE IF EXISTS ONLY freight.train_set_wagons DROP CONSTRAINT IF EXISTS fk_train_set_wagons_physical_wagon;
+ALTER TABLE IF EXISTS ONLY freight.train_schedules DROP CONSTRAINT IF EXISTS fk_train_schedules_train_set;
+ALTER TABLE IF EXISTS ONLY freight.train_schedules DROP CONSTRAINT IF EXISTS fk_train_schedules_route;
+ALTER TABLE IF EXISTS ONLY freight.train_schedules DROP CONSTRAINT IF EXISTS fk_train_schedules_origin;
+ALTER TABLE IF EXISTS ONLY freight.train_schedules DROP CONSTRAINT IF EXISTS fk_train_schedules_destination;
+ALTER TABLE IF EXISTS ONLY freight.train_schedule_bookings DROP CONSTRAINT IF EXISTS fk_train_schedule_bookings_schedule;
+ALTER TABLE IF EXISTS ONLY freight.train_schedule_bookings DROP CONSTRAINT IF EXISTS fk_train_schedule_bookings_booking;
+ALTER TABLE IF EXISTS ONLY freight.payment_refunds DROP CONSTRAINT IF EXISTS fk_payment_refunds_payment;
+ALTER TABLE IF EXISTS ONLY freight.maintenance_costs DROP CONSTRAINT IF EXISTS fk_maintenance_schedule;
+ALTER TABLE IF EXISTS ONLY freight.invoices DROP CONSTRAINT IF EXISTS fk_invoices_payment;
+ALTER TABLE IF EXISTS ONLY freight.invoices DROP CONSTRAINT IF EXISTS fk_invoices_company_profile;
+ALTER TABLE IF EXISTS ONLY freight.invoices DROP CONSTRAINT IF EXISTS fk_invoices_company;
+ALTER TABLE IF EXISTS ONLY freight.invoice_lines DROP CONSTRAINT IF EXISTS fk_invoice_lines_invoice;
+ALTER TABLE IF EXISTS ONLY freight.fuel_purchases DROP CONSTRAINT IF EXISTS fk_fuel_purchases_vehicle;
+ALTER TABLE IF EXISTS ONLY freight.fuel_consumption DROP CONSTRAINT IF EXISTS fk_fuel_consumption_vehicle;
+ALTER TABLE IF EXISTS ONLY freight.containers DROP CONSTRAINT IF EXISTS fk_containers_wagon_allocation;
+ALTER TABLE IF EXISTS ONLY freight.containers DROP CONSTRAINT IF EXISTS fk_containers_booking_container;
+ALTER TABLE IF EXISTS ONLY freight.containers DROP CONSTRAINT IF EXISTS fk_containers_booking;
+ALTER TABLE IF EXISTS ONLY freight.cargoes DROP CONSTRAINT IF EXISTS fk_cargoes_wagon_allocation;
+ALTER TABLE IF EXISTS ONLY freight.cargoes DROP CONSTRAINT IF EXISTS fk_cargoes_booking;
+ALTER TABLE IF EXISTS ONLY freight.first_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS first_mile_vehicle_assignments_vehicle_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.first_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS first_mile_vehicle_assignments_first_mile_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.facility_handling_events DROP CONSTRAINT IF EXISTS facility_handling_events_yard_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.facility_handling_events DROP CONSTRAINT IF EXISTS facility_handling_events_train_schedule_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.facility_handling_events DROP CONSTRAINT IF EXISTS facility_handling_events_inventory_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.facility_handling_events DROP CONSTRAINT IF EXISTS facility_handling_events_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.customer_truck_containers DROP CONSTRAINT IF EXISTS customer_truck_containers_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.customer_truck_containers DROP CONSTRAINT IF EXISTS customer_truck_containers_assignment_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.customer_truck_assignments DROP CONSTRAINT IF EXISTS customer_truck_assignments_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contracts DROP CONSTRAINT IF EXISTS contracts_renewal_of_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_templates DROP CONSTRAINT IF EXISTS contract_templates_cargo_type_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_signatures DROP CONSTRAINT IF EXISTS contract_signatures_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_routes DROP CONSTRAINT IF EXISTS contract_routes_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_review_notes DROP CONSTRAINT IF EXISTS contract_review_notes_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_rate_snapshots DROP CONSTRAINT IF EXISTS contract_rate_snapshots_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_document_revisions DROP CONSTRAINT IF EXISTS contract_document_revisions_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_document_review DROP CONSTRAINT IF EXISTS contract_document_review_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_document_review DROP CONSTRAINT IF EXISTS contract_document_review_clearance_cycle_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_clearance_cycles DROP CONSTRAINT IF EXISTS contract_clearance_cycles_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_cargo_scope DROP CONSTRAINT IF EXISTS contract_cargo_scope_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_approval_steps DROP CONSTRAINT IF EXISTS contract_approval_steps_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.compliance_records DROP CONSTRAINT IF EXISTS compliance_records_vehicle_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.clearance_milestones DROP CONSTRAINT IF EXISTS clearance_milestones_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.clearance_milestones DROP CONSTRAINT IF EXISTS clearance_milestones_clearance_cycle_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.clearance_milestones DROP CONSTRAINT IF EXISTS clearance_milestones_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.clearance_incidents DROP CONSTRAINT IF EXISTS clearance_incidents_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS bookings_contract_route_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS bookings_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_wagon_cancellations DROP CONSTRAINT IF EXISTS booking_wagon_cancellations_rebooked_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_wagon_cancellations DROP CONSTRAINT IF EXISTS booking_wagon_cancellations_fee_rate_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_wagon_cancellations DROP CONSTRAINT IF EXISTS booking_wagon_cancellations_fee_invoice_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_wagon_cancellations DROP CONSTRAINT IF EXISTS booking_wagon_cancellations_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_review_note DROP CONSTRAINT IF EXISTS booking_review_note_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_handovers DROP CONSTRAINT IF EXISTS booking_handovers_truck_assignment_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_handovers DROP CONSTRAINT IF EXISTS booking_handovers_edr_assignment_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_handovers DROP CONSTRAINT IF EXISTS booking_handovers_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_document_review DROP CONSTRAINT IF EXISTS booking_document_review_contract_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_contract_signatures DROP CONSTRAINT IF EXISTS booking_contract_signatures_signature_file_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_contract_signatures DROP CONSTRAINT IF EXISTS booking_contract_signatures_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_container_units DROP CONSTRAINT IF EXISTS booking_container_units_booking_container_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_batch_offers DROP CONSTRAINT IF EXISTS booking_batch_offers_train_schedule_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_batch_offers DROP CONSTRAINT IF EXISTS booking_batch_offers_booking_id_fkey;
+ALTER TABLE IF EXISTS ONLY freight.work_orders DROP CONSTRAINT IF EXISTS "FK_work_orders_vehicle_id";
+ALTER TABLE IF EXISTS ONLY freight.weight_limit_rules DROP CONSTRAINT IF EXISTS "FK_weight_limit_rules_container_type";
+ALTER TABLE IF EXISTS ONLY freight.warranties DROP CONSTRAINT IF EXISTS "FK_warranties_vehicle_id";
+ALTER TABLE IF EXISTS ONLY freight.wagons DROP CONSTRAINT IF EXISTS "FK_wagons_wagon_type_id";
+ALTER TABLE IF EXISTS ONLY freight.wagons DROP CONSTRAINT IF EXISTS "FK_wagons_train_id";
+ALTER TABLE IF EXISTS ONLY freight.wagons DROP CONSTRAINT IF EXISTS "FK_wagons_current_location_yard_id";
+ALTER TABLE IF EXISTS ONLY freight.wagons DROP CONSTRAINT IF EXISTS "FK_wagon_current_yard";
+ALTER TABLE IF EXISTS ONLY freight.trains DROP CONSTRAINT IF EXISTS "FK_trains_current_yard";
+ALTER TABLE IF EXISTS ONLY freight.train_sets DROP CONSTRAINT IF EXISTS "FK_train_sets_train";
+ALTER TABLE IF EXISTS ONLY freight.train_set_locomotives DROP CONSTRAINT IF EXISTS "FK_train_set_locomotives_train_set";
+ALTER TABLE IF EXISTS ONLY freight.train_set_locomotives DROP CONSTRAINT IF EXISTS "FK_train_set_locomotives_locomotive";
+ALTER TABLE IF EXISTS ONLY freight.train_locomotives DROP CONSTRAINT IF EXISTS "FK_train_locomotives_train";
+ALTER TABLE IF EXISTS ONLY freight.train_locomotives DROP CONSTRAINT IF EXISTS "FK_train_locomotives_locomotive";
+ALTER TABLE IF EXISTS ONLY freight.rates DROP CONSTRAINT IF EXISTS "FK_rates_origin_yard_id";
+ALTER TABLE IF EXISTS ONLY freight.rates DROP CONSTRAINT IF EXISTS "FK_rates_destination_yard_id";
+ALTER TABLE IF EXISTS ONLY freight.rates DROP CONSTRAINT IF EXISTS "FK_rates_cargo_type_id";
+ALTER TABLE IF EXISTS ONLY freight.locomotives DROP CONSTRAINT IF EXISTS "FK_locomotive_current_yard";
+ALTER TABLE IF EXISTS ONLY freight.file_upload_fields DROP CONSTRAINT IF EXISTS "FK_file_upload_fields_setting";
+ALTER TABLE IF EXISTS ONLY freight.dropdown_options DROP CONSTRAINT IF EXISTS "FK_dropdown_options_setting";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_requests DROP CONSTRAINT IF EXISTS "FK_d8e15175ed6471429295e2cd788";
+ALTER TABLE IF EXISTS ONLY freight.container_type_wagon_types DROP CONSTRAINT IF EXISTS "FK_ctwt_wagon_type";
+ALTER TABLE IF EXISTS ONLY freight.container_type_wagon_types DROP CONSTRAINT IF EXISTS "FK_ctwt_container_type";
+ALTER TABLE IF EXISTS ONLY freight.containers DROP CONSTRAINT IF EXISTS "FK_containers_wagon_id";
+ALTER TABLE IF EXISTS ONLY freight.containers DROP CONSTRAINT IF EXISTS "FK_containers_container_type_id";
+ALTER TABLE IF EXISTS ONLY freight.cargo_type_wagon_types DROP CONSTRAINT IF EXISTS "FK_cgwt_wagon_type";
+ALTER TABLE IF EXISTS ONLY freight.cargo_type_wagon_types DROP CONSTRAINT IF EXISTS "FK_cgwt_cargo_type";
+ALTER TABLE IF EXISTS ONLY freight.cargoes DROP CONSTRAINT IF EXISTS "FK_cargoes_container_id";
+ALTER TABLE IF EXISTS ONLY freight.cargoes DROP CONSTRAINT IF EXISTS "FK_cargoes_cargo_type_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_cabe80a0c7b9e0144854a4f353d";
+ALTER TABLE IF EXISTS ONLY freight.interchange_document_items DROP CONSTRAINT IF EXISTS "FK_c9fba2c4a1631542a37ad5089d7";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_requests DROP CONSTRAINT IF EXISTS "FK_c845afc4aeaf8f73e38a5b5483d";
+ALTER TABLE IF EXISTS ONLY freight.booking_document_review DROP CONSTRAINT IF EXISTS "FK_c669c986810af3b82cf033a8d79";
+ALTER TABLE IF EXISTS ONLY freight.last_mile DROP CONSTRAINT IF EXISTS "FK_c2d9331fda382ae3e92e6bf913a";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_train_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_shipping_line_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_service_type_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_customer_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_consolidation_partner_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_company_profile_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_company_id";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_bookings_cargo_type_id";
+ALTER TABLE IF EXISTS ONLY freight.booking_rate_snapshot DROP CONSTRAINT IF EXISTS "FK_booking_rate_snapshot_rate_id";
+ALTER TABLE IF EXISTS ONLY freight.booking_rate_snapshot DROP CONSTRAINT IF EXISTS "FK_booking_rate_snapshot_booking_id";
+ALTER TABLE IF EXISTS ONLY freight.booking_container DROP CONSTRAINT IF EXISTS "FK_booking_container_weight_limit_rule_id";
+ALTER TABLE IF EXISTS ONLY freight.booking_container DROP CONSTRAINT IF EXISTS "FK_booking_container_container_type_id";
+ALTER TABLE IF EXISTS ONLY freight.booking_cargo_modifier DROP CONSTRAINT IF EXISTS "FK_booking_cargo_modifier_rate_snapshot_id";
+ALTER TABLE IF EXISTS ONLY freight.booking_cargo_modifier DROP CONSTRAINT IF EXISTS "FK_booking_cargo_modifier_rate_id";
+ALTER TABLE IF EXISTS ONLY freight.booking_cargo_modifier DROP CONSTRAINT IF EXISTS "FK_booking_cargo_modifier_booking_id";
+ALTER TABLE IF EXISTS ONLY freight.ff_clients DROP CONSTRAINT IF EXISTS "FK_af4d6bac2844d39095b2056e978";
+ALTER TABLE IF EXISTS ONLY freight.first_mile DROP CONSTRAINT IF EXISTS "FK_a2ae03360a02c61fdc2e8361ea8";
+ALTER TABLE IF EXISTS ONLY freight.first_mile DROP CONSTRAINT IF EXISTS "FK_a19b54ac3d426df8cc0e313be06";
+ALTER TABLE IF EXISTS ONLY freight.cargo_types DROP CONSTRAINT IF EXISTS "FK_CARGO_TYPES_PARENT_GROUP";
+ALTER TABLE IF EXISTS ONLY freight.booking_requests DROP CONSTRAINT IF EXISTS "FK_9e49de0ed55d84d3f97627040cd";
+ALTER TABLE IF EXISTS ONLY freight.booking_container_allocations DROP CONSTRAINT IF EXISTS "FK_99c89fe4e4c3e3670fdc25ea9a9";
+ALTER TABLE IF EXISTS ONLY freight.booking_container DROP CONSTRAINT IF EXISTS "FK_91946ca51ff65658f487eae1162";
+ALTER TABLE IF EXISTS ONLY freight.first_mile_container_allocations DROP CONSTRAINT IF EXISTS "FK_8bba293eb2fd548433d28d97103";
+ALTER TABLE IF EXISTS ONLY freight.company_revisions DROP CONSTRAINT IF EXISTS "FK_8a17ca32f9e4624e1c55c51f7c7";
+ALTER TABLE IF EXISTS ONLY freight.interchange_document_items DROP CONSTRAINT IF EXISTS "FK_864508e9249279bd3e12dafdd21";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_container_allocations DROP CONSTRAINT IF EXISTS "FK_825ceccffec68ac49c85bd75de0";
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS "FK_6fa72e9c8fdfa587cffd9383470";
+ALTER TABLE IF EXISTS ONLY freight.import_djibouti_operations DROP CONSTRAINT IF EXISTS "FK_6c3e3046300b152a13505bf8ffd";
+ALTER TABLE IF EXISTS ONLY freight.booking_requests DROP CONSTRAINT IF EXISTS "FK_590f6298c3c3ae09d982f96fb9d";
+ALTER TABLE IF EXISTS ONLY freight.booking_container_allocations DROP CONSTRAINT IF EXISTS "FK_4fa907f6cc2cfe181385dcd57c5";
+ALTER TABLE IF EXISTS ONLY freight.warehouses DROP CONSTRAINT IF EXISTS "FK_374ce3a1439d02d5ff97e479921";
+ALTER TABLE IF EXISTS ONLY freight.company_change_request DROP CONSTRAINT IF EXISTS "FK_366962cebba507dd8b0146f7f47";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_requests DROP CONSTRAINT IF EXISTS "FK_32653c7b15225addbafdaa297c1";
+ALTER TABLE IF EXISTS ONLY freight.first_mile_container_allocations DROP CONSTRAINT IF EXISTS "FK_31dfdcea6bf62ec98f2e5428996";
+ALTER TABLE IF EXISTS ONLY freight.company_profiles DROP CONSTRAINT IF EXISTS "FK_30228dd283a0f14486346e1db96";
+ALTER TABLE IF EXISTS ONLY freight.external_profiles DROP CONSTRAINT IF EXISTS "FK_26d2a16e263ab4fe0a4c8e91954";
+ALTER TABLE IF EXISTS ONLY freight.last_mile DROP CONSTRAINT IF EXISTS "FK_173a865c0889b8c5564993c70ff";
+ALTER TABLE IF EXISTS ONLY freight.ff_clients DROP CONSTRAINT IF EXISTS "FK_1101fbe8e745d91b6bd0747b582";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_container_allocations DROP CONSTRAINT IF EXISTS "FK_0bc28c4087bb0c6e435677a6fcb";
+DROP INDEX IF EXISTS freight.ux_vehicles_vin;
+DROP INDEX IF EXISTS freight.ux_truck_types_code;
+DROP INDEX IF EXISTS freight.ux_train_schedules_reference;
+DROP INDEX IF EXISTS freight.ux_invoices_eims_irn;
+DROP INDEX IF EXISTS freight.uq_yard_distances_pair;
+DROP INDEX IF EXISTS freight.uq_support_documents_slug;
+DROP INDEX IF EXISTS freight.uq_support_doc_version;
+DROP INDEX IF EXISTS freight.uq_rcr_one_pending_per_rate;
+DROP INDEX IF EXISTS freight.uq_open_wagon_cancellation_per_booking;
+DROP INDEX IF EXISTS freight.uq_one_active_booking_per_one_time_contract;
+DROP INDEX IF EXISTS freight.uq_interchange_active_schedule_direction;
+DROP INDEX IF EXISTS freight.uq_contract_templates_code;
+DROP INDEX IF EXISTS freight.uq_contract_templates_cargo_customs;
+DROP INDEX IF EXISTS freight.uq_clearance_milestone_cycle;
+DROP INDEX IF EXISTS freight.uq_clearance_milestone_booking;
+DROP INDEX IF EXISTS freight.uq_booking_document_review_doc;
+DROP INDEX IF EXISTS freight.ix_truck_types_is_active;
+DROP INDEX IF EXISTS freight.ix_transit_agents_is_active;
+DROP INDEX IF EXISTS freight.idx_yard_distances_to_yard;
+DROP INDEX IF EXISTS freight.idx_yard_distances_from_yard;
+DROP INDEX IF EXISTS freight.idx_wtr_status_from_yard;
+DROP INDEX IF EXISTS freight.idx_wm_transfer_request;
+DROP INDEX IF EXISTS freight.idx_wm_moved_by;
+DROP INDEX IF EXISTS freight.idx_wir_status;
+DROP INDEX IF EXISTS freight.idx_wir_inventory;
+DROP INDEX IF EXISTS freight.idx_wir_booking;
+DROP INDEX IF EXISTS freight.idx_wfr_type;
+DROP INDEX IF EXISTS freight.idx_wfr_active;
+DROP INDEX IF EXISTS freight.idx_warehouses_type;
+DROP INDEX IF EXISTS freight.idx_warehouses_status;
+DROP INDEX IF EXISTS freight.idx_warehouses_station_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_zones_yard_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_zones_type;
+DROP INDEX IF EXISTS freight.idx_warehouse_zones_status;
+DROP INDEX IF EXISTS freight.idx_warehouse_yards_warehouse_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_yards_type;
+DROP INDEX IF EXISTS freight.idx_warehouse_yards_status;
+DROP INDEX IF EXISTS freight.idx_warehouse_loadings_wagon_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_loadings_train_schedule;
+DROP INDEX IF EXISTS freight.idx_warehouse_loadings_inventory_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_loadings_booking_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_zone_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_yard_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_warehouse_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_status;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_movement_inventory_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_inspection_status;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_grn_number;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_goods_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_container_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_cargo_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_inventory_booking_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_activity_log_warehouse_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_activity_log_inventory_id;
+DROP INDEX IF EXISTS freight.idx_warehouse_activity_log_activity_type;
+DROP INDEX IF EXISTS freight.idx_war_priority;
+DROP INDEX IF EXISTS freight.idx_war_active;
+DROP INDEX IF EXISTS freight.idx_wagons_train_set_wagon_id;
+DROP INDEX IF EXISTS freight.idx_wagons_current_train_schedule_id;
+DROP INDEX IF EXISTS freight.idx_wagon_status_logs_wagon;
+DROP INDEX IF EXISTS freight.idx_wagon_booking_allocations_booking;
+DROP INDEX IF EXISTS freight.idx_waci_allocation;
+DROP INDEX IF EXISTS freight.idx_wabl_booking;
+DROP INDEX IF EXISTS freight.idx_vehicles_vehicle_type;
+DROP INDEX IF EXISTS freight.idx_vehicles_status;
+DROP INDEX IF EXISTS freight.idx_vehicles_registration_number;
+DROP INDEX IF EXISTS freight.idx_vehicles_plate_number;
+DROP INDEX IF EXISTS freight.idx_vehicles_manufacturer;
+DROP INDEX IF EXISTS freight.idx_user_trade_access_user_id;
+DROP INDEX IF EXISTS freight.idx_train_sets_status;
+DROP INDEX IF EXISTS freight.idx_train_set_wagons_physical_wagon;
+DROP INDEX IF EXISTS freight.idx_train_schedules_window_phase;
+DROP INDEX IF EXISTS freight.idx_train_schedules_train_number;
+DROP INDEX IF EXISTS freight.idx_train_schedules_route_id;
+DROP INDEX IF EXISTS freight.idx_train_schedules_departure_status;
+DROP INDEX IF EXISTS freight.idx_train_schedules_booking_window_status;
+DROP INDEX IF EXISTS freight.idx_train_checkpoint_events_schedule;
+DROP INDEX IF EXISTS freight.idx_support_doc_versions_document;
+DROP INDEX IF EXISTS freight.idx_scheduling_events_train_schedule_id;
+DROP INDEX IF EXISTS freight.idx_routes_origin_yard_id;
+DROP INDEX IF EXISTS freight.idx_routes_destination_yard_id;
+DROP INDEX IF EXISTS freight.idx_route_milestones_yard_id;
+DROP INDEX IF EXISTS freight.idx_route_milestones_route_id;
+DROP INDEX IF EXISTS freight.idx_rcr_status;
+DROP INDEX IF EXISTS freight.idx_priority_configs_type_active;
+DROP INDEX IF EXISTS freight.idx_priority_configs_currency_type;
+DROP INDEX IF EXISTS freight.idx_prcr_status;
+DROP INDEX IF EXISTS freight.idx_payment_webhook_events_merchant_order_id;
+DROP INDEX IF EXISTS freight.idx_maintenance_schedules_vehicle_date;
+DROP INDEX IF EXISTS freight.idx_maintenance_costs_vehicle_date;
+DROP INDEX IF EXISTS freight.idx_locomotives_status;
+DROP INDEX IF EXISTS freight.idx_invoices_status;
+DROP INDEX IF EXISTS freight.idx_invoices_source;
+DROP INDEX IF EXISTS freight.idx_invoices_company_profile;
+DROP INDEX IF EXISTS freight.idx_invoices_company;
+DROP INDEX IF EXISTS freight.idx_invoice_lines_invoice;
+DROP INDEX IF EXISTS freight.idx_interchange_items_document;
+DROP INDEX IF EXISTS freight.idx_interchange_items_booking;
+DROP INDEX IF EXISTS freight.idx_interchange_documents_status;
+DROP INDEX IF EXISTS freight.idx_interchange_documents_schedule;
+DROP INDEX IF EXISTS freight.idx_interchange_documents_direction;
+DROP INDEX IF EXISTS freight.idx_import_djibouti_operations_schedule;
+DROP INDEX IF EXISTS freight.idx_import_customs_risk;
+DROP INDEX IF EXISTS freight.idx_import_customs_booking;
+DROP INDEX IF EXISTS freight.idx_fuel_purchases_vehicle;
+DROP INDEX IF EXISTS freight.idx_fuel_purchases_date;
+DROP INDEX IF EXISTS freight.idx_fuel_consumption_vehicle_month;
+DROP INDEX IF EXISTS freight.idx_files_resource_lookup;
+DROP INDEX IF EXISTS freight.idx_facilities_status;
+DROP INDEX IF EXISTS freight.idx_facilities_code;
+DROP INDEX IF EXISTS freight.idx_empty_returns_status;
+DROP INDEX IF EXISTS freight.idx_empty_returns_container;
+DROP INDEX IF EXISTS freight.idx_empty_returns_booking;
+DROP INDEX IF EXISTS freight.idx_drivers_status;
+DROP INDEX IF EXISTS freight.idx_drivers_phone_number;
+DROP INDEX IF EXISTS freight.idx_drivers_license_number;
+DROP INDEX IF EXISTS freight.idx_drivers_email;
+DROP INDEX IF EXISTS freight.idx_djibouti_incidents_type;
+DROP INDEX IF EXISTS freight.idx_djibouti_incidents_container;
+DROP INDEX IF EXISTS freight.idx_djibouti_incidents_booking;
+DROP INDEX IF EXISTS freight.idx_contracts_valid_until;
+DROP INDEX IF EXISTS freight.idx_contracts_status;
+DROP INDEX IF EXISTS freight.idx_contracts_kind;
+DROP INDEX IF EXISTS freight.idx_contracts_company;
+DROP INDEX IF EXISTS freight.idx_contract_signatures_contract;
+DROP INDEX IF EXISTS freight.idx_contract_routes_contract;
+DROP INDEX IF EXISTS freight.idx_contract_review_notes_contract;
+DROP INDEX IF EXISTS freight.idx_contract_rate_snapshots_contract;
+DROP INDEX IF EXISTS freight.idx_contract_document_revisions_contract;
+DROP INDEX IF EXISTS freight.idx_contract_doc_review_status;
+DROP INDEX IF EXISTS freight.idx_contract_doc_review_contract;
+DROP INDEX IF EXISTS freight.idx_contract_clearance_cycles_contract;
+DROP INDEX IF EXISTS freight.idx_contract_cargo_scope_contract;
+DROP INDEX IF EXISTS freight.idx_contract_approval_steps_contract;
+DROP INDEX IF EXISTS freight.idx_compliance_records_vehicle_id;
+DROP INDEX IF EXISTS freight.idx_compliance_records_type;
+DROP INDEX IF EXISTS freight.idx_compliance_records_expiry_date;
+DROP INDEX IF EXISTS freight.idx_company_revisions_company;
+DROP INDEX IF EXISTS freight.idx_company_change_request_status;
+DROP INDEX IF EXISTS freight.idx_company_change_request_company;
+DROP INDEX IF EXISTS freight.idx_clearance_milestones_region;
+DROP INDEX IF EXISTS freight.idx_clearance_milestones_contract;
+DROP INDEX IF EXISTS freight.idx_clearance_milestones_booking;
+DROP INDEX IF EXISTS freight.idx_clearance_incidents_booking;
+DROP INDEX IF EXISTS freight.idx_bwc_status;
+DROP INDEX IF EXISTS freight.idx_bwc_booking;
+DROP INDEX IF EXISTS freight.idx_bookings_train_schedule_id;
+DROP INDEX IF EXISTS freight.idx_bookings_scheduling_status;
+DROP INDEX IF EXISTS freight.idx_bookings_route_day;
+DROP INDEX IF EXISTS freight.idx_bookings_is_government;
+DROP INDEX IF EXISTS freight.idx_bookings_contract;
+DROP INDEX IF EXISTS freight.idx_bookings_company_profile_id;
+DROP INDEX IF EXISTS freight.idx_bookings_company_id;
+DROP INDEX IF EXISTS freight.idx_bookings_booking_type;
+DROP INDEX IF EXISTS freight.idx_booking_review_note_booking_id;
+DROP INDEX IF EXISTS freight.idx_booking_requests_status;
+DROP INDEX IF EXISTS freight.idx_booking_requests_contract_status;
+DROP INDEX IF EXISTS freight.idx_booking_requests_contract;
+DROP INDEX IF EXISTS freight.idx_booking_document_review_status;
+DROP INDEX IF EXISTS freight.idx_booking_document_review_booking;
+DROP INDEX IF EXISTS freight.idx_booking_contract_signatures_booking_id;
+DROP INDEX IF EXISTS freight.idx_booking_batch_offers_status;
+DROP INDEX IF EXISTS freight.idx_booking_batch_offers_schedule;
+DROP INDEX IF EXISTS freight.idx_booking_batch_offers_booking;
+DROP INDEX IF EXISTS freight.idx_asset_disposals_vehicle_date;
+DROP INDEX IF EXISTS freight.idx_asset_acquisitions_vehicle_date;
+DROP INDEX IF EXISTS freight."UQ_yards_label_active";
+DROP INDEX IF EXISTS freight."UQ_yards_code_active";
+DROP INDEX IF EXISTS freight."UQ_yards_code";
+DROP INDEX IF EXISTS freight."UQ_yard_facility_yard";
+DROP INDEX IF EXISTS freight."UQ_weight_limit_rules_pattern";
+DROP INDEX IF EXISTS freight."UQ_wagons_wagon_number_active";
+DROP INDEX IF EXISTS freight."UQ_trains_train_number";
+DROP INDEX IF EXISTS freight."UQ_trains_import_train_number";
+DROP INDEX IF EXISTS freight."UQ_trains_export_train_number";
+DROP INDEX IF EXISTS freight."UQ_train_set_locomotives_set_loco";
+DROP INDEX IF EXISTS freight."UQ_train_locomotives_train_loco";
+DROP INDEX IF EXISTS freight."UQ_shipping_lines_code";
+DROP INDEX IF EXISTS freight."UQ_rates_pattern";
+DROP INDEX IF EXISTS freight."UQ_priority_rules_code";
+DROP INDEX IF EXISTS freight."UQ_maintenance_intervals_vehicle_type_item";
+DROP INDEX IF EXISTS freight."UQ_locomotives_name_active";
+DROP INDEX IF EXISTS freight."UQ_last_mile_vehicle_container";
+DROP INDEX IF EXISTS freight."UQ_file_upload_settings_code";
+DROP INDEX IF EXISTS freight."UQ_file_upload_fields_setting_file_key";
+DROP INDEX IF EXISTS freight."UQ_dropdown_settings_code";
+DROP INDEX IF EXISTS freight."UQ_dropdown_options_setting_value";
+DROP INDEX IF EXISTS freight."UQ_customer_truck_containers_booking_number";
+DROP INDEX IF EXISTS freight."UQ_booking_handovers_booking_truck";
+DROP INDEX IF EXISTS freight."UQ_booking_handovers_booking_edr_truck";
+DROP INDEX IF EXISTS freight."UQ_DRIVERS_PHONE_ACTIVE";
+DROP INDEX IF EXISTS freight."UQ_DRIVERS_LICENSE_ACTIVE";
+DROP INDEX IF EXISTS freight."UQ_DRIVERS_FAYDA_SUB_ACTIVE";
+DROP INDEX IF EXISTS freight."UQ_DRIVERS_EMAIL_ACTIVE";
+DROP INDEX IF EXISTS freight."IDX_work_orders_vehicle_id_status";
+DROP INDEX IF EXISTS freight."IDX_weight_limit_rules_container_type_id";
+DROP INDEX IF EXISTS freight."IDX_warranties_vehicle_id_expiry_date";
+DROP INDEX IF EXISTS freight."IDX_wagons_train_id";
+DROP INDEX IF EXISTS freight."IDX_wagons_current_location_yard_id";
+DROP INDEX IF EXISTS freight."IDX_wagon_movements_wagon_occurred";
+DROP INDEX IF EXISTS freight."IDX_wagon_movements_schedule";
+DROP INDEX IF EXISTS freight."IDX_wagon_current_yard_id";
+DROP INDEX IF EXISTS freight."IDX_trains_current_yard_id";
+DROP INDEX IF EXISTS freight."IDX_train_sets_train_id";
+DROP INDEX IF EXISTS freight."IDX_swal_train_schedule_id";
+DROP INDEX IF EXISTS freight."IDX_swal_train_id";
+DROP INDEX IF EXISTS freight."IDX_service_types_code";
+DROP INDEX IF EXISTS freight."IDX_routes_status";
+DROP INDEX IF EXISTS freight."IDX_rates_trigger";
+DROP INDEX IF EXISTS freight."IDX_rates_origin_yard_id";
+DROP INDEX IF EXISTS freight."IDX_rates_destination_yard_id";
+DROP INDEX IF EXISTS freight."IDX_priority_rules_is_active";
+DROP INDEX IF EXISTS freight."IDX_parts_category";
+DROP INDEX IF EXISTS freight."IDX_maintenance_intervals_vehicle_type";
+DROP INDEX IF EXISTS freight."IDX_locomotive_current_yard_id";
+DROP INDEX IF EXISTS freight."IDX_last_mile_vehicle_id";
+DROP INDEX IF EXISTS freight."IDX_last_mile_vehicle_containers_assignment";
+DROP INDEX IF EXISTS freight."IDX_last_mile_status";
+DROP INDEX IF EXISTS freight."IDX_last_mile_requests_status";
+DROP INDEX IF EXISTS freight."IDX_last_mile_requests_booking_schedule";
+DROP INDEX IF EXISTS freight."IDX_last_mile_container_allocations_vehicle_id";
+DROP INDEX IF EXISTS freight."IDX_last_mile_container_allocations_last_mile_id";
+DROP INDEX IF EXISTS freight."IDX_last_mile_booking_id";
+DROP INDEX IF EXISTS freight."IDX_freight_files_resource_code";
+DROP INDEX IF EXISTS freight."IDX_freight_files_resource";
+DROP INDEX IF EXISTS freight."IDX_freight_customers_email";
+DROP INDEX IF EXISTS freight."IDX_first_mile_vehicle_id";
+DROP INDEX IF EXISTS freight."IDX_first_mile_status";
+DROP INDEX IF EXISTS freight."IDX_first_mile_container_allocations_vehicle_id";
+DROP INDEX IF EXISTS freight."IDX_first_mile_container_allocations_first_mile_id";
+DROP INDEX IF EXISTS freight."IDX_first_mile_booking_id";
+DROP INDEX IF EXISTS freight."IDX_files_version_history";
+DROP INDEX IF EXISTS freight."IDX_files_open_change_request";
+DROP INDEX IF EXISTS freight."IDX_facility_handling_events_yard";
+DROP INDEX IF EXISTS freight."IDX_facility_handling_events_grn";
+DROP INDEX IF EXISTS freight."IDX_facility_handling_events_booking";
+DROP INDEX IF EXISTS freight."IDX_e669a91069a3aa982b2c99c256";
+DROP INDEX IF EXISTS freight."IDX_dc808839c3d64c763cc7f6ff68";
+DROP INDEX IF EXISTS freight."IDX_customer_truck_departed";
+DROP INDEX IF EXISTS freight."IDX_customer_truck_containers_assignment";
+DROP INDEX IF EXISTS freight."IDX_customer_truck_assignments_booking";
+DROP INDEX IF EXISTS freight."IDX_containers_wagon_id";
+DROP INDEX IF EXISTS freight."IDX_container_types_size_code";
+DROP INDEX IF EXISTS freight."IDX_container_types_is_active";
+DROP INDEX IF EXISTS freight."IDX_companies_kind";
+DROP INDEX IF EXISTS freight."IDX_cargoes_container_id";
+DROP INDEX IF EXISTS freight."IDX_cargo_types_code";
+DROP INDEX IF EXISTS freight."IDX_booking_handovers_booking";
+DROP INDEX IF EXISTS freight."IDX_booking_container_units_grn";
+DROP INDEX IF EXISTS freight."IDX_booking_container_allocations_vehicle_id";
+DROP INDEX IF EXISTS freight."IDX_booking_container_allocations_booking_id";
+DROP INDEX IF EXISTS freight."IDX_booking_cargo_modifier_rate_id";
+DROP INDEX IF EXISTS freight."IDX_b658cd8f6876645a05c0366a56";
+DROP INDEX IF EXISTS freight."IDX_af4d6bac2844d39095b2056e97";
+DROP INDEX IF EXISTS freight."IDX_SUPPORT_MSG_CONV_CREATED";
+DROP INDEX IF EXISTS freight."IDX_SUPPORT_CONV_LASTMSG";
+DROP INDEX IF EXISTS freight."IDX_SUPPORT_CONV_COMPANY";
+DROP INDEX IF EXISTS freight."IDX_SERVICE_TYPES_IS_ACTIVE";
+DROP INDEX IF EXISTS freight."IDX_SERVICE_TYPES_DISPLAY_ORDER";
+DROP INDEX IF EXISTS freight."IDX_NOTIFICATIONS_RECIPIENT_UNREAD";
+DROP INDEX IF EXISTS freight."IDX_NOTIFICATIONS_RECIPIENT_CREATED";
+DROP INDEX IF EXISTS freight."IDX_LM_VEHICLE_ASSIGNMENTS_VEHICLE";
+DROP INDEX IF EXISTS freight."IDX_INCIDENTS_VEHICLE";
+DROP INDEX IF EXISTS freight."IDX_INCIDENTS_DRIVER";
+DROP INDEX IF EXISTS freight."IDX_GPS_POSITIONS_VEHICLE_TIME";
+DROP INDEX IF EXISTS freight."IDX_GPS_POSITIONS_DEVICE_TIME";
+DROP INDEX IF EXISTS freight."IDX_GPS_DEVICES_VEHICLE";
+DROP INDEX IF EXISTS freight."IDX_FM_VEHICLE_ASSIGNMENTS_VEHICLE";
+DROP INDEX IF EXISTS freight."IDX_FLEET_EVENTS_VEHICLE";
+DROP INDEX IF EXISTS freight."IDX_FLEET_EVENTS_DRIVER";
+DROP INDEX IF EXISTS freight."IDX_FILES_RESOURCE_LOOKUP";
+DROP INDEX IF EXISTS freight."IDX_FAYDA_SESSIONS_IAM_USER_ID";
+DROP INDEX IF EXISTS freight."IDX_FAYDA_SESSIONS_EXPIRES_AT";
+DROP INDEX IF EXISTS freight."IDX_CARGO_TYPES_PARENT_GROUP_ID";
+DROP INDEX IF EXISTS freight."IDX_CARGO_TYPES_IS_ACTIVE";
+DROP INDEX IF EXISTS freight."IDX_CARGO_TYPES_DISPLAY_ORDER";
+DROP INDEX IF EXISTS freight."IDX_30228dd283a0f14486346e1db9";
+DROP INDEX IF EXISTS freight."IDX_26d2a16e263ab4fe0a4c8e9195";
+DROP INDEX IF EXISTS freight."IDX_1e57cd6c6afae8f303847f159d";
+DROP INDEX IF EXISTS freight."IDX_1b3738f728d42fc9aca8d4ac19";
+DROP INDEX IF EXISTS freight."IDX_1101fbe8e745d91b6bd0747b58";
+ALTER TABLE IF EXISTS ONLY freight.yard_locations DROP CONSTRAINT IF EXISTS yard_locations_yard_id_key;
+ALTER TABLE IF EXISTS ONLY freight.yard_locations DROP CONSTRAINT IF EXISTS yard_locations_pkey;
+ALTER TABLE IF EXISTS ONLY freight.yard_facilities DROP CONSTRAINT IF EXISTS yard_facilities_pkey;
+ALTER TABLE IF EXISTS ONLY freight.yard_distances DROP CONSTRAINT IF EXISTS yard_distances_pkey;
+ALTER TABLE IF EXISTS ONLY freight.work_orders DROP CONSTRAINT IF EXISTS work_orders_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warranties DROP CONSTRAINT IF EXISTS warranties_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouses DROP CONSTRAINT IF EXISTS warehouses_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouses DROP CONSTRAINT IF EXISTS warehouses_code_key;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_zones DROP CONSTRAINT IF EXISTS warehouse_zones_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_yards DROP CONSTRAINT IF EXISTS warehouse_yards_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_yard_cargo_types DROP CONSTRAINT IF EXISTS warehouse_yard_cargo_types_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_loadings DROP CONSTRAINT IF EXISTS warehouse_loadings_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_inventory DROP CONSTRAINT IF EXISTS warehouse_inventory_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_inventory_movement DROP CONSTRAINT IF EXISTS warehouse_inventory_movement_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_activity_log DROP CONSTRAINT IF EXISTS warehouse_activity_log_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_accrual_acks DROP CONSTRAINT IF EXISTS warehouse_accrual_acks_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_accrual_acks DROP CONSTRAINT IF EXISTS warehouse_accrual_acks_inventory_id_key;
+ALTER TABLE IF EXISTS ONLY freight.wagons DROP CONSTRAINT IF EXISTS wagons_pkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_types DROP CONSTRAINT IF EXISTS wagon_types_pkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_types DROP CONSTRAINT IF EXISTS wagon_types_code_key;
+ALTER TABLE IF EXISTS ONLY freight.wagon_status_logs DROP CONSTRAINT IF EXISTS wagon_status_logs_pkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_movements DROP CONSTRAINT IF EXISTS wagon_movements_pkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_booking_allocations DROP CONSTRAINT IF EXISTS wagon_booking_allocations_pkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_container_items DROP CONSTRAINT IF EXISTS wagon_allocation_container_items_pkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_bulk_loads DROP CONSTRAINT IF EXISTS wagon_allocation_bulk_loads_wagon_booking_allocation_id_key;
+ALTER TABLE IF EXISTS ONLY freight.wagon_allocation_bulk_loads DROP CONSTRAINT IF EXISTS wagon_allocation_bulk_loads_pkey;
+ALTER TABLE IF EXISTS ONLY freight.vendors DROP CONSTRAINT IF EXISTS vendors_pkey;
+ALTER TABLE IF EXISTS ONLY freight.vehicles DROP CONSTRAINT IF EXISTS vehicles_registration_number_key;
+ALTER TABLE IF EXISTS ONLY freight.vehicles DROP CONSTRAINT IF EXISTS vehicles_plate_number_key;
+ALTER TABLE IF EXISTS ONLY freight.vehicles DROP CONSTRAINT IF EXISTS vehicles_pkey;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_zones DROP CONSTRAINT IF EXISTS uq_warehouse_zones_code;
+ALTER TABLE IF EXISTS ONLY freight.warehouse_yards DROP CONSTRAINT IF EXISTS uq_warehouse_yards_code;
+ALTER TABLE IF EXISTS ONLY freight.train_set_wagons DROP CONSTRAINT IF EXISTS uq_train_set_wagons_sequence;
+ALTER TABLE IF EXISTS ONLY freight.train_schedule_bookings DROP CONSTRAINT IF EXISTS uq_train_schedule_booking;
+ALTER TABLE IF EXISTS ONLY freight.saved_signatures DROP CONSTRAINT IF EXISTS uq_saved_signatures_user_id;
+ALTER TABLE IF EXISTS ONLY freight.route_milestones DROP CONSTRAINT IF EXISTS uq_route_milestones_route_sequence;
+ALTER TABLE IF EXISTS ONLY freight.payments DROP CONSTRAINT IF EXISTS uq_payments_transaction_id;
+ALTER TABLE IF EXISTS ONLY freight.payments DROP CONSTRAINT IF EXISTS uq_payments_merchant_order_id;
+ALTER TABLE IF EXISTS ONLY freight.payment_webhook_events DROP CONSTRAINT IF EXISTS uq_payment_webhook_events_provider_event;
+ALTER TABLE IF EXISTS ONLY freight.otp_verifications DROP CONSTRAINT IF EXISTS uq_otp_verifications_phone;
+ALTER TABLE IF EXISTS ONLY freight.invoices DROP CONSTRAINT IF EXISTS uq_invoices_invoice_number;
+ALTER TABLE IF EXISTS ONLY freight.fuel_consumption DROP CONSTRAINT IF EXISTS uq_fuel_consumption_vehicle_month;
+ALTER TABLE IF EXISTS ONLY freight.contract_routes DROP CONSTRAINT IF EXISTS uq_contract_route;
+ALTER TABLE IF EXISTS ONLY freight.contract_document_review DROP CONSTRAINT IF EXISTS uq_contract_document_review_doc;
+ALTER TABLE IF EXISTS ONLY freight.contract_cargo_scope DROP CONSTRAINT IF EXISTS uq_contract_container_size;
+ALTER TABLE IF EXISTS ONLY freight.contract_clearance_cycles DROP CONSTRAINT IF EXISTS uq_contract_clearance_cycle;
+ALTER TABLE IF EXISTS ONLY freight.consignments DROP CONSTRAINT IF EXISTS uq_consignments_tracking_number;
+ALTER TABLE IF EXISTS ONLY freight.booking_contract_signatures DROP CONSTRAINT IF EXISTS uq_booking_contract_signatures_role;
+ALTER TABLE IF EXISTS ONLY freight.booking_container_units DROP CONSTRAINT IF EXISTS uq_booking_container_unit_number;
+ALTER TABLE IF EXISTS ONLY freight.truck_types DROP CONSTRAINT IF EXISTS truck_types_pkey;
+ALTER TABLE IF EXISTS ONLY freight.transit_agents DROP CONSTRAINT IF EXISTS transit_agents_pkey;
+ALTER TABLE IF EXISTS ONLY freight.trains DROP CONSTRAINT IF EXISTS trains_pkey;
+ALTER TABLE IF EXISTS ONLY freight.trains DROP CONSTRAINT IF EXISTS trains_code_key;
+ALTER TABLE IF EXISTS ONLY freight.train_sets DROP CONSTRAINT IF EXISTS train_sets_pkey;
+ALTER TABLE IF EXISTS ONLY freight.train_set_wagons DROP CONSTRAINT IF EXISTS train_set_wagons_pkey;
+ALTER TABLE IF EXISTS ONLY freight.train_scheduling_global_rules DROP CONSTRAINT IF EXISTS train_scheduling_global_rules_pkey;
+ALTER TABLE IF EXISTS ONLY freight.train_schedules DROP CONSTRAINT IF EXISTS train_schedules_train_set_id_key;
+ALTER TABLE IF EXISTS ONLY freight.train_schedules DROP CONSTRAINT IF EXISTS train_schedules_pkey;
+ALTER TABLE IF EXISTS ONLY freight.train_schedule_bookings DROP CONSTRAINT IF EXISTS train_schedule_bookings_pkey;
+ALTER TABLE IF EXISTS ONLY freight.train_schedule_bookings DROP CONSTRAINT IF EXISTS train_schedule_bookings_booking_id_key;
+ALTER TABLE IF EXISTS ONLY freight.train_checkpoint_events DROP CONSTRAINT IF EXISTS train_checkpoint_events_pkey;
+ALTER TABLE IF EXISTS ONLY freight.support_messages DROP CONSTRAINT IF EXISTS support_messages_pkey;
+ALTER TABLE IF EXISTS ONLY freight.support_documents DROP CONSTRAINT IF EXISTS support_documents_pkey;
+ALTER TABLE IF EXISTS ONLY freight.support_document_versions DROP CONSTRAINT IF EXISTS support_document_versions_pkey;
+ALTER TABLE IF EXISTS ONLY freight.support_conversations DROP CONSTRAINT IF EXISTS support_conversations_pkey;
+ALTER TABLE IF EXISTS ONLY freight.scheduling_events DROP CONSTRAINT IF EXISTS scheduling_events_pkey;
+ALTER TABLE IF EXISTS ONLY freight.saved_signatures DROP CONSTRAINT IF EXISTS saved_signatures_pkey;
+ALTER TABLE IF EXISTS ONLY freight.routes DROP CONSTRAINT IF EXISTS routes_pkey;
+ALTER TABLE IF EXISTS ONLY freight.route_milestones DROP CONSTRAINT IF EXISTS route_milestones_pkey;
+ALTER TABLE IF EXISTS ONLY freight.rate_change_requests DROP CONSTRAINT IF EXISTS rate_change_requests_pkey;
+ALTER TABLE IF EXISTS ONLY freight.priority_rule_change_requests DROP CONSTRAINT IF EXISTS priority_rule_change_requests_pkey;
+ALTER TABLE IF EXISTS ONLY freight.priority_configs DROP CONSTRAINT IF EXISTS priority_configs_pkey;
+ALTER TABLE IF EXISTS ONLY freight.wagon_transfer_requests DROP CONSTRAINT IF EXISTS pk_wagon_transfer_requests;
+ALTER TABLE IF EXISTS ONLY freight.tracking_events DROP CONSTRAINT IF EXISTS pk_tracking_events;
+ALTER TABLE IF EXISTS ONLY freight.payments DROP CONSTRAINT IF EXISTS pk_payments;
+ALTER TABLE IF EXISTS ONLY freight.payment_webhook_events DROP CONSTRAINT IF EXISTS pk_payment_webhook_events;
+ALTER TABLE IF EXISTS ONLY freight.payment_refunds DROP CONSTRAINT IF EXISTS pk_payment_refunds;
+ALTER TABLE IF EXISTS ONLY freight.otp_verifications DROP CONSTRAINT IF EXISTS pk_otp_verifications;
+ALTER TABLE IF EXISTS ONLY freight.invoices DROP CONSTRAINT IF EXISTS pk_invoices;
+ALTER TABLE IF EXISTS ONLY freight.invoice_lines DROP CONSTRAINT IF EXISTS pk_invoice_lines;
+ALTER TABLE IF EXISTS ONLY freight.fuel_purchases DROP CONSTRAINT IF EXISTS pk_fuel_purchases;
+ALTER TABLE IF EXISTS ONLY freight.fuel_consumption DROP CONSTRAINT IF EXISTS pk_fuel_consumption;
+ALTER TABLE IF EXISTS ONLY freight.consignments DROP CONSTRAINT IF EXISTS pk_consignments;
+ALTER TABLE IF EXISTS ONLY freight.parts DROP CONSTRAINT IF EXISTS parts_pkey;
+ALTER TABLE IF EXISTS ONLY freight.otp_verifications DROP CONSTRAINT IF EXISTS otp_verifications_email_key;
+ALTER TABLE IF EXISTS ONLY freight.notifications DROP CONSTRAINT IF EXISTS notifications_pkey;
+ALTER TABLE IF EXISTS ONLY freight.migrations DROP CONSTRAINT IF EXISTS migrations_pkey;
+ALTER TABLE IF EXISTS ONLY freight.maintenance_schedules DROP CONSTRAINT IF EXISTS maintenance_schedules_pkey;
+ALTER TABLE IF EXISTS ONLY freight.maintenance_intervals DROP CONSTRAINT IF EXISTS maintenance_intervals_pkey;
+ALTER TABLE IF EXISTS ONLY freight.maintenance_costs DROP CONSTRAINT IF EXISTS maintenance_costs_pkey;
+ALTER TABLE IF EXISTS ONLY freight.locomotives DROP CONSTRAINT IF EXISTS locomotives_pkey;
+ALTER TABLE IF EXISTS ONLY freight.locomotives DROP CONSTRAINT IF EXISTS locomotives_code_key;
+ALTER TABLE IF EXISTS ONLY freight.last_mile_vehicle_containers DROP CONSTRAINT IF EXISTS last_mile_vehicle_containers_pkey;
+ALTER TABLE IF EXISTS ONLY freight.last_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS last_mile_vehicle_assignments_pkey;
+ALTER TABLE IF EXISTS ONLY freight.incidents DROP CONSTRAINT IF EXISTS incidents_pkey;
+ALTER TABLE IF EXISTS ONLY freight.gps_positions DROP CONSTRAINT IF EXISTS gps_positions_pkey;
+ALTER TABLE IF EXISTS ONLY freight.gps_devices DROP CONSTRAINT IF EXISTS gps_devices_pkey;
+ALTER TABLE IF EXISTS ONLY freight.gps_devices DROP CONSTRAINT IF EXISTS gps_devices_imei_key;
+ALTER TABLE IF EXISTS ONLY freight.fleet_events DROP CONSTRAINT IF EXISTS fleet_events_pkey;
+ALTER TABLE IF EXISTS ONLY freight.first_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS first_mile_vehicle_assignments_pkey;
+ALTER TABLE IF EXISTS ONLY freight.files DROP CONSTRAINT IF EXISTS files_pkey;
+ALTER TABLE IF EXISTS ONLY freight.file_upload_settings DROP CONSTRAINT IF EXISTS file_upload_settings_pkey;
+ALTER TABLE IF EXISTS ONLY freight.file_upload_fields DROP CONSTRAINT IF EXISTS file_upload_fields_pkey;
+ALTER TABLE IF EXISTS ONLY freight.fayda_verification_sessions DROP CONSTRAINT IF EXISTS fayda_verification_sessions_state_key;
+ALTER TABLE IF EXISTS ONLY freight.fayda_verification_sessions DROP CONSTRAINT IF EXISTS fayda_verification_sessions_pkey;
+ALTER TABLE IF EXISTS ONLY freight.facility_handling_events DROP CONSTRAINT IF EXISTS facility_handling_events_pkey;
+ALTER TABLE IF EXISTS ONLY freight.eims_system_state DROP CONSTRAINT IF EXISTS eims_system_state_system_number_key;
+ALTER TABLE IF EXISTS ONLY freight.eims_system_state DROP CONSTRAINT IF EXISTS eims_system_state_pkey;
+ALTER TABLE IF EXISTS ONLY freight.drivers DROP CONSTRAINT IF EXISTS drivers_pkey;
+ALTER TABLE IF EXISTS ONLY freight.customers DROP CONSTRAINT IF EXISTS customers_tin_number_key;
+ALTER TABLE IF EXISTS ONLY freight.customers DROP CONSTRAINT IF EXISTS customers_pkey;
+ALTER TABLE IF EXISTS ONLY freight.customers DROP CONSTRAINT IF EXISTS customers_fan_number_key;
+ALTER TABLE IF EXISTS ONLY freight.customers DROP CONSTRAINT IF EXISTS customers_email_key;
+ALTER TABLE IF EXISTS ONLY freight.customer_truck_containers DROP CONSTRAINT IF EXISTS customer_truck_containers_pkey;
+ALTER TABLE IF EXISTS ONLY freight.customer_truck_assignments DROP CONSTRAINT IF EXISTS customer_truck_assignments_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contracts DROP CONSTRAINT IF EXISTS contracts_reference_key;
+ALTER TABLE IF EXISTS ONLY freight.contracts DROP CONSTRAINT IF EXISTS contracts_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_templates DROP CONSTRAINT IF EXISTS contract_templates_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_signatures DROP CONSTRAINT IF EXISTS contract_signatures_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_routes DROP CONSTRAINT IF EXISTS contract_routes_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_review_notes DROP CONSTRAINT IF EXISTS contract_review_notes_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_rate_snapshots DROP CONSTRAINT IF EXISTS contract_rate_snapshots_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_document_revisions DROP CONSTRAINT IF EXISTS contract_document_revisions_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_document_review DROP CONSTRAINT IF EXISTS contract_document_review_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_clearance_cycles DROP CONSTRAINT IF EXISTS contract_clearance_cycles_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_cargo_scope DROP CONSTRAINT IF EXISTS contract_cargo_scope_pkey;
+ALTER TABLE IF EXISTS ONLY freight.contract_approval_steps DROP CONSTRAINT IF EXISTS contract_approval_steps_pkey;
+ALTER TABLE IF EXISTS ONLY freight.containers DROP CONSTRAINT IF EXISTS containers_pkey;
+ALTER TABLE IF EXISTS ONLY freight.containers DROP CONSTRAINT IF EXISTS containers_container_number_key;
+ALTER TABLE IF EXISTS ONLY freight.compliance_records DROP CONSTRAINT IF EXISTS compliance_records_pkey;
+ALTER TABLE IF EXISTS ONLY freight.clearance_milestones DROP CONSTRAINT IF EXISTS clearance_milestones_pkey;
+ALTER TABLE IF EXISTS ONLY freight.clearance_incidents DROP CONSTRAINT IF EXISTS clearance_incidents_pkey;
+ALTER TABLE IF EXISTS ONLY freight.cargoes DROP CONSTRAINT IF EXISTS cargoes_pkey;
+ALTER TABLE IF EXISTS ONLY freight.cargoes DROP CONSTRAINT IF EXISTS cargoes_cargo_reference_key;
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS bookings_reference_key;
+ALTER TABLE IF EXISTS ONLY freight.bookings DROP CONSTRAINT IF EXISTS bookings_pkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_wagon_cancellations DROP CONSTRAINT IF EXISTS booking_wagon_cancellations_pkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_review_note DROP CONSTRAINT IF EXISTS booking_review_note_pkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_handovers DROP CONSTRAINT IF EXISTS booking_handovers_pkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_contract_signatures DROP CONSTRAINT IF EXISTS booking_contract_signatures_pkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_container_units DROP CONSTRAINT IF EXISTS booking_container_units_pkey;
+ALTER TABLE IF EXISTS ONLY freight.booking_batch_offers DROP CONSTRAINT IF EXISTS booking_batch_offers_pkey;
+ALTER TABLE IF EXISTS ONLY freight.asset_disposals DROP CONSTRAINT IF EXISTS asset_disposals_pkey;
+ALTER TABLE IF EXISTS ONLY freight.asset_acquisitions DROP CONSTRAINT IF EXISTS asset_acquisitions_pkey;
+ALTER TABLE IF EXISTS ONLY freight.user_trade_access DROP CONSTRAINT IF EXISTS "UQ_e54889f850f4db112a77b9e8431";
+ALTER TABLE IF EXISTS ONLY freight.facilities DROP CONSTRAINT IF EXISTS "UQ_bf808b325b190fb9049254ba55e";
+ALTER TABLE IF EXISTS ONLY freight.interchange_documents DROP CONSTRAINT IF EXISTS "UQ_b44369ad5b13e0d897487fc4284";
+ALTER TABLE IF EXISTS ONLY freight.approval_rules DROP CONSTRAINT IF EXISTS "UQ_approval_rules_chain_step";
+ALTER TABLE IF EXISTS ONLY freight.import_customs_finalizations DROP CONSTRAINT IF EXISTS "UQ_ad87af234cc0068a05fa7bd2335";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS "UQ_LAST_MILE_VEHICLE";
+ALTER TABLE IF EXISTS ONLY freight.first_mile_vehicle_assignments DROP CONSTRAINT IF EXISTS "UQ_FIRST_MILE_VEHICLE";
+ALTER TABLE IF EXISTS ONLY freight.import_djibouti_operations DROP CONSTRAINT IF EXISTS "UQ_6c3e3046300b152a13505bf8ffd";
+ALTER TABLE IF EXISTS ONLY freight.company_profiles DROP CONSTRAINT IF EXISTS "UQ_539ff8f8225951adb2ef76b0313";
+ALTER TABLE IF EXISTS ONLY freight.ff_clients DROP CONSTRAINT IF EXISTS "UQ_4107fef2abf7128f890ef276244";
+ALTER TABLE IF EXISTS ONLY freight.companies DROP CONSTRAINT IF EXISTS "UQ_1b3738f728d42fc9aca8d4ac19b";
+ALTER TABLE IF EXISTS ONLY freight.train_set_locomotives DROP CONSTRAINT IF EXISTS "PK_train_set_locomotives";
+ALTER TABLE IF EXISTS ONLY freight.train_locomotives DROP CONSTRAINT IF EXISTS "PK_train_locomotives";
+ALTER TABLE IF EXISTS ONLY freight.schedule_wagon_adjustment_logs DROP CONSTRAINT IF EXISTS "PK_schedule_wagon_adjustment_logs";
+ALTER TABLE IF EXISTS ONLY freight.booking_container_allocations DROP CONSTRAINT IF EXISTS "PK_fb0dee3634a65d2ebd734ff46e3";
+ALTER TABLE IF EXISTS ONLY freight.empty_container_returns DROP CONSTRAINT IF EXISTS "PK_f82bda09e0ff411811193579948";
+ALTER TABLE IF EXISTS ONLY freight.import_customs_finalizations DROP CONSTRAINT IF EXISTS "PK_f67c60e65b732153fc050dd166c";
+ALTER TABLE IF EXISTS ONLY freight.external_profiles DROP CONSTRAINT IF EXISTS "PK_f01bade59a434fa68039620ccb9";
+ALTER TABLE IF EXISTS ONLY freight.ff_clients DROP CONSTRAINT IF EXISTS "PK_eb91bf3ee74a361acee369dbda2";
+ALTER TABLE IF EXISTS ONLY freight.dropdown_settings DROP CONSTRAINT IF EXISTS "PK_dropdown_settings";
+ALTER TABLE IF EXISTS ONLY freight.dropdown_options DROP CONSTRAINT IF EXISTS "PK_dropdown_options";
+ALTER TABLE IF EXISTS ONLY freight.cargo_types DROP CONSTRAINT IF EXISTS "PK_db1aa5f07b0c5ea996eaea03394";
+ALTER TABLE IF EXISTS ONLY freight.booking_cargo_modifier DROP CONSTRAINT IF EXISTS "PK_d949ef8f1b862135ad7e4afdbf1";
+ALTER TABLE IF EXISTS ONLY freight.weight_limit_rules DROP CONSTRAINT IF EXISTS "PK_d82c70fa7e878ca301e2aaff709";
+ALTER TABLE IF EXISTS ONLY freight.companies DROP CONSTRAINT IF EXISTS "PK_d4bc3e82a314fa9e29f652c2c22";
+ALTER TABLE IF EXISTS ONLY freight.warehouse_fee_rules DROP CONSTRAINT IF EXISTS "PK_d24f444e0cb6841c1b19342e134";
+ALTER TABLE IF EXISTS ONLY freight.container_type_wagon_types DROP CONSTRAINT IF EXISTS "PK_container_type_wagon_types";
+ALTER TABLE IF EXISTS ONLY freight.djibouti_import_incidents DROP CONSTRAINT IF EXISTS "PK_cf3871f27f8bd0db9176f09bf95";
+ALTER TABLE IF EXISTS ONLY freight.cargo_type_wagon_types DROP CONSTRAINT IF EXISTS "PK_cargo_type_wagon_types";
+ALTER TABLE IF EXISTS ONLY freight.company_revisions DROP CONSTRAINT IF EXISTS "PK_c8ed8b5e0e0d93edffd43c8c024";
+ALTER TABLE IF EXISTS ONLY freight.booking_container DROP CONSTRAINT IF EXISTS "PK_c1805410bccc51530297b2960ef";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_requests DROP CONSTRAINT IF EXISTS "PK_be0bf389a4b0f01b05e5eded98b";
+ALTER TABLE IF EXISTS ONLY freight.last_mile_container_allocations DROP CONSTRAINT IF EXISTS "PK_9d5180799a6dd494156ec980dfb";
+ALTER TABLE IF EXISTS ONLY freight.interchange_documents DROP CONSTRAINT IF EXISTS "PK_95e5a5484c57ecc6f4a2927ddb4";
+ALTER TABLE IF EXISTS ONLY freight.priority_rules DROP CONSTRAINT IF EXISTS "PK_95c73e8a6e80f29d81edf66dbe2";
+ALTER TABLE IF EXISTS ONLY freight.user_trade_access DROP CONSTRAINT IF EXISTS "PK_94e21d7bfb20e57940e3255df87";
+ALTER TABLE IF EXISTS ONLY freight.booking_rate_snapshot DROP CONSTRAINT IF EXISTS "PK_8ca5cf692c4c3e95d91a7343117";
+ALTER TABLE IF EXISTS ONLY freight.last_mile DROP CONSTRAINT IF EXISTS "PK_8be9fbd78fd39e78b6d30ab119b";
+ALTER TABLE IF EXISTS ONLY freight.first_mile_container_allocations DROP CONSTRAINT IF EXISTS "PK_8be4b0df481f8a1555a4fb9d05d";
+ALTER TABLE IF EXISTS ONLY freight.first_mile DROP CONSTRAINT IF EXISTS "PK_72bc92607db5356f03c2aaeb6ec";
+ALTER TABLE IF EXISTS ONLY freight.booking_requests DROP CONSTRAINT IF EXISTS "PK_62c29ee249979fe0bcdcde33dae";
+ALTER TABLE IF EXISTS ONLY freight.warehouse_inspection_reports DROP CONSTRAINT IF EXISTS "PK_625df1e3a62e5aa4c3f14e7172e";
+ALTER TABLE IF EXISTS ONLY freight.container_types DROP CONSTRAINT IF EXISTS "PK_50e6b62fcd07ba58bdb6415d47c";
+ALTER TABLE IF EXISTS ONLY freight.exchange_settings DROP CONSTRAINT IF EXISTS "PK_48f5730ce6881caf75f279d0a5d";
+ALTER TABLE IF EXISTS ONLY freight.booking_document_review DROP CONSTRAINT IF EXISTS "PK_3d7705ea54a01cb4d6db5b743cd";
+ALTER TABLE IF EXISTS ONLY freight.yards DROP CONSTRAINT IF EXISTS "PK_3aa7dacb4c4fb065b1e2f8dfb5a";
+ALTER TABLE IF EXISTS ONLY freight.import_djibouti_operations DROP CONSTRAINT IF EXISTS "PK_3456f58d03f6719b38c70018ab6";
+ALTER TABLE IF EXISTS ONLY freight.shipping_lines DROP CONSTRAINT IF EXISTS "PK_336306f24563d798ec54eedca0c";
+ALTER TABLE IF EXISTS ONLY freight.warehouse_allocation_rules DROP CONSTRAINT IF EXISTS "PK_2e7632f009769d4da579c14f151";
+ALTER TABLE IF EXISTS ONLY freight.facilities DROP CONSTRAINT IF EXISTS "PK_2e6c685b2e1195e6d6394a22bc7";
+ALTER TABLE IF EXISTS ONLY freight.rates DROP CONSTRAINT IF EXISTS "PK_2c804ed4019b80ce48eedba5cec";
+ALTER TABLE IF EXISTS ONLY freight.train_composition_removal_logs DROP CONSTRAINT IF EXISTS "PK_29f7cdb5e0ae32ef1b96155fc9a";
+ALTER TABLE IF EXISTS ONLY freight.service_types DROP CONSTRAINT IF EXISTS "PK_1dc93417a097cdee3491f39d7cc";
+ALTER TABLE IF EXISTS ONLY freight.company_profiles DROP CONSTRAINT IF EXISTS "PK_1980200b310bd1e2ac86aa1ae4a";
+ALTER TABLE IF EXISTS ONLY freight.interchange_document_items DROP CONSTRAINT IF EXISTS "PK_163803862ca83ef98678e39a43b";
+ALTER TABLE IF EXISTS ONLY freight.company_change_request DROP CONSTRAINT IF EXISTS "PK_0a57bba5aaf77b376e7fee5fcf8";
+ALTER TABLE IF EXISTS ONLY freight.approval_rules DROP CONSTRAINT IF EXISTS "PK_048d2ffdf7169337b4cc237d772";
+ALTER TABLE IF EXISTS freight.migrations ALTER COLUMN id DROP DEFAULT;
+DROP TABLE IF EXISTS freight.yards;
+DROP TABLE IF EXISTS freight.yard_locations;
+DROP TABLE IF EXISTS freight.yard_facilities;
+DROP TABLE IF EXISTS freight.yard_distances;
+DROP TABLE IF EXISTS freight.work_orders;
+DROP TABLE IF EXISTS freight.weight_limit_rules;
+DROP TABLE IF EXISTS freight.warranties;
+DROP TABLE IF EXISTS freight.warehouses;
+DROP TABLE IF EXISTS freight.warehouse_zones;
+DROP TABLE IF EXISTS freight.warehouse_yards;
+DROP TABLE IF EXISTS freight.warehouse_yard_cargo_types;
+DROP TABLE IF EXISTS freight.warehouse_loadings;
+DROP TABLE IF EXISTS freight.warehouse_inventory_movement;
+DROP TABLE IF EXISTS freight.warehouse_inventory;
+DROP TABLE IF EXISTS freight.warehouse_inspection_reports;
+DROP TABLE IF EXISTS freight.warehouse_fee_rules;
+DROP TABLE IF EXISTS freight.warehouse_allocation_rules;
+DROP TABLE IF EXISTS freight.warehouse_activity_log;
+DROP TABLE IF EXISTS freight.warehouse_accrual_acks;
+DROP TABLE IF EXISTS freight.wagons;
+DROP TABLE IF EXISTS freight.wagon_types;
+DROP TABLE IF EXISTS freight.wagon_transfer_requests;
+DROP TABLE IF EXISTS freight.wagon_status_logs;
+DROP TABLE IF EXISTS freight.wagon_movements;
+DROP TABLE IF EXISTS freight.wagon_booking_allocations;
+DROP TABLE IF EXISTS freight.wagon_allocation_container_items;
+DROP TABLE IF EXISTS freight.wagon_allocation_bulk_loads;
+DROP TABLE IF EXISTS freight.vendors;
+DROP TABLE IF EXISTS freight.vehicles;
+DROP TABLE IF EXISTS freight.user_trade_access;
+DROP TABLE IF EXISTS freight.truck_types;
+DROP TABLE IF EXISTS freight.transit_agents;
+DROP TABLE IF EXISTS freight.trains;
+DROP TABLE IF EXISTS freight.train_sets;
+DROP TABLE IF EXISTS freight.train_set_wagons;
+DROP TABLE IF EXISTS freight.train_set_locomotives;
+DROP TABLE IF EXISTS freight.train_scheduling_global_rules;
+DROP TABLE IF EXISTS freight.train_schedules;
+DROP TABLE IF EXISTS freight.train_schedule_bookings;
+DROP TABLE IF EXISTS freight.train_locomotives;
+DROP TABLE IF EXISTS freight.train_composition_removal_logs;
+DROP TABLE IF EXISTS freight.train_checkpoint_events;
+DROP TABLE IF EXISTS freight.tracking_events;
+DROP TABLE IF EXISTS freight.support_messages;
+DROP TABLE IF EXISTS freight.support_documents;
+DROP TABLE IF EXISTS freight.support_document_versions;
+DROP TABLE IF EXISTS freight.support_conversations;
+DROP TABLE IF EXISTS freight.shipping_lines;
+DROP TABLE IF EXISTS freight.service_types;
+DROP SEQUENCE IF EXISTS freight.seq_company_profile_tr;
+DROP SEQUENCE IF EXISTS freight.seq_company_profile_im;
+DROP SEQUENCE IF EXISTS freight.seq_company_profile_fwj;
+DROP SEQUENCE IF EXISTS freight.seq_company_profile_ffe;
+DROP SEQUENCE IF EXISTS freight.seq_company_profile_ex;
+DROP TABLE IF EXISTS freight.scheduling_events;
+DROP TABLE IF EXISTS freight.schedule_wagon_adjustment_logs;
+DROP TABLE IF EXISTS freight.saved_signatures;
+DROP TABLE IF EXISTS freight.routes;
+DROP TABLE IF EXISTS freight.route_milestones;
+DROP TABLE IF EXISTS freight.rates;
+DROP TABLE IF EXISTS freight.rate_change_requests;
+DROP TABLE IF EXISTS freight.priority_rules;
+DROP TABLE IF EXISTS freight.priority_rule_change_requests;
+DROP TABLE IF EXISTS freight.priority_configs;
+DROP TABLE IF EXISTS freight.payments;
+DROP TABLE IF EXISTS freight.payment_webhook_events;
+DROP TABLE IF EXISTS freight.payment_refunds;
+DROP TABLE IF EXISTS freight.parts;
+DROP TABLE IF EXISTS freight.otp_verifications;
+DROP TABLE IF EXISTS freight.notifications;
+DROP SEQUENCE IF EXISTS freight.migrations_id_seq;
+DROP TABLE IF EXISTS freight.migrations;
+DROP TABLE IF EXISTS freight.maintenance_schedules;
+DROP TABLE IF EXISTS freight.maintenance_intervals;
+DROP TABLE IF EXISTS freight.maintenance_costs;
+DROP TABLE IF EXISTS freight.locomotives;
+DROP TABLE IF EXISTS freight.last_mile_vehicle_containers;
+DROP TABLE IF EXISTS freight.last_mile_vehicle_assignments;
+DROP TABLE IF EXISTS freight.last_mile_requests;
+DROP TABLE IF EXISTS freight.last_mile_container_allocations;
+DROP TABLE IF EXISTS freight.last_mile;
+DROP TABLE IF EXISTS freight.invoices;
+DROP TABLE IF EXISTS freight.invoice_lines;
+DROP TABLE IF EXISTS freight.interchange_documents;
+DROP TABLE IF EXISTS freight.interchange_document_items;
+DROP TABLE IF EXISTS freight.incidents;
+DROP TABLE IF EXISTS freight.import_djibouti_operations;
+DROP TABLE IF EXISTS freight.import_customs_finalizations;
+DROP TABLE IF EXISTS freight.gps_positions;
+DROP TABLE IF EXISTS freight.gps_devices;
+DROP TABLE IF EXISTS freight.fuel_purchases;
+DROP TABLE IF EXISTS freight.fuel_consumption;
+DROP TABLE IF EXISTS freight.fleet_events;
+DROP TABLE IF EXISTS freight.first_mile_vehicle_assignments;
+DROP TABLE IF EXISTS freight.first_mile_container_allocations;
+DROP TABLE IF EXISTS freight.first_mile;
+DROP TABLE IF EXISTS freight.files;
+DROP TABLE IF EXISTS freight.file_upload_settings;
+DROP TABLE IF EXISTS freight.file_upload_fields;
+DROP TABLE IF EXISTS freight.ff_clients;
+DROP TABLE IF EXISTS freight.fayda_verification_sessions;
+DROP TABLE IF EXISTS freight.facility_handling_events;
+DROP TABLE IF EXISTS freight.facilities;
+DROP TABLE IF EXISTS freight.external_profiles;
+DROP TABLE IF EXISTS freight.exchange_settings;
+DROP TABLE IF EXISTS freight.empty_container_returns;
+DROP TABLE IF EXISTS freight.eims_system_state;
+DROP TABLE IF EXISTS freight.dropdown_settings;
+DROP TABLE IF EXISTS freight.dropdown_options;
+DROP TABLE IF EXISTS freight.drivers;
+DROP TABLE IF EXISTS freight.djibouti_import_incidents;
+DROP TABLE IF EXISTS freight.customers;
+DROP TABLE IF EXISTS freight.customer_truck_containers;
+DROP TABLE IF EXISTS freight.customer_truck_assignments;
+DROP TABLE IF EXISTS freight.contracts;
+DROP TABLE IF EXISTS freight.contract_templates;
+DROP TABLE IF EXISTS freight.contract_signatures;
+DROP TABLE IF EXISTS freight.contract_routes;
+DROP TABLE IF EXISTS freight.contract_review_notes;
+DROP TABLE IF EXISTS freight.contract_rate_snapshots;
+DROP TABLE IF EXISTS freight.contract_document_revisions;
+DROP TABLE IF EXISTS freight.contract_document_review;
+DROP TABLE IF EXISTS freight.contract_clearance_cycles;
+DROP TABLE IF EXISTS freight.contract_cargo_scope;
+DROP TABLE IF EXISTS freight.contract_approval_steps;
+DROP TABLE IF EXISTS freight.containers;
+DROP TABLE IF EXISTS freight.container_types;
+DROP TABLE IF EXISTS freight.container_type_wagon_types;
+DROP TABLE IF EXISTS freight.consignments;
+DROP TABLE IF EXISTS freight.compliance_records;
+DROP TABLE IF EXISTS freight.company_revisions;
+DROP TABLE IF EXISTS freight.company_profiles;
+DROP TABLE IF EXISTS freight.company_change_request;
+DROP TABLE IF EXISTS freight.companies;
+DROP TABLE IF EXISTS freight.clearance_milestones;
+DROP TABLE IF EXISTS freight.clearance_incidents;
+DROP TABLE IF EXISTS freight.cargoes;
+DROP TABLE IF EXISTS freight.cargo_types;
+DROP TABLE IF EXISTS freight.cargo_type_wagon_types;
+DROP TABLE IF EXISTS freight.bookings;
+DROP TABLE IF EXISTS freight.booking_wagon_cancellations;
+DROP TABLE IF EXISTS freight.booking_review_note;
+DROP TABLE IF EXISTS freight.booking_requests;
+DROP TABLE IF EXISTS freight.booking_rate_snapshot;
+DROP TABLE IF EXISTS freight.booking_handovers;
+DROP TABLE IF EXISTS freight.booking_document_review;
+DROP TABLE IF EXISTS freight.booking_contract_signatures;
+DROP TABLE IF EXISTS freight.booking_container_units;
+DROP TABLE IF EXISTS freight.booking_container_allocations;
+DROP TABLE IF EXISTS freight.booking_container;
+DROP TABLE IF EXISTS freight.booking_cargo_modifier;
+DROP TABLE IF EXISTS freight.booking_batch_offers;
+DROP TABLE IF EXISTS freight.asset_disposals;
+DROP TABLE IF EXISTS freight.asset_acquisitions;
+DROP TABLE IF EXISTS freight.approval_rules;
+DROP TYPE IF EXISTS freight.weight_limit_rules_trade_direction_enum;
+DROP TYPE IF EXISTS freight.weight_limit_rules_exceeded_action_enum;
+DROP TYPE IF EXISTS freight.vehicles_status_enum;
+DROP TYPE IF EXISTS freight.train_status;
+DROP TYPE IF EXISTS freight.tracking_events_status_enum;
+DROP TYPE IF EXISTS freight.surcharges_calculation_method_enum;
+DROP TYPE IF EXISTS freight.priority_rules_priority_type_enum;
+DROP TYPE IF EXISTS freight.payments_status_enum;
+DROP TYPE IF EXISTS freight.payments_method_enum;
+DROP TYPE IF EXISTS freight.payments_currency_enum;
+DROP TYPE IF EXISTS freight.payment_webhook_method_enum;
+DROP TYPE IF EXISTS freight.invoices_status_enum;
+DROP TYPE IF EXISTS freight.consignments_status_enum;
+DROP TYPE IF EXISTS freight.consignments_cargo_type_enum;
+DROP SCHEMA IF EXISTS freight;
+--
+-- Name: freight; Type: SCHEMA; Schema: -; Owner: -
+--
+
+CREATE SCHEMA freight;
+
+
+--
+-- Name: consignments_cargo_type_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.consignments_cargo_type_enum AS ENUM (
+    'CONTAINER',
+    'BULK_LIQUID',
+    'BULK_DRY',
+    'GENERAL',
+    'REFRIGERATED',
+    'HAZARDOUS'
+);
+
+
+--
+-- Name: consignments_status_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.consignments_status_enum AS ENUM (
+    'PENDING',
+    'LOADED',
+    'IN_TRANSIT',
+    'AT_DESTINATION',
+    'DELIVERED',
+    'RETURNED'
+);
+
+
+--
+-- Name: invoices_status_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.invoices_status_enum AS ENUM (
+    'DRAFT',
+    'ISSUED',
+    'PENDING',
+    'PAYMENT_PROCESSING',
+    'PARTIALLY_PAID',
+    'PAID',
+    'OVERDUE',
+    'CANCELLED',
+    'REFUNDED',
+    'EXPIRED'
+);
+
+
+--
+-- Name: payment_webhook_method_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.payment_webhook_method_enum AS ENUM (
+    'telebirr',
+    'cbe-birr',
+    'ebirr'
+);
+
+
+--
+-- Name: payments_currency_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.payments_currency_enum AS ENUM (
+    'ETB',
+    'USD'
+);
+
+
+--
+-- Name: payments_method_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.payments_method_enum AS ENUM (
+    'telebirr',
+    'cbe-birr',
+    'ebirr',
+    'waafi',
+    'card',
+    'dmoney',
+    'cac-bank',
+    'cbe-bill'
+);
+
+
+--
+-- Name: payments_status_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.payments_status_enum AS ENUM (
+    'action-required',
+    'processing',
+    'success',
+    'failed',
+    'canceled',
+    'refunded'
+);
+
+
+--
+-- Name: priority_rules_priority_type_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.priority_rules_priority_type_enum AS ENUM (
+    'USD_PAYER',
+    'RAIL_AND_FORWARDING',
+    'GOVERNMENT_ACCOUNT',
+    'HIGH_VOLUME_SHIPMENT'
+);
+
+
+--
+-- Name: surcharges_calculation_method_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.surcharges_calculation_method_enum AS ENUM (
+    'PER_TON',
+    'FLAT_FEE',
+    'PERCENTAGE'
+);
+
+
+--
+-- Name: tracking_events_status_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.tracking_events_status_enum AS ENUM (
+    'PENDING',
+    'LOADED',
+    'IN_TRANSIT',
+    'AT_DESTINATION',
+    'DELIVERED',
+    'RETURNED'
+);
+
+
+--
+-- Name: train_status; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.train_status AS ENUM (
+    'AVAILABLE',
+    'SCHEDULED',
+    'IN_SERVICE',
+    'UNDER_MAINTENANCE',
+    'OUT_OF_SERVICE',
+    'DEACTIVATED'
+);
+
+
+--
+-- Name: vehicles_status_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.vehicles_status_enum AS ENUM (
+    'ACTIVE',
+    'FREE',
+    'BUSY',
+    'MAINTENANCE',
+    'RETIRED',
+    'OUT_OF_SERVICE'
+);
+
+
+--
+-- Name: weight_limit_rules_exceeded_action_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.weight_limit_rules_exceeded_action_enum AS ENUM (
+    'WARNING_ONLY',
+    'HARD_BLOCK'
+);
+
+
+--
+-- Name: weight_limit_rules_trade_direction_enum; Type: TYPE; Schema: freight; Owner: -
+--
+
+CREATE TYPE freight.weight_limit_rules_trade_direction_enum AS ENUM (
+    'IMPORT',
+    'EXPORT',
+    'BOTH',
+    'DOMESTIC'
+);
+
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: approval_rules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.approval_rules (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    requires_director_approval boolean NOT NULL,
+    step_order smallint NOT NULL,
+    required_role character varying(64) NOT NULL,
+    action_label character varying(50) NOT NULL,
+    blocks_role character varying(64),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: asset_acquisitions; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.asset_acquisitions (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    vehicle_id uuid,
+    vendor_id uuid,
+    acquisition_type character varying NOT NULL,
+    acquisition_date date NOT NULL,
+    cost numeric(14,2),
+    useful_life_months integer,
+    salvage_value numeric(14,2),
+    lease_start date,
+    lease_end date,
+    monthly_payment numeric(14,2),
+    status character varying DEFAULT 'ACTIVE'::character varying NOT NULL,
+    notes text,
+    item_name character varying(200)
+);
+
+
+--
+-- Name: asset_disposals; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.asset_disposals (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    vehicle_id uuid NOT NULL,
+    disposal_date date NOT NULL,
+    method character varying NOT NULL,
+    sale_price numeric(14,2),
+    buyer character varying,
+    notes text
+);
+
+
+--
+-- Name: booking_batch_offers; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_batch_offers (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    train_schedule_id uuid NOT NULL,
+    offered_wagons integer NOT NULL,
+    total_wagons integer NOT NULL,
+    offered_lines jsonb,
+    offered_weight_tons numeric(12,3) NOT NULL,
+    offered_amount numeric(14,2) NOT NULL,
+    offered_pricing_breakdown jsonb,
+    invoice_id uuid,
+    payment_deadline timestamp with time zone NOT NULL,
+    status character varying(10) DEFAULT 'OFFERED'::character varying NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: booking_cargo_modifier; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_cargo_modifier (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    booking_id uuid NOT NULL,
+    trigger_value numeric(14,4),
+    calculated_amount numeric(14,2) NOT NULL,
+    rate_snapshot_id uuid NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    rate_id uuid NOT NULL
+);
+
+
+--
+-- Name: booking_container; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_container (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    booking_id uuid NOT NULL,
+    container_type_id uuid,
+    quantity smallint NOT NULL,
+    vgm_per_unit_tons numeric(10,3) NOT NULL,
+    total_vgm_tons numeric(12,3) NOT NULL,
+    wagons_required numeric(6,2) NOT NULL,
+    weight_limit_rule_id uuid,
+    is_overweight boolean DEFAULT false NOT NULL,
+    overweight_excess_tons numeric(10,3),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    container_number character varying(64),
+    container_size character varying(10),
+    hazardous_quantity smallint DEFAULT 0,
+    reefer_quantity smallint DEFAULT 0,
+    return_quantity smallint DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: booking_container_allocations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_container_allocations (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    container_id uuid NOT NULL,
+    vehicle_id uuid,
+    container_type text NOT NULL,
+    quantity integer DEFAULT 1 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: booking_container_units; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_container_units (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_container_id uuid NOT NULL,
+    container_number character varying(64) NOT NULL,
+    seal_number character varying(64),
+    vgm_tons numeric(10,3) NOT NULL,
+    is_hazardous boolean DEFAULT false,
+    is_reefer boolean DEFAULT false,
+    sort_order smallint DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    received_to_port boolean DEFAULT false NOT NULL,
+    received_at timestamp with time zone,
+    grn_number character varying(100),
+    is_return boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: booking_contract_signatures; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_contract_signatures (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    signer_role character varying(20) NOT NULL,
+    signer_user_id uuid,
+    signer_display_name character varying(200) NOT NULL,
+    signed_at timestamp with time zone DEFAULT now() NOT NULL,
+    signature_file_id uuid,
+    consent_text text,
+    ip_address character varying(64),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: booking_document_review; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_document_review (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    setting_code character varying(128) NOT NULL,
+    file_key character varying(128) NOT NULL,
+    file_record_id uuid,
+    status character varying(20) DEFAULT 'PENDING'::character varying NOT NULL,
+    note text,
+    reviewed_by_staff_id uuid,
+    reviewed_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    contract_id uuid
+);
+
+
+--
+-- Name: booking_handovers; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_handovers (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    truck_assignment_id uuid,
+    truck_plate character varying(32),
+    mile_type character varying(20) NOT NULL,
+    reference character varying(100) NOT NULL,
+    generated_at timestamp with time zone DEFAULT now() NOT NULL,
+    signed_at timestamp with time zone,
+    signed_by_user_id uuid,
+    delivered_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    signer_name character varying(160),
+    edr_assignment_id uuid,
+    signature_image_url text
+);
+
+
+--
+-- Name: booking_rate_snapshot; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_rate_snapshot (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    booking_id uuid NOT NULL,
+    rate_id uuid NOT NULL,
+    rate_type character varying(50) NOT NULL,
+    rate_value numeric(14,4) NOT NULL,
+    rate_unit character varying(30) NOT NULL,
+    currency character varying(5) NOT NULL,
+    snapshotted_at timestamp with time zone NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: booking_requests; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_requests (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    reference character varying(40) DEFAULT ''::character varying NOT NULL,
+    contract_id uuid NOT NULL,
+    requested_by_user_id uuid,
+    contract_route_id uuid,
+    scheduled_date timestamp with time zone,
+    status character varying(16) DEFAULT 'PENDING'::character varying NOT NULL,
+    requested_lines jsonb DEFAULT '{}'::jsonb NOT NULL,
+    notes text,
+    created_booking_id uuid,
+    reviewed_by_staff_id uuid,
+    reviewed_at timestamp with time zone,
+    review_note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    payment_currency character varying(5)
+);
+
+
+--
+-- Name: booking_review_note; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_review_note (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    author_id uuid,
+    note text NOT NULL,
+    type character varying(30) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: booking_wagon_cancellations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.booking_wagon_cancellations (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    rebooked_booking_id uuid,
+    wagons_cancelled numeric(6,2) NOT NULL,
+    weight_tons numeric(12,3) DEFAULT 0 NOT NULL,
+    cancelled_quantities jsonb NOT NULL,
+    credit_amount numeric(14,2) DEFAULT 0 NOT NULL,
+    fee_rate_id uuid,
+    fee_amount numeric(14,2) NOT NULL,
+    fee_currency character varying(8) DEFAULT 'ETB'::character varying NOT NULL,
+    fee_invoice_id uuid,
+    fee_paid_at timestamp with time zone,
+    status character varying(30) DEFAULT 'FEE_PENDING'::character varying NOT NULL,
+    reason text,
+    requested_by_user_id uuid,
+    rebooked_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    CONSTRAINT booking_wagon_cancellations_fee_amount_check CHECK ((fee_amount >= (0)::numeric)),
+    CONSTRAINT booking_wagon_cancellations_wagons_cancelled_check CHECK ((wagons_cancelled > (0)::numeric))
+);
+
+
+--
+-- Name: bookings; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.bookings (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    reference character varying(64) NOT NULL,
+    customer_id uuid,
+    train_id uuid,
+    status character varying(40) DEFAULT 'DRAFT'::character varying NOT NULL,
+    scheduled_date timestamp with time zone DEFAULT now(),
+    total_amount numeric(14,2) DEFAULT 0 NOT NULL,
+    payment_status character varying(20) DEFAULT 'PENDING'::character varying NOT NULL,
+    contract_type character varying(20) DEFAULT 'SPOT'::character varying NOT NULL,
+    trade_direction character varying(10) DEFAULT 'IMPORT'::character varying NOT NULL,
+    equipment_return character varying(20) DEFAULT 'RETURN'::character varying NOT NULL,
+    first_mile_pickup_address text,
+    last_mile_delivery_address text,
+    cargo_total_weight_vgm numeric(12,3) DEFAULT 0 NOT NULL,
+    is_hazardous boolean DEFAULT false NOT NULL,
+    payment_currency character varying(5) DEFAULT 'USD'::character varying NOT NULL,
+    start_date date,
+    end_date date,
+    financial_terms text,
+    version_number integer DEFAULT 1 NOT NULL,
+    approved_by_staff_id uuid,
+    approved_by_staff_at timestamp with time zone,
+    signed_by_director_id uuid,
+    signed_by_director_at timestamp with time zone,
+    signed_by_ceo_id uuid,
+    signed_by_ceo_at timestamp with time zone,
+    priority_score integer DEFAULT 0 NOT NULL,
+    consolidation_partner_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    origin_yard_id uuid NOT NULL,
+    destination_yard_id uuid NOT NULL,
+    service_type_id uuid NOT NULL,
+    cargo_type_id uuid,
+    cargo_free_text character varying(200),
+    shipping_line_id uuid,
+    pnr_code character varying(50),
+    customer_signed_at timestamp with time zone,
+    fully_executed_at timestamp with time zone,
+    marketing_approved_by_id uuid,
+    marketing_approved_at timestamp with time zone,
+    contract_summary text,
+    locked_at timestamp with time zone,
+    freight_type character varying(20) NOT NULL,
+    contract_template_key character varying(80),
+    contract_generated_at timestamp with time zone,
+    pricing_breakdown jsonb,
+    company_id uuid NOT NULL,
+    wagons_required numeric(6,2),
+    scheduling_status character varying(30) DEFAULT 'NOT_SCHEDULED'::character varying NOT NULL,
+    hold_started_at timestamp with time zone,
+    hold_expires_at timestamp with time zone,
+    scheduled_at timestamp with time zone,
+    is_government boolean DEFAULT false NOT NULL,
+    government_institution character varying(255),
+    train_schedule_id uuid,
+    payment_deadline timestamp with time zone,
+    selected_for_batch_at timestamp with time zone,
+    company_profile_id uuid NOT NULL,
+    expires_at timestamp with time zone,
+    adjusted_total_amount numeric(14,2),
+    adjusted_by_staff_id uuid,
+    adjusted_at timestamp with time zone,
+    adjustment_reason text,
+    contract_validity_days integer,
+    contract_valid_from timestamp with time zone,
+    contract_valid_until timestamp with time zone,
+    first_mile_pickup_lat numeric(10,7),
+    first_mile_pickup_lng numeric(10,7),
+    last_mile_delivery_lat numeric(10,7),
+    last_mile_delivery_lng numeric(10,7),
+    customs_clearing_enabled boolean DEFAULT false NOT NULL,
+    customs_clearing_agent character varying(200),
+    is_reefer boolean DEFAULT false NOT NULL,
+    estimated_shipment_date timestamp with time zone,
+    contract_id uuid,
+    contract_route_id uuid,
+    created_by_role character varying(20) DEFAULT 'CUSTOMER'::character varying,
+    created_by_user_id uuid,
+    contract_kind character varying(20),
+    gl_station_yard_id uuid,
+    gl_assigned_staff_id uuid,
+    gl_assigned_at timestamp with time zone,
+    bulk_hazardous_quantity numeric(12,3) DEFAULT 0 NOT NULL,
+    bulk_reefer_quantity numeric(12,3) DEFAULT 0 NOT NULL,
+    clearance_current_phase character varying(40),
+    duty_required boolean,
+    vessel_departure_date date,
+    ro_amendment_requested_at timestamp with time zone,
+    ro_hold_reason text,
+    pre_clearance_finalized_at timestamp with time zone,
+    customer_truck_plate_number character varying(32),
+    customer_truck_driver_name character varying(120),
+    customer_truck_type character varying(60),
+    customer_truck_container_number character varying(16),
+    customer_truck_assigned_at timestamp with time zone,
+    customer_truck_arrived_at timestamp with time zone,
+    booking_type character varying(20) DEFAULT 'ONE_TIME'::character varying NOT NULL,
+    loaded_at timestamp with time zone,
+    loaded_by_user_id uuid,
+    arrived_at timestamp with time zone,
+    arrived_by_user_id uuid,
+    consolidation_resume_status character varying(40),
+    is_split boolean DEFAULT false NOT NULL,
+    pre_split_quantities jsonb,
+    double_handling boolean,
+    double_handling_set_at timestamp with time zone,
+    double_handling_set_by character varying(160),
+    vessel_arrival_date date,
+    do_collected_date date,
+    transit_assignee_requested_at timestamp with time zone,
+    transit_assignee_request_note text,
+    transit_assignee_name text,
+    transit_assignee_assigned_at timestamp with time zone,
+    requested_train_schedule_id uuid,
+    payment_reminder_sent_at timestamp with time zone,
+    bulk_total_weight_tons numeric(12,3),
+    export_handover_mode character varying(20),
+    CONSTRAINT chk_bookings_freight_type CHECK (((freight_type)::text = ANY (ARRAY[('CONTAINER'::character varying)::text, ('BULK'::character varying)::text])))
+);
+
+
+--
+-- Name: cargo_type_wagon_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.cargo_type_wagon_types (
+    cargo_type_id uuid NOT NULL,
+    wagon_type_id uuid NOT NULL
+);
+
+
+--
+-- Name: cargo_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.cargo_types (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    cargo_type_name character varying(255) NOT NULL,
+    parent_group_id uuid,
+    requires_director_approval boolean DEFAULT false NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    display_order integer DEFAULT 1 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    code character varying(50) NOT NULL,
+    unit_of_measure character varying(16),
+    has_lashing boolean DEFAULT false NOT NULL,
+    items_per_wagon_map jsonb,
+    tons_per_wagon_map jsonb,
+    has_contract_template boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: cargoes; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.cargoes (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    cargo_reference character varying NOT NULL,
+    shipment_id uuid NOT NULL,
+    container_id uuid,
+    cargo_type_id uuid,
+    description text,
+    quantity numeric(12,3) NOT NULL,
+    weight numeric(10,2) NOT NULL,
+    volume numeric(10,2),
+    status character varying DEFAULT 'PENDING'::character varying NOT NULL,
+    loaded_at timestamp without time zone,
+    unloaded_at timestamp without time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    wagon_booking_allocation_id uuid,
+    booking_id uuid,
+    load_type character varying(20),
+    receiver_name character varying,
+    delivered_at timestamp without time zone,
+    delivery_remarks text
+);
+
+
+--
+-- Name: clearance_incidents; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.clearance_incidents (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    incident_type character varying(32) NOT NULL,
+    description text NOT NULL,
+    photo_file_ids jsonb DEFAULT '[]'::jsonb NOT NULL,
+    reported_by_user_id uuid,
+    reported_at timestamp with time zone DEFAULT now() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: clearance_milestones; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.clearance_milestones (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid,
+    contract_id uuid,
+    clearance_cycle_id uuid,
+    milestone_code character varying(64) NOT NULL,
+    milestone_label character varying(255) NOT NULL,
+    status character varying(20) DEFAULT 'PENDING'::character varying NOT NULL,
+    owner_region character varying(5),
+    triggered_by_doc boolean DEFAULT false,
+    triggered_at timestamp with time zone,
+    triggered_by_user_id uuid,
+    note text,
+    sort_order smallint DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    metadata jsonb
+);
+
+
+--
+-- Name: companies; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.companies (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    name character varying(200) NOT NULL,
+    type character varying(32) NOT NULL,
+    status character varying(32) DEFAULT 'pending'::character varying NOT NULL,
+    tin character varying(10) NOT NULL,
+    vat_number character varying(50),
+    fan_number character varying(16),
+    country character varying(32) DEFAULT 'Ethiopia'::character varying NOT NULL,
+    address text,
+    phone character varying(20),
+    email character varying(150),
+    website character varying(200),
+    attributes jsonb,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    contact_person_name character varying(100),
+    contact_person_phone character varying(20),
+    general_manager_name character varying(100),
+    general_manager_email character varying(150),
+    general_manager_phone character varying(20),
+    nationality character varying(32),
+    licence_number character varying(100),
+    status_description text,
+    date_registered character varying(50),
+    renewed_from character varying(50),
+    renewal_date character varying(50),
+    renewed_to character varying(50),
+    region character varying(100),
+    zone character varying(100),
+    woreda character varying(100),
+    kebele character varying(100),
+    house_no character varying(100),
+    etrade_phone character varying(20),
+    kind character varying(20) DEFAULT 'commercial'::character varying NOT NULL,
+    approved_at timestamp with time zone
+);
+
+
+--
+-- Name: company_change_request; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.company_change_request (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    company_id uuid NOT NULL,
+    snapshot jsonb NOT NULL,
+    documents jsonb,
+    status character varying(20) DEFAULT 'pending'::character varying NOT NULL,
+    note text,
+    submitted_by uuid,
+    submitted_at timestamp with time zone,
+    reviewed_by uuid,
+    reviewed_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: company_profiles; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.company_profiles (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    company_id uuid NOT NULL,
+    type character varying(32) NOT NULL,
+    reference character varying(20),
+    status character varying(32) DEFAULT 'pending'::character varying NOT NULL,
+    business_license character varying(100),
+    attributes jsonb,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    business_license_files jsonb,
+    review_note text,
+    reviewed_by uuid,
+    reviewed_at timestamp with time zone
+);
+
+
+--
+-- Name: company_revisions; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.company_revisions (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    company_id uuid NOT NULL,
+    actor_id uuid,
+    summary character varying(255) NOT NULL,
+    changes jsonb DEFAULT '[]'::jsonb NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: compliance_records; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.compliance_records (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    type character varying NOT NULL,
+    document_number character varying,
+    issued_date date,
+    expiry_date date NOT NULL,
+    status character varying DEFAULT 'VALID'::character varying NOT NULL,
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: consignments; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.consignments (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    tracking_number character varying(64) NOT NULL,
+    cargo_type freight.consignments_cargo_type_enum NOT NULL,
+    weight_kg numeric(12,2) NOT NULL,
+    status freight.consignments_status_enum DEFAULT 'PENDING'::freight.consignments_status_enum NOT NULL,
+    origin_station character varying(128) NOT NULL,
+    destination_station character varying(128) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: container_type_wagon_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.container_type_wagon_types (
+    container_type_id uuid NOT NULL,
+    wagon_type_id uuid NOT NULL
+);
+
+
+--
+-- Name: container_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.container_types (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    code character varying(20) NOT NULL,
+    label character varying(100),
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    size_ft smallint,
+    is_reefer boolean DEFAULT false NOT NULL,
+    is_open_top boolean DEFAULT false NOT NULL,
+    display_order integer DEFAULT 1 NOT NULL
+);
+
+
+--
+-- Name: containers; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.containers (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    container_number character varying NOT NULL,
+    container_type_id uuid NOT NULL,
+    wagon_id uuid,
+    "position" integer,
+    tare_weight numeric(10,2) NOT NULL,
+    max_gross_weight numeric(10,2) NOT NULL,
+    seal_number character varying,
+    status character varying DEFAULT 'AVAILABLE'::character varying NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    booking_id uuid,
+    wagon_booking_allocation_id uuid,
+    booking_container_id uuid
+);
+
+
+--
+-- Name: contract_approval_steps; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_approval_steps (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    step_order smallint DEFAULT 0 NOT NULL,
+    required_role character varying(64) NOT NULL,
+    blocks_role character varying(64),
+    status character varying(20) DEFAULT 'PENDING'::character varying NOT NULL,
+    acted_by_staff_id uuid,
+    acted_at timestamp with time zone,
+    note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: contract_cargo_scope; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_cargo_scope (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    container_size character varying(10),
+    cargo_type_id uuid,
+    cargo_free_text character varying(200),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    quantity_cap numeric(12,2)
+);
+
+
+--
+-- Name: contract_clearance_cycles; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_clearance_cycles (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    cycle_number integer NOT NULL,
+    status character varying(40) DEFAULT 'AWAITING_DOCUMENTS'::character varying NOT NULL,
+    booking_id uuid,
+    started_at timestamp with time zone DEFAULT now() NOT NULL,
+    clearance_ready_at timestamp with time zone,
+    completed_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    duty_required boolean,
+    vessel_departure_date date,
+    ro_amendment_requested_at timestamp with time zone,
+    ro_hold_reason text,
+    current_phase character varying(40),
+    pre_clearance_finalized_at timestamp with time zone,
+    transit_assignee_requested_at timestamp with time zone,
+    transit_assignee_requested_by_user_id uuid,
+    transit_assignee_request_note text,
+    transit_assignee_name text,
+    transit_assignee_assigned_at timestamp with time zone,
+    transit_assignee_assigned_by_user_id uuid,
+    vessel_arrival_date date,
+    do_collected_date date
+);
+
+
+--
+-- Name: contract_document_review; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_document_review (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    clearance_cycle_id uuid,
+    setting_code character varying(128) NOT NULL,
+    file_key character varying(128) NOT NULL,
+    file_record_id uuid,
+    status character varying(20) DEFAULT 'PENDING'::character varying NOT NULL,
+    note text,
+    uploaded_by_role character varying(20) DEFAULT 'CUSTOMER'::character varying NOT NULL,
+    reviewed_by_staff_id uuid,
+    reviewed_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: contract_document_revisions; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_document_revisions (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    contract_id uuid NOT NULL,
+    actor_id uuid,
+    actor_role character varying(64),
+    step_id uuid,
+    summary character varying(255),
+    changes jsonb DEFAULT '[]'::jsonb NOT NULL,
+    actor_name character varying(200)
+);
+
+
+--
+-- Name: contract_rate_snapshots; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_rate_snapshots (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    rate_id uuid,
+    rate_code character varying(64) NOT NULL,
+    description character varying(255),
+    unit_price numeric(14,2) NOT NULL,
+    unit_of_measure character varying(32) NOT NULL,
+    currency character varying(5) NOT NULL,
+    container_size character varying(10),
+    is_surcharge boolean DEFAULT false,
+    conditional_on character varying(32),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    is_clearance boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: contract_review_notes; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_review_notes (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    note_type character varying(40) NOT NULL,
+    body text NOT NULL,
+    author_role character varying(20),
+    author_user_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: contract_routes; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_routes (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    origin_yard_id uuid NOT NULL,
+    destination_yard_id uuid NOT NULL,
+    km numeric(10,2),
+    sort_order smallint DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: contract_signatures; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_signatures (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    contract_id uuid NOT NULL,
+    role character varying(20) NOT NULL,
+    signer_display_name character varying(255) NOT NULL,
+    signature_file_id uuid,
+    consent_text text,
+    signed_at timestamp with time zone DEFAULT now() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    stamp_file_id uuid
+);
+
+
+--
+-- Name: contract_templates; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contract_templates (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    code character varying(80) NOT NULL,
+    name character varying(200) NOT NULL,
+    description text,
+    document_title character varying(300) NOT NULL,
+    whereas_clauses jsonb DEFAULT '[]'::jsonb NOT NULL,
+    articles jsonb DEFAULT '[]'::jsonb NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    cargo_type_id uuid,
+    with_customs boolean,
+    is_system boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: contracts; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.contracts (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    reference character varying(64) NOT NULL,
+    company_id uuid,
+    company_profile_id uuid,
+    is_government boolean DEFAULT false NOT NULL,
+    government_institution character varying(255),
+    contract_kind character varying(20) NOT NULL,
+    renewal_of_id uuid,
+    trade_direction character varying(10) NOT NULL,
+    freight_type character varying(20) NOT NULL,
+    service_type_id uuid NOT NULL,
+    payment_currency character varying(5) NOT NULL,
+    customs_clearing_enabled boolean DEFAULT false NOT NULL,
+    customs_clearing_agent character varying(200),
+    equipment_return character varying(20),
+    first_mile_pickup_address text,
+    first_mile_pickup_lat numeric(10,7),
+    first_mile_pickup_lng numeric(10,7),
+    last_mile_delivery_address text,
+    last_mile_delivery_lat numeric(10,7),
+    last_mile_delivery_lng numeric(10,7),
+    is_hazardous boolean DEFAULT false NOT NULL,
+    is_reefer boolean DEFAULT false NOT NULL,
+    estimated_shipment_date timestamp with time zone,
+    contract_validity_days integer,
+    contract_valid_from timestamp with time zone,
+    contract_valid_until timestamp with time zone,
+    expires_at timestamp with time zone,
+    status character varying(40) DEFAULT 'DRAFT'::character varying NOT NULL,
+    clearance_status character varying(40) DEFAULT 'NOT_APPLICABLE'::character varying NOT NULL,
+    clearance_cycle_number integer DEFAULT 0 NOT NULL,
+    pricing_breakdown jsonb,
+    pricing_display_mode character varying(20) DEFAULT 'UNIT_RATES'::character varying,
+    contract_type character varying(20),
+    contract_template_key character varying(128),
+    contract_generated_at timestamp with time zone,
+    contract_summary text,
+    version_number integer DEFAULT 1 NOT NULL,
+    financial_terms jsonb,
+    approved_by_staff_id uuid,
+    approved_by_staff_at timestamp with time zone,
+    signed_by_director_id uuid,
+    signed_by_director_at timestamp with time zone,
+    signed_by_ceo_id uuid,
+    signed_by_ceo_at timestamp with time zone,
+    customer_signed_at timestamp with time zone,
+    fully_executed_at timestamp with time zone,
+    locked_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    document_snapshot jsonb,
+    hazard_class character varying(16),
+    un_number character varying(16),
+    status_before_suspension character varying(40),
+    submitted_at timestamp with time zone
+);
+
+
+--
+-- Name: customer_truck_assignments; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.customer_truck_assignments (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    plate_number character varying(32) NOT NULL,
+    driver_name character varying(120) NOT NULL,
+    truck_type character varying(60) NOT NULL,
+    assigned_at timestamp with time zone DEFAULT now() NOT NULL,
+    arrived_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    gross_weight_kg numeric(14,2),
+    departed_at timestamp with time zone,
+    tare_weight_tons numeric(14,3),
+    net_weight_tons numeric(14,3),
+    planned_tons numeric(14,3),
+    planned_quantity integer
+);
+
+
+--
+-- Name: customer_truck_containers; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.customer_truck_containers (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    assignment_id uuid NOT NULL,
+    booking_id uuid NOT NULL,
+    container_number character varying(64) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    loaded_at timestamp with time zone
+);
+
+
+--
+-- Name: customers; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.customers (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    user_id uuid NOT NULL,
+    first_name character varying(100) NOT NULL,
+    last_name character varying(100) NOT NULL,
+    email character varying(150) NOT NULL,
+    phone character varying(20) NOT NULL,
+    company_name character varying(200) NOT NULL,
+    company_email character varying(150) NOT NULL,
+    company_phone character varying(20) NOT NULL,
+    company_location character varying(100) NOT NULL,
+    company_address text NOT NULL,
+    customer_type character varying(32),
+    status character varying(32),
+    contact_person_name character varying(100) NOT NULL,
+    contact_person_phone character varying(20) NOT NULL,
+    tin_number character varying(10) NOT NULL,
+    vat_number character varying(50),
+    fan_number character varying(16) NOT NULL,
+    general_manager_name character varying(100) NOT NULL,
+    general_manager_email character varying(150) NOT NULL,
+    general_manager_phone character varying(20) NOT NULL,
+    poa_name character varying(100),
+    poa_phone character varying(20),
+    poa_address text,
+    poa_email character varying(150),
+    poa_location character varying(100),
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: djibouti_import_incidents; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.djibouti_import_incidents (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    booking_id uuid NOT NULL,
+    container_number character varying(80),
+    cargo_id uuid,
+    facility character varying(120),
+    station character varying(120),
+    incident_type character varying(40) NOT NULL,
+    description text NOT NULL,
+    photos jsonb DEFAULT '[]'::jsonb NOT NULL,
+    reported_by character varying(120),
+    reported_at timestamp with time zone NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: drivers; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.drivers (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    license_number character varying NOT NULL,
+    first_name character varying NOT NULL,
+    last_name character varying NOT NULL,
+    email character varying NOT NULL,
+    phone_number character varying NOT NULL,
+    date_of_birth date NOT NULL,
+    license_expiry_date date NOT NULL,
+    status character varying DEFAULT 'ACTIVE'::character varying NOT NULL,
+    vehicle_types_authorized character varying[],
+    address text,
+    emergency_contact character varying,
+    notes text,
+    total_trips integer DEFAULT 0,
+    rating numeric(3,2),
+    created_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted_at timestamp without time zone,
+    fayda_verified boolean DEFAULT false,
+    fayda_sub character varying,
+    gender character varying
+);
+
+
+--
+-- Name: dropdown_options; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.dropdown_options (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    setting_id uuid NOT NULL,
+    value character varying(256) NOT NULL,
+    label character varying(256) NOT NULL,
+    note text,
+    is_disabled boolean DEFAULT false NOT NULL,
+    display_order integer DEFAULT 0 NOT NULL,
+    meta jsonb,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: dropdown_settings; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.dropdown_settings (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    code character varying(128) NOT NULL,
+    label character varying(256) NOT NULL,
+    description text,
+    multiple boolean DEFAULT false NOT NULL,
+    meta jsonb,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: eims_system_state; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.eims_system_state (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    system_number character varying(32) NOT NULL,
+    next_invoice_counter bigint DEFAULT 1 NOT NULL,
+    previous_irn character varying(64),
+    in_flight_invoice_id uuid,
+    in_flight_counter bigint,
+    blocked_reason text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    next_document_number bigint DEFAULT 1 NOT NULL,
+    in_flight_document_number bigint
+);
+
+
+--
+-- Name: empty_container_returns; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.empty_container_returns (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    container_number character varying(80) NOT NULL,
+    booking_id uuid,
+    customer_id uuid,
+    return_date timestamp with time zone NOT NULL,
+    facility character varying(120),
+    yard character varying(120),
+    zone character varying(120),
+    condition text,
+    handover_note text,
+    status character varying(40) DEFAULT 'RETURNED'::character varying NOT NULL,
+    wagon_allocation_reference character varying(120),
+    performed_by character varying(120),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    returned_by character varying(20),
+    status_history jsonb DEFAULT '[]'::jsonb NOT NULL
+);
+
+
+--
+-- Name: exchange_settings; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.exchange_settings (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    fallback_rate numeric(18,6) NOT NULL,
+    fallback_source character varying(16) DEFAULT 'AUTO'::character varying NOT NULL,
+    last_synced_at timestamp with time zone,
+    updated_by_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: external_profiles; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.external_profiles (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    user_id uuid NOT NULL,
+    company_id uuid NOT NULL,
+    first_name character varying(100) NOT NULL,
+    last_name character varying(100) NOT NULL,
+    national_id character varying(50),
+    job_title character varying(100),
+    is_primary_contact boolean DEFAULT false NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    onboarding_step character varying(40),
+    onboarding_completed boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: facilities; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.facilities (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    code character varying(40) NOT NULL,
+    name character varying(160) NOT NULL,
+    description text,
+    facility_type character varying(32) NOT NULL,
+    facility_status character varying(32) DEFAULT 'ACTIVE'::character varying NOT NULL,
+    location_name character varying(200),
+    country character varying(100),
+    city character varying(100),
+    address text,
+    latitude numeric(10,8),
+    longitude numeric(11,8),
+    capacity numeric(14,3),
+    is_active boolean DEFAULT true NOT NULL,
+    notes text,
+    created_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted_at timestamp without time zone
+);
+
+
+--
+-- Name: facility_handling_events; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.facility_handling_events (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    yard_id uuid NOT NULL,
+    train_schedule_id uuid,
+    event_type character varying(10) NOT NULL,
+    grn_number character varying(60),
+    quantity numeric(14,3),
+    weight_tons numeric(14,3),
+    inventory_id uuid,
+    performed_by character varying(120),
+    occurred_at timestamp with time zone DEFAULT now() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: fayda_verification_sessions; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.fayda_verification_sessions (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    state character varying NOT NULL,
+    code_verifier character varying NOT NULL,
+    purpose character varying DEFAULT 'VERIFY'::character varying NOT NULL,
+    platform character varying DEFAULT 'WEB'::character varying NOT NULL,
+    save_to_account boolean DEFAULT false NOT NULL,
+    status character varying DEFAULT 'PENDING'::character varying NOT NULL,
+    error_code character varying,
+    error_description text,
+    iam_user_id uuid,
+    expires_at timestamp with time zone NOT NULL,
+    completed_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: ff_clients; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.ff_clients (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    forwarder_company_id uuid NOT NULL,
+    client_company_id uuid NOT NULL,
+    relationship_type character varying(32) DEFAULT 'managed_account'::character varying NOT NULL,
+    can_book_on_behalf boolean DEFAULT true NOT NULL,
+    can_view_documents boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: file_upload_fields; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.file_upload_fields (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    setting_id uuid NOT NULL,
+    file_key character varying(128) NOT NULL,
+    file_label character varying(256) NOT NULL,
+    help_text text,
+    is_required boolean DEFAULT false NOT NULL,
+    is_multiple boolean DEFAULT false NOT NULL,
+    max_files integer DEFAULT 1 NOT NULL,
+    allowed_extensions text[] DEFAULT '{}'::text[] NOT NULL,
+    max_size_mb integer DEFAULT 10 NOT NULL,
+    display_order integer DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    phase character varying(40),
+    owner_region character varying(5),
+    trade_direction character varying(10),
+    triggers_milestone_code character varying(64),
+    CONSTRAINT "CHK_file_upload_fields_max_files" CHECK ((max_files > 0)),
+    CONSTRAINT "CHK_file_upload_fields_max_size_mb" CHECK ((max_size_mb > 0))
+);
+
+
+--
+-- Name: file_upload_settings; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.file_upload_settings (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    code character varying(128) NOT NULL,
+    label character varying(256) NOT NULL,
+    description text,
+    entity character varying(32) DEFAULT 'other'::character varying NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: files; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.files (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    resource_id uuid NOT NULL,
+    resource character varying(100) NOT NULL,
+    code character varying(100) NOT NULL,
+    name character varying(500) NOT NULL,
+    url text NOT NULL,
+    size integer NOT NULL,
+    mime_type character varying(255) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    review_status character varying(32),
+    review_note text,
+    reviewed_by uuid,
+    reviewed_at timestamp with time zone,
+    replaced_by_user_id uuid,
+    replace_reason text,
+    title character varying(300),
+    visible_to_customer boolean DEFAULT false NOT NULL,
+    uploaded_by_user_id uuid,
+    uploaded_by_name character varying(200)
+);
+
+
+--
+-- Name: first_mile; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.first_mile (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    status character varying(30) DEFAULT 'PAYMENT_PENDING'::character varying NOT NULL,
+    advanced_payment numeric(14,2) DEFAULT 0 NOT NULL,
+    remaining_payment numeric(14,2) DEFAULT 0 NOT NULL,
+    estimated_km numeric(10,2),
+    exact_km numeric(10,2),
+    vehicle_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    paid boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: first_mile_container_allocations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.first_mile_container_allocations (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    first_mile_id uuid NOT NULL,
+    container_id uuid NOT NULL,
+    vehicle_id uuid,
+    container_type text NOT NULL,
+    quantity integer DEFAULT 1 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: first_mile_vehicle_assignments; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.first_mile_vehicle_assignments (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    first_mile_id uuid NOT NULL,
+    vehicle_id uuid NOT NULL,
+    container_number character varying,
+    distance_km numeric(10,2),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    tons numeric(14,3),
+    quantity integer
+);
+
+
+--
+-- Name: fleet_events; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.fleet_events (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    event_type character varying NOT NULL,
+    vehicle_id uuid,
+    driver_id uuid,
+    first_mile_id uuid,
+    last_mile_id uuid,
+    from_value character varying,
+    to_value character varying,
+    label character varying,
+    metadata jsonb,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: fuel_consumption; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.fuel_consumption (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    month date NOT NULL,
+    total_liters numeric(10,2) NOT NULL,
+    total_cost numeric(14,2) NOT NULL,
+    total_distance_km numeric(10,2) NOT NULL,
+    fuel_efficiency_km_per_l numeric(10,2),
+    number_of_purchases integer DEFAULT 0,
+    average_cost_per_liter numeric(10,2),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: fuel_purchases; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.fuel_purchases (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    purchase_date timestamp with time zone NOT NULL,
+    liters numeric(10,2) NOT NULL,
+    cost_per_liter numeric(10,2) NOT NULL,
+    total_cost numeric(14,2) NOT NULL,
+    fuel_station character varying(255),
+    payment_method character varying(50) DEFAULT 'CASH'::character varying,
+    odometer_reading numeric(10,2),
+    driver_id uuid,
+    receipt_number character varying(255),
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: gps_devices; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.gps_devices (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    imei character varying(20) NOT NULL,
+    name character varying,
+    vehicle_id uuid,
+    status character varying(16) DEFAULT 'REGISTERED'::character varying NOT NULL,
+    last_seen_at timestamp with time zone,
+    last_lat numeric(10,6),
+    last_lng numeric(10,6),
+    last_speed numeric(6,2),
+    last_course integer,
+    last_fix_at timestamp with time zone,
+    voltage_level integer,
+    gsm_level integer,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: gps_positions; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.gps_positions (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    device_id uuid NOT NULL,
+    imei character varying(20) NOT NULL,
+    vehicle_id uuid,
+    lat numeric(10,6) NOT NULL,
+    lng numeric(10,6) NOT NULL,
+    speed numeric(6,2) DEFAULT 0 NOT NULL,
+    course integer DEFAULT 0 NOT NULL,
+    satellites integer DEFAULT 0 NOT NULL,
+    positioned boolean DEFAULT false NOT NULL,
+    gps_time timestamp with time zone NOT NULL,
+    alarm integer DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: import_customs_finalizations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.import_customs_finalizations (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    booking_id uuid NOT NULL,
+    documents jsonb DEFAULT '{}'::jsonb NOT NULL,
+    declaration_serial_number character varying(120),
+    duties_taxes_notified_at timestamp with time zone,
+    duties_taxes_paid_at timestamp with time zone,
+    customs_risk character varying(12),
+    import_release_permitted_at timestamp with time zone,
+    completed_at timestamp with time zone,
+    performed_by character varying(120),
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: import_djibouti_operations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.import_djibouti_operations (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    train_schedule_id uuid NOT NULL,
+    documents jsonb DEFAULT '{}'::jsonb NOT NULL,
+    gatepass_granted_at timestamp with time zone,
+    ready_for_loading_at timestamp with time zone,
+    loaded_on_train_at timestamp with time zone,
+    departed_from_djibouti_at timestamp with time zone,
+    load_list_generated_at timestamp with time zone,
+    performed_by character varying(120),
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: incidents; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.incidents (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    vehicle_id uuid,
+    driver_id uuid,
+    booking_id uuid,
+    type character varying NOT NULL,
+    severity character varying NOT NULL,
+    occurred_at timestamp with time zone NOT NULL,
+    location character varying,
+    description text NOT NULL,
+    damage_estimate numeric(14,2),
+    status character varying DEFAULT 'REPORTED'::character varying NOT NULL,
+    insurance_claim_number character varying,
+    reported_by character varying
+);
+
+
+--
+-- Name: interchange_document_items; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.interchange_document_items (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    interchange_document_id uuid NOT NULL,
+    booking_id uuid,
+    booking_reference character varying(64),
+    item_type character varying(20) NOT NULL,
+    booking_container_id uuid,
+    booking_cargo_id uuid,
+    container_number character varying(64),
+    seal_number character varying(100),
+    cargo_id uuid,
+    cargo_type character varying(255),
+    cargo_description text,
+    weight numeric(14,3),
+    quantity numeric(12,3),
+    package_count integer,
+    wagon_number character varying(80),
+    condition_status character varying(20) DEFAULT 'GOOD'::character varying NOT NULL,
+    damage_description text,
+    remarks text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: interchange_documents; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.interchange_documents (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    document_no character varying(40) NOT NULL,
+    direction character varying(10) NOT NULL,
+    schedule_id uuid,
+    train_no character varying(40),
+    route_id uuid,
+    origin_facility_id uuid,
+    destination_facility_id uuid,
+    handover_location character varying(255) NOT NULL,
+    handover_from character varying(255) NOT NULL,
+    handover_to character varying(255) NOT NULL,
+    operator_name character varying(255),
+    port_operator_name character varying(255),
+    shipping_line_name character varying(255),
+    customs_reference character varying(120),
+    manifest_reference character varying(120),
+    status character varying(20) DEFAULT 'DRAFT'::character varying NOT NULL,
+    generated_at timestamp with time zone,
+    acknowledged_at timestamp with time zone,
+    generated_by character varying(120),
+    acknowledged_by character varying(120),
+    remarks text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: invoice_lines; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.invoice_lines (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    invoice_id uuid NOT NULL,
+    charge_type character varying NOT NULL,
+    description character varying(255),
+    quantity numeric(12,2) DEFAULT 1 NOT NULL,
+    unit_rate numeric(14,2) DEFAULT 0 NOT NULL,
+    amount numeric(14,2) NOT NULL,
+    currency character varying(8) DEFAULT 'ETB'::character varying NOT NULL,
+    metadata jsonb,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: invoices; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.invoices (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    invoice_number character varying(64) NOT NULL,
+    company_id uuid NOT NULL,
+    company_profile_id uuid NOT NULL,
+    total_amount numeric(14,2) NOT NULL,
+    currency character varying(8) DEFAULT 'ETB'::character varying NOT NULL,
+    status freight.invoices_status_enum DEFAULT 'DRAFT'::freight.invoices_status_enum NOT NULL,
+    source character varying(255) NOT NULL,
+    source_id character varying(255) NOT NULL,
+    type character varying(255) NOT NULL,
+    issued_at timestamp with time zone,
+    payment_id uuid,
+    due_at timestamp with time zone NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    subtotal_amount numeric(14,2) DEFAULT 0 NOT NULL,
+    tax_amount numeric(14,2) DEFAULT 0 NOT NULL,
+    paid_amount numeric(14,2) DEFAULT 0 NOT NULL,
+    balance_amount numeric(14,2) DEFAULT 0 NOT NULL,
+    paid_at timestamp with time zone,
+    payments jsonb DEFAULT '[]'::jsonb NOT NULL,
+    eims_status character varying(20) DEFAULT 'NOT_SUBMITTED'::character varying NOT NULL,
+    eims_irn character varying(64),
+    eims_invoice_counter bigint,
+    eims_submitted_at timestamp with time zone,
+    eims_ack_date character varying(64),
+    eims_last_error jsonb,
+    eims_document_number character varying(16)
+);
+
+
+--
+-- Name: last_mile; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.last_mile (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    status character varying(30) DEFAULT 'PAYMENT_PENDING'::character varying NOT NULL,
+    advanced_payment numeric(14,2) DEFAULT 0 NOT NULL,
+    remaining_payment numeric(14,2) DEFAULT 0 NOT NULL,
+    estimated_km numeric(10,2),
+    exact_km numeric(10,2),
+    vehicle_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    paid boolean DEFAULT false NOT NULL,
+    arrived_at timestamp with time zone,
+    delivered_at timestamp with time zone,
+    pod_recipient_name character varying(160),
+    pod_signature_file_id uuid,
+    pod_photo_file_ids text[] DEFAULT '{}'::text[] NOT NULL,
+    pod_notes text,
+    pod_captured_at timestamp with time zone
+);
+
+
+--
+-- Name: last_mile_container_allocations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.last_mile_container_allocations (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    last_mile_id uuid NOT NULL,
+    container_id uuid NOT NULL,
+    vehicle_id uuid,
+    container_type text NOT NULL,
+    quantity integer DEFAULT 1 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: last_mile_requests; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.last_mile_requests (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    booking_id uuid NOT NULL,
+    train_schedule_id uuid NOT NULL,
+    status character varying(30) DEFAULT 'AWAITING_CONFIRMATION'::character varying NOT NULL,
+    requested_container_numbers text[],
+    reminder_sent_at timestamp with time zone,
+    submitted_by_user_id uuid,
+    submitted_at timestamp with time zone,
+    reviewed_by_staff_id uuid,
+    reviewed_at timestamp with time zone,
+    rejection_reason text,
+    resulting_last_mile_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    requested_delivery_date date,
+    approved_advance_amount numeric(14,2),
+    contract_summary jsonb,
+    contract_generated_at timestamp with time zone,
+    customer_signed_at timestamp with time zone,
+    signer_display_name character varying(160),
+    consent_text text
+);
+
+
+--
+-- Name: last_mile_vehicle_assignments; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.last_mile_vehicle_assignments (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    last_mile_id uuid NOT NULL,
+    vehicle_id uuid NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    container_number character varying,
+    distance_km numeric(10,2),
+    arrived_at timestamp with time zone,
+    departed_at timestamp with time zone,
+    gross_weight_tons numeric(14,3),
+    net_weight_tons numeric(14,3),
+    destination_arrived_at timestamp with time zone,
+    returned_at timestamp with time zone
+);
+
+
+--
+-- Name: last_mile_vehicle_containers; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.last_mile_vehicle_containers (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    assignment_id uuid NOT NULL,
+    last_mile_id uuid NOT NULL,
+    container_number character varying(32) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: locomotives; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.locomotives (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    code character varying(32) NOT NULL,
+    name character varying(100),
+    max_pull_weight_tons numeric(10,3) NOT NULL,
+    status character varying(20) DEFAULT 'AVAILABLE'::character varying NOT NULL,
+    available_from timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    locomotive_type character varying(20) DEFAULT 'DIESEL'::character varying NOT NULL,
+    max_train_length_meters numeric(10,3) DEFAULT 760 NOT NULL,
+    power_kw numeric(10,3),
+    traction_force_kn numeric(10,3),
+    max_speed_kmh numeric(10,3),
+    current_yard_id uuid,
+    overage_tolerance_tons numeric(10,3),
+    overage_tolerance_meters numeric(10,3)
+);
+
+
+--
+-- Name: maintenance_costs; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.maintenance_costs (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    maintenance_schedule_id uuid,
+    incurred_date timestamp with time zone NOT NULL,
+    cost_amount numeric(14,2) NOT NULL,
+    cost_type character varying NOT NULL,
+    description character varying NOT NULL,
+    service_provider character varying,
+    invoice_number character varying,
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: maintenance_intervals; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.maintenance_intervals (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    maintenance_type character varying NOT NULL,
+    interval_km numeric(14,2),
+    interval_days integer,
+    description text,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    service_item character varying(120)
+);
+
+
+--
+-- Name: maintenance_schedules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.maintenance_schedules (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    maintenance_type character varying NOT NULL,
+    description character varying NOT NULL,
+    scheduled_date timestamp with time zone NOT NULL,
+    completed_date timestamp with time zone,
+    estimated_cost numeric(14,2),
+    actual_cost numeric(14,2),
+    status character varying DEFAULT 'SCHEDULED'::character varying NOT NULL,
+    odometer_reading numeric,
+    service_provider character varying,
+    notes text,
+    next_due_km numeric,
+    next_due_date timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    due_notified_at timestamp with time zone,
+    service_item character varying(120)
+);
+
+
+--
+-- Name: migrations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.migrations (
+    id integer NOT NULL,
+    "timestamp" bigint NOT NULL,
+    name character varying NOT NULL
+);
+
+
+--
+-- Name: migrations_id_seq; Type: SEQUENCE; Schema: freight; Owner: -
+--
+
+CREATE SEQUENCE freight.migrations_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: migrations_id_seq; Type: SEQUENCE OWNED BY; Schema: freight; Owner: -
+--
+
+ALTER SEQUENCE freight.migrations_id_seq OWNED BY freight.migrations.id;
+
+
+--
+-- Name: notifications; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.notifications (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    recipient_user_id uuid NOT NULL,
+    audience character varying(20) NOT NULL,
+    type character varying(48) DEFAULT 'GENERIC'::character varying NOT NULL,
+    title character varying(200) NOT NULL,
+    body text NOT NULL,
+    link character varying,
+    data jsonb,
+    priority character varying(12) DEFAULT 'NORMAL'::character varying NOT NULL,
+    is_read boolean DEFAULT false NOT NULL,
+    read_at timestamp with time zone,
+    channels_sent jsonb,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: otp_verifications; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.otp_verifications (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    phone character varying,
+    otp character varying NOT NULL,
+    verified boolean DEFAULT false NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    email character varying
+);
+
+
+--
+-- Name: parts; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.parts (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    name character varying NOT NULL,
+    sku character varying,
+    category character varying,
+    quantity_in_stock integer DEFAULT 0 NOT NULL,
+    reorder_level integer DEFAULT 0 NOT NULL,
+    unit_cost numeric(14,2),
+    location character varying,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: payment_refunds; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.payment_refunds (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    payment_id uuid NOT NULL,
+    amount_minor integer NOT NULL,
+    reason character varying(255),
+    provider_refund_id character varying(255),
+    status character varying(50) NOT NULL,
+    created_at timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+--
+-- Name: payment_webhook_events; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.payment_webhook_events (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    provider freight.payment_webhook_method_enum NOT NULL,
+    external_event_id character varying(255) NOT NULL,
+    merchant_order_id character varying(255),
+    provider_txn_id character varying(255),
+    signature_valid boolean NOT NULL,
+    status character varying(100) NOT NULL,
+    payload jsonb NOT NULL,
+    received_at timestamp without time zone DEFAULT now() NOT NULL,
+    processed_at timestamp without time zone,
+    processing_error text
+);
+
+
+--
+-- Name: payments; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.payments (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    ref_id character varying(255) NOT NULL,
+    type character varying(50) NOT NULL,
+    method freight.payments_method_enum NOT NULL,
+    currency freight.payments_currency_enum NOT NULL,
+    amount numeric NOT NULL,
+    raw_initiation jsonb DEFAULT '{}'::jsonb NOT NULL,
+    client_action jsonb,
+    merchant_order_id character varying(255) NOT NULL,
+    transaction_id character varying(255),
+    status freight.payments_status_enum DEFAULT 'action-required'::freight.payments_status_enum NOT NULL,
+    paid_at timestamp without time zone,
+    refunded_at timestamp without time zone,
+    expires_at timestamp without time zone,
+    failer_code character varying(30),
+    failer_message character varying(255),
+    reason character varying(255),
+    created_at timestamp without time zone DEFAULT now() NOT NULL,
+    reference_type character varying(40)
+);
+
+
+--
+-- Name: priority_configs; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.priority_configs (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    type character varying(20) NOT NULL,
+    label character varying(100) NOT NULL,
+    currency character varying(5),
+    min_wagon_count integer NOT NULL,
+    max_wagon_count integer NOT NULL,
+    score_points integer DEFAULT 0 NOT NULL,
+    is_active boolean DEFAULT false NOT NULL,
+    display_order integer DEFAULT 1 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    CONSTRAINT chk_currency_for_type CHECK (((((type)::text = 'WAGON'::text) AND (currency IS NULL)) OR (((type)::text = 'CURRENCY'::text) AND (currency IS NOT NULL)) OR (((type)::text = 'CUSTOMS'::text) AND (currency IS NULL)))),
+    CONSTRAINT chk_wagon_range CHECK ((min_wagon_count <= max_wagon_count)),
+    CONSTRAINT priority_configs_type_check CHECK (((type)::text = ANY (ARRAY[('WAGON'::character varying)::text, ('CURRENCY'::character varying)::text, ('CUSTOMS'::character varying)::text])))
+);
+
+
+--
+-- Name: priority_rule_change_requests; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.priority_rule_change_requests (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    action character varying(10) NOT NULL,
+    priority_config_id uuid,
+    payload jsonb,
+    status character varying(10) DEFAULT 'PENDING'::character varying NOT NULL,
+    requested_by_user_id uuid,
+    decided_by_user_id uuid,
+    decided_at timestamp with time zone,
+    decision_note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: priority_rules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.priority_rules (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    is_active boolean DEFAULT false NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    code character varying(40) NOT NULL,
+    label character varying(100) NOT NULL,
+    score integer DEFAULT 0 NOT NULL,
+    condition_currency character varying(5)
+);
+
+
+--
+-- Name: rate_change_requests; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.rate_change_requests (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    rate_id uuid NOT NULL,
+    payload jsonb NOT NULL,
+    previous_values jsonb NOT NULL,
+    status character varying(10) DEFAULT 'PENDING'::character varying NOT NULL,
+    requested_by_user_id uuid,
+    decided_by_user_id uuid,
+    decided_at timestamp with time zone,
+    decision_note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: rates; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.rates (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    rate_type character varying(50) NOT NULL,
+    container_type_id uuid,
+    trade_direction character varying(10),
+    currency character varying(5) NOT NULL,
+    rate_value numeric(14,4) NOT NULL,
+    rate_unit character varying(30) NOT NULL,
+    status character varying(20) DEFAULT 'DRAFT'::character varying NOT NULL,
+    proposed_by_staff_id uuid NOT NULL,
+    approved_by_ceo_id uuid,
+    approved_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    applies_to character varying(20) DEFAULT 'OTHER'::character varying NOT NULL,
+    trigger character varying(20) DEFAULT 'ALWAYS'::character varying NOT NULL,
+    cargo_type_id uuid,
+    origin_yard_id uuid,
+    destination_yard_id uuid,
+    min_km numeric(10,2),
+    max_km numeric(10,2),
+    CONSTRAINT "CK_rates_km_band" CHECK (((max_km IS NULL) OR ((min_km IS NOT NULL) AND (max_km > min_km)))),
+    CONSTRAINT "CK_rates_yard_scope" CHECK (((deleted_at IS NOT NULL) OR ((status)::text = 'SUPERSEDED'::text) OR
+CASE
+    WHEN ((((trigger)::text = 'ALWAYS'::text) AND ((applies_to)::text = ANY (ARRAY[('BULK'::character varying)::text, ('CONTAINER'::character varying)::text, ('INTERCITY'::character varying)::text]))) OR ((trigger)::text = ANY (ARRAY[('CUSTOMS_CLEARANCE'::character varying)::text, ('WITH_RETURN'::character varying)::text]))) THEN ((origin_yard_id IS NOT NULL) AND (destination_yard_id IS NOT NULL))
+    ELSE ((origin_yard_id IS NULL) AND (destination_yard_id IS NULL))
+END))
+);
+
+
+--
+-- Name: route_milestones; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.route_milestones (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    route_id uuid NOT NULL,
+    yard_id uuid NOT NULL,
+    sequence_no integer NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    distance_km numeric(10,2)
+);
+
+
+--
+-- Name: routes; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.routes (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    origin_yard_id uuid NOT NULL,
+    destination_yard_id uuid NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    status character varying(32) DEFAULT 'AVAILABLE'::character varying NOT NULL,
+    direction character varying(10) NOT NULL,
+    CONSTRAINT chk_routes_direction CHECK (((direction)::text = ANY (ARRAY[('IMPORT'::character varying)::text, ('EXPORT'::character varying)::text, ('DOMESTIC'::character varying)::text])))
+);
+
+
+--
+-- Name: saved_signatures; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.saved_signatures (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    user_id uuid NOT NULL,
+    signer_display_name character varying(200) NOT NULL,
+    signature_file_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    stamp_file_id uuid
+);
+
+
+--
+-- Name: schedule_wagon_adjustment_logs; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.schedule_wagon_adjustment_logs (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    train_schedule_id uuid NOT NULL,
+    train_id uuid NOT NULL,
+    action character varying(10) NOT NULL,
+    wagon_id uuid NOT NULL,
+    wagon_number character varying(50) NOT NULL,
+    adjusted_by_user_id uuid,
+    occurred_at timestamp with time zone DEFAULT now() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    yard_id uuid
+);
+
+
+--
+-- Name: scheduling_events; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.scheduling_events (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    train_schedule_id uuid NOT NULL,
+    trigger character varying(40) NOT NULL,
+    actor_user_id uuid,
+    reason text,
+    plan_snapshot jsonb DEFAULT '{}'::jsonb NOT NULL,
+    displaced_booking_ids jsonb DEFAULT '[]'::jsonb NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: seq_company_profile_ex; Type: SEQUENCE; Schema: freight; Owner: -
+--
+
+CREATE SEQUENCE freight.seq_company_profile_ex
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_company_profile_ffe; Type: SEQUENCE; Schema: freight; Owner: -
+--
+
+CREATE SEQUENCE freight.seq_company_profile_ffe
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_company_profile_fwj; Type: SEQUENCE; Schema: freight; Owner: -
+--
+
+CREATE SEQUENCE freight.seq_company_profile_fwj
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_company_profile_im; Type: SEQUENCE; Schema: freight; Owner: -
+--
+
+CREATE SEQUENCE freight.seq_company_profile_im
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: seq_company_profile_tr; Type: SEQUENCE; Schema: freight; Owner: -
+--
+
+CREATE SEQUENCE freight.seq_company_profile_tr
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: service_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.service_types (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    service_name character varying(255) NOT NULL,
+    description text,
+    can_be_booked_alone boolean DEFAULT true NOT NULL,
+    includes_first_mile boolean DEFAULT false NOT NULL,
+    includes_last_mile boolean DEFAULT false NOT NULL,
+    includes_customs boolean DEFAULT false NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    display_order integer DEFAULT 1 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    code character varying(50) NOT NULL
+);
+
+
+--
+-- Name: shipping_lines; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.shipping_lines (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    code character varying(20) NOT NULL,
+    label character varying(100) NOT NULL,
+    mapped_to_code character varying(20),
+    show_extra_fee_notice boolean DEFAULT false NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: support_conversations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.support_conversations (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    company_id uuid NOT NULL,
+    company_name character varying(200),
+    created_by_user_id uuid,
+    last_message_at timestamp with time zone,
+    last_message_preview character varying(280),
+    last_message_author_role character varying(12),
+    customer_last_read_at timestamp with time zone,
+    agent_last_read_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: support_document_versions; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.support_document_versions (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    document_id uuid NOT NULL,
+    version integer NOT NULL,
+    payload jsonb NOT NULL,
+    actor_id uuid,
+    note character varying(255),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: support_documents; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.support_documents (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    slug character varying(32) NOT NULL,
+    payload jsonb DEFAULT '{}'::jsonb NOT NULL,
+    version integer DEFAULT 1 NOT NULL,
+    updated_by_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: support_messages; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.support_messages (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    conversation_id uuid NOT NULL,
+    author_user_id uuid NOT NULL,
+    author_role character varying(12) NOT NULL,
+    author_name character varying(200),
+    body text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: tracking_events; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.tracking_events (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    consignment_id uuid NOT NULL,
+    location character varying(256) NOT NULL,
+    status freight.tracking_events_status_enum NOT NULL,
+    occurred_at timestamp with time zone NOT NULL,
+    description text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: train_checkpoint_events; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_checkpoint_events (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    train_schedule_id uuid NOT NULL,
+    yard_id uuid NOT NULL,
+    sequence_no integer NOT NULL,
+    kind character varying(20) NOT NULL,
+    occurred_at timestamp with time zone DEFAULT now() NOT NULL,
+    note text,
+    recorded_by_user_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: train_composition_removal_logs; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_composition_removal_logs (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    schedule_id uuid NOT NULL,
+    booking_id uuid NOT NULL,
+    booking_reference character varying(64),
+    removed_by_user_id uuid,
+    removed_at timestamp with time zone DEFAULT now() NOT NULL,
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: train_locomotives; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_locomotives (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    train_id uuid NOT NULL,
+    locomotive_id uuid NOT NULL,
+    sequence_no integer DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: train_schedule_bookings; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_schedule_bookings (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    train_schedule_id uuid NOT NULL,
+    booking_id uuid NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    loading_status character varying(20) DEFAULT 'UNLOADED'::character varying NOT NULL
+);
+
+
+--
+-- Name: train_schedules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_schedules (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    train_set_id uuid NOT NULL,
+    origin_station_id uuid NOT NULL,
+    destination_station_id uuid NOT NULL,
+    scheduled_departure_date timestamp with time zone NOT NULL,
+    scheduled_arrival_date timestamp with time zone,
+    status character varying(20) DEFAULT 'DRAFT'::character varying NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    route_id uuid,
+    train_number character varying(20),
+    direction character varying(10),
+    actual_departure_at timestamp with time zone,
+    actual_arrival_at timestamp with time zone,
+    prepared_by_user_id uuid,
+    checked_by_user_id uuid,
+    max_wagons integer DEFAULT 53 NOT NULL,
+    booking_window_status character varying(10) DEFAULT 'OPEN'::character varying NOT NULL,
+    window_phase character varying(20),
+    window_opens_at timestamp with time zone,
+    window_closes_at timestamp with time zone,
+    doc_review_ends_at timestamp with time zone,
+    doc_review_completed_at timestamp with time zone,
+    payment_phase_ends_at timestamp with time zone,
+    booking_cycle_no integer DEFAULT 0 NOT NULL,
+    rule_window_open_hour integer,
+    rule_window_duration_hours numeric(6,4),
+    rule_reopen_delay_minutes integer,
+    rule_import_window_lead_days integer,
+    rule_export_booking_lead_hours integer,
+    rule_window_close_hour integer,
+    reference character varying(20),
+    wagon_allocation_snapshot jsonb,
+    rule_import_close_offset_minutes integer,
+    rule_export_close_offset_minutes integer,
+    reverse_wagon_order boolean DEFAULT false NOT NULL,
+    rule_payment_window_minutes integer,
+    window_rule_custom boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: train_scheduling_global_rules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_scheduling_global_rules (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    max_train_length_meters numeric(10,2) DEFAULT 760 NOT NULL,
+    max_train_weight_tons numeric(10,3) DEFAULT 3500 NOT NULL,
+    max_wagons_per_train integer DEFAULT 53 NOT NULL,
+    max_20ft_container_weight_tons numeric(8,3) DEFAULT 30 NOT NULL,
+    max_20ft_pair_weight_diff_tons numeric(8,3) DEFAULT 10 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    import_window_lead_days integer DEFAULT 3 NOT NULL,
+    export_booking_lead_hours integer DEFAULT 24 NOT NULL,
+    window_open_hour integer DEFAULT 8 NOT NULL,
+    window_duration_hours numeric(6,4) DEFAULT 3 NOT NULL,
+    doc_review_minutes integer DEFAULT 30 NOT NULL,
+    payment_window_minutes integer DEFAULT 60 NOT NULL,
+    window_close_hour integer DEFAULT 17 NOT NULL,
+    import_close_offset_minutes integer,
+    export_close_offset_minutes integer,
+    export_payment_window_minutes integer DEFAULT 60 NOT NULL
+);
+
+
+--
+-- Name: train_set_locomotives; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_set_locomotives (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    train_set_id uuid NOT NULL,
+    locomotive_id uuid NOT NULL,
+    sequence_no integer DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: train_set_wagons; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_set_wagons (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    train_set_id uuid NOT NULL,
+    wagon_type_id uuid NOT NULL,
+    sequence_no integer NOT NULL,
+    capacity_tons numeric(10,3) NOT NULL,
+    length_meters numeric(10,3) NOT NULL,
+    assigned_weight_tons numeric(10,3) DEFAULT 0 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    physical_wagon_id uuid,
+    status character varying(20) DEFAULT 'PLANNED'::character varying NOT NULL,
+    board_yard_id uuid,
+    alight_yard_id uuid
+);
+
+
+--
+-- Name: train_sets; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.train_sets (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    locomotive_id uuid NOT NULL,
+    total_weight_tons numeric(10,3) NOT NULL,
+    total_length_meters numeric(10,3) NOT NULL,
+    wagon_count integer NOT NULL,
+    status character varying(20) DEFAULT 'DRAFT'::character varying NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    train_id uuid
+);
+
+
+--
+-- Name: trains; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.trains (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    code character varying(32) NOT NULL,
+    capacity_tons numeric(10,2) DEFAULT 0 NOT NULL,
+    status freight.train_status DEFAULT 'AVAILABLE'::freight.train_status NOT NULL,
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    train_number character varying(20),
+    train_name character varying(100),
+    route_id uuid,
+    origin_station_id uuid,
+    destination_station_id uuid,
+    departure_time timestamp with time zone,
+    arrival_time timestamp with time zone,
+    locomotive_number character varying(50),
+    remarks text,
+    current_yard_id uuid,
+    import_train_number character varying(20),
+    export_train_number character varying(20)
+);
+
+
+--
+-- Name: transit_agents; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.transit_agents (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    name character varying(150) NOT NULL,
+    valid_from date NOT NULL,
+    valid_to date NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: truck_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.truck_types (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    code character varying(32) NOT NULL,
+    name character varying(100) NOT NULL,
+    capacity_tons numeric(10,3),
+    has_trailer boolean DEFAULT false NOT NULL,
+    description text,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: user_trade_access; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.user_trade_access (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    user_id uuid NOT NULL,
+    directions text DEFAULT ''::text NOT NULL,
+    updated_by_id uuid,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: vehicles; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.vehicles (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    plate_number character varying NOT NULL,
+    registration_number character varying NOT NULL,
+    vehicle_type character varying NOT NULL,
+    manufacturer character varying NOT NULL,
+    model character varying NOT NULL,
+    year integer NOT NULL,
+    fuel_type character varying NOT NULL,
+    capacity numeric NOT NULL,
+    status character varying DEFAULT 'ACTIVE'::character varying NOT NULL,
+    description text,
+    created_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at timestamp without time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted_at timestamp without time zone,
+    assigned_driver_id uuid,
+    assigned_driver_name character varying,
+    code character varying,
+    power_plate_no character varying,
+    trailer_plate_no character varying,
+    estimated_distance_km numeric,
+    actual_distance_km numeric,
+    location_id uuid,
+    availability character varying DEFAULT 'FREE'::character varying,
+    vin character varying,
+    ownership character varying,
+    insurance_expiry date,
+    registration_expiry date,
+    next_inspection_date date,
+    price_per_km numeric(14,2),
+    currency character varying(8) DEFAULT 'ETB'::character varying NOT NULL,
+    truck_type_id uuid
+);
+
+
+--
+-- Name: vendors; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.vendors (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    name character varying NOT NULL,
+    type character varying,
+    contact_person character varying,
+    phone character varying,
+    email character varying,
+    address character varying,
+    is_active boolean DEFAULT true NOT NULL
+);
+
+
+--
+-- Name: wagon_allocation_bulk_loads; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagon_allocation_bulk_loads (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    wagon_booking_allocation_id uuid NOT NULL,
+    booking_id uuid NOT NULL,
+    cargo_type_id uuid,
+    cargo_description text,
+    pricing_unit character varying(20) DEFAULT 'PER_TON'::character varying NOT NULL,
+    quantity numeric(12,3) DEFAULT 0 NOT NULL,
+    weight_tons numeric(10,3) DEFAULT 0 NOT NULL,
+    truck_plate_number character varying(32),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: wagon_allocation_container_items; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagon_allocation_container_items (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    wagon_booking_allocation_id uuid NOT NULL,
+    booking_container_id uuid,
+    container_id uuid,
+    container_number character varying(64),
+    container_type_id uuid,
+    position_on_wagon smallint,
+    seal_number character varying(64),
+    chassis_number character varying(64),
+    gross_weight_tons numeric(10,3),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: wagon_booking_allocations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagon_booking_allocations (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    train_set_wagon_id uuid NOT NULL,
+    booking_id uuid NOT NULL,
+    allocated_weight_tons numeric(10,3) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    load_type character varying(20),
+    status character varying(20) DEFAULT 'PLANNED'::character varying NOT NULL,
+    confirmed_at timestamp with time zone,
+    confirmed_by_user_id uuid
+);
+
+
+--
+-- Name: wagon_movements; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagon_movements (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    wagon_id uuid NOT NULL,
+    from_yard_id uuid,
+    to_yard_id uuid NOT NULL,
+    train_schedule_id uuid,
+    booking_id uuid,
+    kind character varying(30) NOT NULL,
+    moved_by_user_id uuid,
+    occurred_at timestamp with time zone DEFAULT now() NOT NULL,
+    note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    transfer_request_id uuid
+);
+
+
+--
+-- Name: wagon_status_logs; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagon_status_logs (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    wagon_id uuid NOT NULL,
+    from_status character varying(30) NOT NULL,
+    to_status character varying(30) NOT NULL,
+    changed_by_user_id uuid,
+    note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: wagon_transfer_requests; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagon_transfer_requests (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    from_yard_id uuid NOT NULL,
+    to_yard_id uuid NOT NULL,
+    wagon_type_id uuid NOT NULL,
+    quantity integer NOT NULL,
+    status character varying(20) DEFAULT 'PENDING'::character varying NOT NULL,
+    requested_by_user_id uuid,
+    fulfilled_by_user_id uuid,
+    fulfilled_at timestamp with time zone,
+    note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    reason text,
+    fulfilled_quantity integer DEFAULT 0 NOT NULL,
+    closed_short_at timestamp with time zone,
+    closed_short_by_user_id uuid,
+    CONSTRAINT chk_wtr_quantity CHECK ((quantity > 0))
+);
+
+
+--
+-- Name: wagon_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagon_types (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    code character varying(32) NOT NULL,
+    name character varying(100) NOT NULL,
+    capacity_tons numeric(10,3) NOT NULL,
+    length_meters numeric(10,3) NOT NULL,
+    supported_load_types text[] DEFAULT '{}'::text[] NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    equated_length_m numeric(10,3),
+    tare_weight_tons numeric(10,3) NOT NULL,
+    supports_container boolean DEFAULT false NOT NULL,
+    max_container_gross_t numeric(10,3)
+);
+
+
+--
+-- Name: wagons; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.wagons (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    wagon_number character varying NOT NULL,
+    wagon_type_id uuid NOT NULL,
+    train_id uuid,
+    sequence_number integer,
+    status character varying DEFAULT 'AVAILABLE'::character varying NOT NULL,
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    current_location_yard_id uuid,
+    train_set_wagon_id uuid,
+    current_train_schedule_id uuid,
+    current_yard_id uuid,
+    export_train_number character varying(20),
+    import_train_number character varying(20)
+);
+
+
+--
+-- Name: warehouse_accrual_acks; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_accrual_acks (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    inventory_id uuid NOT NULL,
+    acknowledged_by uuid,
+    acknowledged_at timestamp with time zone DEFAULT now() NOT NULL,
+    snooze_until timestamp with time zone,
+    note text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL
+);
+
+
+--
+-- Name: warehouse_activity_log; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_activity_log (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    inventory_id uuid,
+    warehouse_id uuid,
+    activity_type character varying(40) NOT NULL,
+    description text,
+    performed_by character varying(120),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: warehouse_allocation_rules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_allocation_rules (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    name character varying(160) NOT NULL,
+    priority integer DEFAULT 100 NOT NULL,
+    freight_type character varying(16),
+    trade_direction character varying(16),
+    cargo_type_code character varying(50),
+    container_status character varying(24),
+    requires_inspection boolean,
+    target_facility_code character varying(40),
+    target_yard_code character varying(40) NOT NULL,
+    target_warehouse_code character varying(40),
+    target_zone_code character varying(40),
+    storage_type character varying(80),
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: warehouse_fee_rules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_fee_rules (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    name character varying(160) NOT NULL,
+    rule_type character varying(20) NOT NULL,
+    priority integer DEFAULT 100 NOT NULL,
+    freight_type character varying(16),
+    trade_direction character varying(16),
+    cargo_type_code character varying(50),
+    container_type character varying(40),
+    facility_id uuid,
+    warehouse_id uuid,
+    yard_id uuid,
+    zone_id uuid,
+    free_days integer DEFAULT 0 NOT NULL,
+    rate_per_day numeric(14,2) DEFAULT 0 NOT NULL,
+    tiers jsonb DEFAULT '[]'::jsonb NOT NULL,
+    currency character varying(8) DEFAULT 'USD'::character varying NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    basis character varying(20),
+    free_hours integer,
+    vehicle_type character varying(32)
+);
+
+
+--
+-- Name: warehouse_inspection_reports; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_inspection_reports (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    inventory_id uuid NOT NULL,
+    booking_id uuid,
+    customer_id uuid,
+    report_type character varying(32) DEFAULT 'INSPECTION'::character varying NOT NULL,
+    inspection_status character varying(20) DEFAULT 'NEEDS_REVIEW'::character varying NOT NULL,
+    has_damage boolean DEFAULT false NOT NULL,
+    damage_description text,
+    has_weight_loss boolean DEFAULT false NOT NULL,
+    expected_weight numeric(14,3),
+    actual_weight numeric(14,3),
+    weight_loss numeric(14,3),
+    weight_loss_unit character varying(12),
+    has_missing_items boolean DEFAULT false NOT NULL,
+    missing_items_description text,
+    remarks text,
+    inspected_by_id uuid,
+    inspected_at timestamp with time zone,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: warehouse_inventory; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_inventory (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    warehouse_id uuid NOT NULL,
+    yard_id uuid NOT NULL,
+    zone_id uuid NOT NULL,
+    booking_id uuid,
+    cargo_id uuid,
+    container_id uuid,
+    goods_id uuid,
+    quantity numeric(12,3) DEFAULT 0 NOT NULL,
+    weight numeric(14,3) DEFAULT 0 NOT NULL,
+    volume numeric(12,3),
+    status character varying(32) DEFAULT 'RECEIVED'::character varying NOT NULL,
+    inspection_status character varying(20),
+    arrived_at timestamp with time zone,
+    inspected_at timestamp with time zone,
+    ready_for_loading_at timestamp with time zone,
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    stored_at timestamp with time zone,
+    reserved_at timestamp with time zone,
+    loaded_at timestamp with time zone,
+    dispatched_at timestamp with time zone,
+    inspection_started_at timestamp with time zone,
+    inspection_completed_at timestamp with time zone,
+    ready_for_pickup_at timestamp with time zone,
+    release_date timestamp with time zone,
+    gate_cleared_at timestamp with time zone,
+    release_order_reference character varying(100),
+    delivered_at timestamp with time zone,
+    unloaded_at timestamp with time zone,
+    grn_number character varying(100)
+);
+
+
+--
+-- Name: warehouse_inventory_movement; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_inventory_movement (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    inventory_id uuid NOT NULL,
+    from_warehouse_id uuid NOT NULL,
+    from_yard_id uuid NOT NULL,
+    from_zone_id uuid NOT NULL,
+    to_warehouse_id uuid NOT NULL,
+    to_yard_id uuid NOT NULL,
+    to_zone_id uuid NOT NULL,
+    remarks text,
+    moved_by character varying(120),
+    moved_at timestamp with time zone DEFAULT now() NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: warehouse_loadings; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_loadings (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    warehouse_inventory_id uuid NOT NULL,
+    booking_id uuid,
+    wagon_id uuid,
+    loaded_at timestamp with time zone DEFAULT now() NOT NULL,
+    loaded_by character varying(120),
+    loaded_weight numeric(14,3),
+    notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    train_schedule_id uuid
+);
+
+
+--
+-- Name: warehouse_yard_cargo_types; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_yard_cargo_types (
+    yard_id uuid NOT NULL,
+    cargo_type_id uuid NOT NULL
+);
+
+
+--
+-- Name: warehouse_yards; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_yards (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    warehouse_id uuid NOT NULL,
+    name character varying(160) NOT NULL,
+    code character varying(40) NOT NULL,
+    type character varying(32) NOT NULL,
+    capacity_weight numeric(14,3),
+    capacity_containers integer,
+    current_weight numeric(14,3) DEFAULT 0 NOT NULL,
+    current_containers integer DEFAULT 0 NOT NULL,
+    status character varying(16) DEFAULT 'ACTIVE'::character varying NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    max_weight numeric(14,3),
+    max_volume numeric(14,3),
+    current_volume numeric(14,3) DEFAULT 0 NOT NULL,
+    direction character varying(10)
+);
+
+
+--
+-- Name: warehouse_zones; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouse_zones (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    yard_id uuid NOT NULL,
+    name character varying(160) NOT NULL,
+    code character varying(40) NOT NULL,
+    type character varying(32) NOT NULL,
+    capacity_weight numeric(14,3),
+    capacity_containers integer,
+    current_weight numeric(14,3) DEFAULT 0 NOT NULL,
+    current_containers integer DEFAULT 0 NOT NULL,
+    status character varying(16) DEFAULT 'ACTIVE'::character varying NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    max_weight numeric(14,3),
+    max_volume numeric(14,3),
+    current_volume numeric(14,3) DEFAULT 0 NOT NULL
+);
+
+
+--
+-- Name: warehouses; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warehouses (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    name character varying(160) NOT NULL,
+    code character varying(40) NOT NULL,
+    type character varying(32) NOT NULL,
+    station_id uuid,
+    location_name character varying(200),
+    capacity_weight numeric(14,3),
+    capacity_containers integer,
+    current_weight numeric(14,3) DEFAULT 0 NOT NULL,
+    current_containers integer DEFAULT 0 NOT NULL,
+    status character varying(16) DEFAULT 'ACTIVE'::character varying NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    max_weight numeric(14,3),
+    max_volume numeric(14,3),
+    current_volume numeric(14,3) DEFAULT 0 NOT NULL,
+    facility_id uuid
+);
+
+
+--
+-- Name: warranties; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.warranties (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    component character varying NOT NULL,
+    provider character varying,
+    start_date date,
+    expiry_date date NOT NULL,
+    coverage_notes text,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: weight_limit_rules; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.weight_limit_rules (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    container_type_id uuid NOT NULL,
+    trade_direction freight.weight_limit_rules_trade_direction_enum NOT NULL,
+    max_vgm_tons numeric(8,3) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    max_capacity_tons numeric(8,3)
+);
+
+
+--
+-- Name: work_orders; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.work_orders (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    vehicle_id uuid NOT NULL,
+    title character varying NOT NULL,
+    description text,
+    status character varying DEFAULT 'OPEN'::character varying NOT NULL,
+    priority character varying DEFAULT 'MEDIUM'::character varying NOT NULL,
+    assigned_to character varying,
+    opened_at timestamp with time zone DEFAULT now() NOT NULL,
+    closed_at timestamp with time zone,
+    labor_cost numeric(14,2),
+    parts_cost numeric(14,2),
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: yard_distances; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.yard_distances (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    from_yard_id uuid NOT NULL,
+    to_yard_id uuid NOT NULL,
+    distance_km numeric(10,2) NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: yard_facilities; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.yard_facilities (
+    id uuid DEFAULT gen_random_uuid() NOT NULL,
+    yard_id uuid NOT NULL,
+    has_warehouse boolean DEFAULT false NOT NULL,
+    equipment_notes text,
+    is_active boolean DEFAULT true NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    handles_container boolean DEFAULT true NOT NULL,
+    handles_bulk boolean DEFAULT true NOT NULL,
+    has_container_facility_origin boolean DEFAULT false NOT NULL,
+    has_bulk_facility_origin boolean DEFAULT false NOT NULL,
+    has_container_facility_destination boolean DEFAULT false NOT NULL,
+    has_bulk_facility_destination boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: yard_locations; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.yard_locations (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    yard_id uuid NOT NULL,
+    latitude double precision NOT NULL,
+    longitude double precision NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone
+);
+
+
+--
+-- Name: yards; Type: TABLE; Schema: freight; Owner: -
+--
+
+CREATE TABLE freight.yards (
+    id uuid DEFAULT public.uuid_generate_v4() NOT NULL,
+    code character varying(40) NOT NULL,
+    label character varying(100) NOT NULL,
+    country character varying(50) NOT NULL,
+    is_active boolean DEFAULT true NOT NULL,
+    display_order integer DEFAULT 1 NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    deleted_at timestamp with time zone,
+    has_facility boolean DEFAULT false NOT NULL,
+    CONSTRAINT chk_yards_country CHECK (((country)::text = ANY (ARRAY[('Ethiopia'::character varying)::text, ('Djibouti'::character varying)::text])))
+);
+
+
+--
+-- Name: migrations id; Type: DEFAULT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.migrations ALTER COLUMN id SET DEFAULT nextval('freight.migrations_id_seq'::regclass);
+
+
+--
+-- Data for Name: approval_rules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.approval_rules VALUES
+	('81387cd7-ed52-42ed-ae87-5d02dc7aa3b0', true, 2, '-marketing-chief', 'Final Signature', NULL, '2026-07-27 11:31:59.766128+00', '2026-08-04 07:54:54.260045+00', NULL),
+	('650cf1bb-5979-42cc-9ded-16afcd86651b', true, 1, '-marketing-director-', 'Review & Approve', 'LINE_STAFF', '2026-07-27 11:31:59.766128+00', '2026-08-04 07:55:18.030364+00', NULL),
+	('03aed9fb-ef7f-4f61-b65d-cb5e73d33fcd', false, 1, '-marketing-officer-', 'Review & Approve', NULL, '2026-07-27 11:31:59.766128+00', '2026-08-04 07:55:55.39793+00', NULL),
+	('1b1d75c5-1bc2-47d4-9ee2-82a402cca7fd', false, 2, '-marketing-director-', 'Final Signature', 'LINE_STAFF', '2026-07-27 11:31:59.766128+00', '2026-08-04 07:56:12.788711+00', NULL);
+
+
+--
+-- Data for Name: asset_acquisitions; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: asset_disposals; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_batch_offers; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_cargo_modifier; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_container; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.booking_container VALUES
+	('32c1db2c-8f1e-4b2b-ae38-803d6751b8a9', '346725c9-6075-4283-a59d-c0cfb58d2e52', '349072e7-8a90-4c03-b682-08976abfd7e8', 8, 28.000, 224.000, 8.00, NULL, false, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, NULL, NULL, 0, 0, 0),
+	('4342bb79-d2ef-4d48-b2f9-8a7f0466be7f', 'dc105e51-7acd-4706-a7a0-b77dc4b28059', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 12, 20.000, 240.000, 6.00, NULL, false, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, NULL, NULL, 0, 0, 0),
+	('240b0700-ecc9-4566-bbfb-791c57fc5579', 'd733c2dd-f5f0-4b88-b675-1447fc30d821', '349072e7-8a90-4c03-b682-08976abfd7e8', 6, 30.000, 180.000, 6.00, NULL, false, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, NULL, NULL, 0, 0, 0),
+	('071271bd-7584-4dca-b49b-a70387644a3e', 'd1d73d4d-c2c9-4025-af7c-5c2c5327e9f1', '349072e7-8a90-4c03-b682-08976abfd7e8', 7, 28.000, 196.000, 7.00, NULL, false, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, NULL, NULL, 0, 0, 0),
+	('1444e5eb-7821-4166-b8d3-1a4683b31837', '524ef40f-a1ee-401d-8ecb-f1ce9f5374e4', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 11, 20.000, 220.000, 5.50, NULL, false, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, NULL, NULL, 0, 0, 0),
+	('6368b06d-de96-470b-8b2a-d7ed53bb1d84', 'ec0da804-5163-4f1f-87a7-8a9215159146', '349072e7-8a90-4c03-b682-08976abfd7e8', 4, 32.000, 128.000, 4.00, NULL, false, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, NULL, NULL, 0, 0, 0);
+
+
+--
+-- Data for Name: booking_container_allocations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_container_units; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.booking_container_units VALUES
+	('493efbca-6da3-49c9-9b97-43b9b154bedb', '32c1db2c-8f1e-4b2b-ae38-803d6751b8a9', 'LMRT1234567', NULL, 28.000, false, false, 0, '2026-08-09 20:45:34.697299+00', '2026-08-09 20:45:34.697299+00', NULL, false, NULL, NULL, false);
+
+
+--
+-- Data for Name: booking_contract_signatures; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_document_review; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_handovers; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_rate_snapshot; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_requests; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_review_note; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: booking_wagon_cancellations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: bookings; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.bookings VALUES
+	('346725c9-6075-4283-a59d-c0cfb58d2e52', 'PAID-IMP-001', NULL, NULL, 'APPROVED', '2026-07-01 08:00:00+00', 5600.00, 'PAID', 'NEW', 'IMPORT', 'WITHOUT_RETURN', NULL, 'Akaki Industrial Zone, Addis Ababa', 224.000, false, 'ETB', NULL, NULL, NULL, 1, NULL, '2026-08-09 20:15:36.225+00', NULL, NULL, NULL, NULL, 20, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, '7d1b9c9c-372a-41ea-8125-363163fc6351', '91c3912b-036a-4a09-b9f7-f70d0da0b717', '76ec1857-294d-4eef-95ab-84b0eff3261c', NULL, 'Demo container cargo', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CONTAINER', NULL, NULL, NULL, '300d5510-e3a5-4858-bc28-6e3beda8ca80', 8.00, 'NOT_SCHEDULED', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, '245bde93-5dfd-4adf-9b1a-5386169a46ec', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 8.8808000, 38.7876000, false, NULL, false, '2026-07-01 08:00:00+00', NULL, NULL, 'CUSTOMER', NULL, NULL, NULL, NULL, NULL, 0.000, 0.000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'ONE_TIME', NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('dc105e51-7acd-4706-a7a0-b77dc4b28059', 'PAID-IMP-002', NULL, NULL, 'APPROVED', '2026-07-02 08:00:00+00', 6000.00, 'PAID', 'NEW', 'IMPORT', 'WITHOUT_RETURN', NULL, 'Kality Logistics Hub, Addis Ababa', 240.000, false, 'ETB', NULL, NULL, NULL, 1, NULL, '2026-08-09 20:15:36.241+00', NULL, NULL, NULL, NULL, 20, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, '7d1b9c9c-372a-41ea-8125-363163fc6351', '91c3912b-036a-4a09-b9f7-f70d0da0b717', '76ec1857-294d-4eef-95ab-84b0eff3261c', NULL, 'Demo container cargo', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CONTAINER', NULL, NULL, NULL, '300d5510-e3a5-4858-bc28-6e3beda8ca80', 6.00, 'NOT_SCHEDULED', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, '245bde93-5dfd-4adf-9b1a-5386169a46ec', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 8.9137000, 38.7815000, false, NULL, false, '2026-07-02 08:00:00+00', NULL, NULL, 'CUSTOMER', NULL, NULL, NULL, NULL, NULL, 0.000, 0.000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'ONE_TIME', NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d733c2dd-f5f0-4b88-b675-1447fc30d821', 'PAID-IMP-003', NULL, NULL, 'APPROVED', '2026-07-03 08:00:00+00', 4500.00, 'PAID', 'NEW', 'IMPORT', 'WITHOUT_RETURN', NULL, 'Bole Lemi Industrial Park, Addis Ababa', 180.000, false, 'ETB', NULL, NULL, NULL, 1, NULL, '2026-08-09 20:15:36.249+00', NULL, NULL, NULL, NULL, 20, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, '7d1b9c9c-372a-41ea-8125-363163fc6351', '91c3912b-036a-4a09-b9f7-f70d0da0b717', '76ec1857-294d-4eef-95ab-84b0eff3261c', NULL, 'Demo container cargo', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CONTAINER', NULL, NULL, NULL, '300d5510-e3a5-4858-bc28-6e3beda8ca80', 6.00, 'NOT_SCHEDULED', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, '245bde93-5dfd-4adf-9b1a-5386169a46ec', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 8.9806000, 38.8736000, false, NULL, false, '2026-07-03 08:00:00+00', NULL, NULL, 'CUSTOMER', NULL, NULL, NULL, NULL, NULL, 0.000, 0.000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'ONE_TIME', NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d1d73d4d-c2c9-4025-af7c-5c2c5327e9f1', 'PAID-EXP-001', NULL, NULL, 'APPROVED', '2026-07-01 10:00:00+00', 4900.00, 'PAID', 'NEW', 'EXPORT', 'WITHOUT_RETURN', 'Bole Lemi Industrial Park, Addis Ababa', NULL, 196.000, false, 'ETB', NULL, NULL, NULL, 1, NULL, '2026-08-09 20:15:36.258+00', NULL, NULL, NULL, NULL, 20, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, '91c3912b-036a-4a09-b9f7-f70d0da0b717', '7d1b9c9c-372a-41ea-8125-363163fc6351', '76ec1857-294d-4eef-95ab-84b0eff3261c', NULL, 'Demo container cargo', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CONTAINER', NULL, NULL, NULL, '300d5510-e3a5-4858-bc28-6e3beda8ca80', 7.00, 'NOT_SCHEDULED', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, '245bde93-5dfd-4adf-9b1a-5386169a46ec', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 8.9806000, 38.8736000, NULL, NULL, false, NULL, false, '2026-07-01 10:00:00+00', NULL, NULL, 'CUSTOMER', NULL, NULL, NULL, NULL, NULL, 0.000, 0.000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'ONE_TIME', NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('524ef40f-a1ee-401d-8ecb-f1ce9f5374e4', 'PAID-EXP-002', NULL, NULL, 'APPROVED', '2026-07-02 10:00:00+00', 5500.00, 'PAID', 'NEW', 'EXPORT', 'WITHOUT_RETURN', 'Akaki Industrial Zone, Addis Ababa', NULL, 220.000, false, 'ETB', NULL, NULL, NULL, 1, NULL, '2026-08-09 20:15:36.267+00', NULL, NULL, NULL, NULL, 20, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, '91c3912b-036a-4a09-b9f7-f70d0da0b717', '7d1b9c9c-372a-41ea-8125-363163fc6351', '76ec1857-294d-4eef-95ab-84b0eff3261c', NULL, 'Demo container cargo', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CONTAINER', NULL, NULL, NULL, '300d5510-e3a5-4858-bc28-6e3beda8ca80', 5.50, 'NOT_SCHEDULED', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, '245bde93-5dfd-4adf-9b1a-5386169a46ec', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 8.8808000, 38.7876000, NULL, NULL, false, NULL, false, '2026-07-02 10:00:00+00', NULL, NULL, 'CUSTOMER', NULL, NULL, NULL, NULL, NULL, 0.000, 0.000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'ONE_TIME', NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ec0da804-5163-4f1f-87a7-8a9215159146', 'PAID-EXP-003', NULL, NULL, 'APPROVED', '2026-07-03 10:00:00+00', 3200.00, 'PAID', 'NEW', 'EXPORT', 'WITHOUT_RETURN', 'Kality Logistics Hub, Addis Ababa', NULL, 128.000, false, 'ETB', NULL, NULL, NULL, 1, NULL, '2026-08-09 20:15:36.275+00', NULL, NULL, NULL, NULL, 20, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, '91c3912b-036a-4a09-b9f7-f70d0da0b717', '7d1b9c9c-372a-41ea-8125-363163fc6351', '76ec1857-294d-4eef-95ab-84b0eff3261c', NULL, 'Demo container cargo', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'CONTAINER', NULL, NULL, NULL, '300d5510-e3a5-4858-bc28-6e3beda8ca80', 4.00, 'NOT_SCHEDULED', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, '245bde93-5dfd-4adf-9b1a-5386169a46ec', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 8.9137000, 38.7815000, NULL, NULL, false, NULL, false, '2026-07-03 10:00:00+00', NULL, NULL, 'CUSTOMER', NULL, NULL, NULL, NULL, NULL, 0.000, 0.000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'ONE_TIME', NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+
+--
+-- Data for Name: cargo_type_wagon_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.cargo_type_wagon_types VALUES
+	('654618d6-a380-4e4c-aa60-2bb1c299066a', '8eec3a7d-8482-4397-96b6-59a028210722'),
+	('8291ccc3-0dd9-4d78-aa44-284d028a19ce', '8eec3a7d-8482-4397-96b6-59a028210722'),
+	('9afd8eb3-975b-4ea7-a7db-04eb2c20a04d', '8eec3a7d-8482-4397-96b6-59a028210722'),
+	('8942884d-9991-42bb-87f7-a70930f8c43c', 'efed186d-7062-4b0f-b3fe-6e793accc364'),
+	('8942884d-9991-42bb-87f7-a70930f8c43c', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc'),
+	('8291ccc3-0dd9-4d78-aa44-284d028a19ce', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7'),
+	('654618d6-a380-4e4c-aa60-2bb1c299066a', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7'),
+	('28bc4d22-5bc5-4917-b1af-bb08d28f2a05', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7');
+
+
+--
+-- Data for Name: cargo_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.cargo_types VALUES
+	('01819bdb-e8c5-4691-ab99-1b351c5dc5b8', 'Break Bulk', NULL, false, true, 3, '2026-07-17 08:11:10.616+00', '2026-07-17 08:11:10.616+00', NULL, 'BREAK_BULK', NULL, false, NULL, NULL, false),
+	('7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', 'Bulk', NULL, false, true, 2, '2026-07-17 08:10:31.902+00', '2026-07-21 06:42:40.053+00', NULL, 'BULK', NULL, false, NULL, NULL, false),
+	('eb5f5443-5801-48d1-8bb8-7494645c5e10', 'Edible Oil', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 5, '2026-07-17 08:12:08.784+00', '2026-07-22 13:30:11.083+00', NULL, 'EDIBLE_OIL', 'PER_TON', false, NULL, NULL, false),
+	('b92c7644-ac4c-46bf-80bb-6c5c07151e07', 'Cereal', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 7, '2026-07-17 08:12:42.731+00', '2026-07-22 13:30:14.763+00', NULL, 'CEREAL', 'PER_TON', false, NULL, NULL, false),
+	('ba24cc4b-f8a0-4e5e-b111-aebaaf96fd00', 'Rice', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 9, '2026-07-17 08:13:07.476+00', '2026-07-22 13:30:23.977+00', NULL, 'RICE', 'PER_TON', false, NULL, NULL, false),
+	('e08693a4-ce28-4f2d-aca3-58537d4cb8bb', 'Plastic Barrel', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 13, '2026-07-17 08:15:30.092+00', '2026-07-22 13:30:28.952+00', NULL, 'PLASTIC_BARREL', 'PER_TON', false, NULL, NULL, false),
+	('a5991d3a-d690-4b7e-98fd-ea3333aa16e7', 'Perishable', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 14, '2026-07-17 11:09:25.02+00', '2026-07-22 13:30:33.208+00', NULL, 'PERISHABLE', 'PER_TON', false, NULL, NULL, false),
+	('d700fe89-18f4-40ce-860a-7c6b17966929', 'Livestock', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 15, '2026-07-17 11:10:13.881+00', '2026-07-22 13:30:37.803+00', NULL, 'LIVESTOCK', 'PER_TON', false, NULL, NULL, false),
+	('b0de5ed1-6bc1-47b7-ab27-a519b27d4f02', 'Truck', '01819bdb-e8c5-4691-ab99-1b351c5dc5b8', true, true, 11, '2026-07-17 08:14:06.53+00', '2026-07-22 13:30:55.108+00', NULL, 'TRUCK', 'PER_ITEM', false, NULL, NULL, false),
+	('bc9989ca-878c-43a7-ad2b-2a6c7899c956', 'Automobile', '01819bdb-e8c5-4691-ab99-1b351c5dc5b8', true, true, 12, '2026-07-17 08:14:24.494+00', '2026-07-22 13:31:00.55+00', NULL, 'AUTOMOBILE', 'PER_ITEM', false, NULL, NULL, false),
+	('9afd8eb3-975b-4ea7-a7db-04eb2c20a04d', 'Beans', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 8, '2026-07-17 08:12:55.727+00', '2026-07-23 08:35:07.031+00', NULL, 'BEANS', 'PER_TON', false, NULL, NULL, false),
+	('8942884d-9991-42bb-87f7-a70930f8c43c', 'Sand', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', false, true, 16, '2026-08-04 13:16:23.713991+00', '2026-08-04 13:16:23.713991+00', NULL, 'SAND', 'PER_TON', false, NULL, NULL, false),
+	('9462ef16-5609-4d5c-8f0d-d0acdb0f8b06', 'Bagged material ', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 17, '2026-08-05 12:21:43.982192+00', '2026-08-05 12:21:43.982192+00', NULL, 'BAGGED_MATERIAL', 'PER_TON', false, NULL, NULL, false),
+	('700bbbb8-e31d-4860-8227-47a5496dd81b', 'Sugar', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 18, '2026-08-05 13:11:44.508815+00', '2026-08-05 13:11:44.508815+00', NULL, 'SUGAR', 'PER_TON', false, NULL, NULL, false),
+	('9c2bc39e-1fe8-418c-b187-c0b2329faeb9', 'Barley ', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 19, '2026-08-05 13:11:57.854525+00', '2026-08-05 13:11:57.854525+00', NULL, 'BARLEY', 'PER_TON', false, NULL, NULL, false),
+	('8291ccc3-0dd9-4d78-aa44-284d028a19ce', 'Steel Billet', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 4, '2026-07-17 08:11:46.837+00', '2026-08-05 21:41:38.88368+00', NULL, 'STEEL_BILLET', 'PER_TON', false, NULL, '{"8eec3a7d-8482-4397-96b6-59a028210722": 10, "8f717b09-eec1-46ad-be3d-2dc0a56e55e7": 40}', false),
+	('654618d6-a380-4e4c-aa60-2bb1c299066a', 'Wheat', '7b65e1a1-3ea2-4983-90a9-9f8c55b8e6a8', true, true, 6, '2026-07-17 08:12:27.364+00', '2026-08-07 08:02:34.071071+00', NULL, 'WHEAT', 'PER_TON', false, NULL, '{"8eec3a7d-8482-4397-96b6-59a028210722": 20, "8f717b09-eec1-46ad-be3d-2dc0a56e55e7": 30}', false),
+	('28bc4d22-5bc5-4917-b1af-bb08d28f2a05', 'Machinery', '01819bdb-e8c5-4691-ab99-1b351c5dc5b8', true, true, 10, '2026-07-17 08:13:36.728+00', '2026-08-07 13:35:47.802609+00', NULL, 'MACHINERY', 'PER_ITEM', false, '{"8f717b09-eec1-46ad-be3d-2dc0a56e55e7": 2}', NULL, false);
+
+
+--
+-- Data for Name: cargoes; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: clearance_incidents; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: clearance_milestones; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: companies; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.companies VALUES
+	('37f9df6c-95a8-41a6-81fc-4ece3c31a712', 'DROGA PHARMACY PLC', 'customer', 'pending', '0106791545', '4109476001', NULL, 'Ethiopia', '443/ሀ, 08, Yeka, Addis Ababa, Addis Ababa', '+251923495365', 'hilina@gmail.com', NULL, '{"gmName": null, "gmEmail": null, "gmPhone": null, "poaName": "Hilina Melese Argaw", "gmGender": null, "poaPhone": "+251983828931", "gmAddress": null, "ownerName": "Naod Zerihun Abasiessie", "poaGender": "Female", "gmFaydaSub": null, "ownerEmail": "hilina@gmail.com", "ownerPhone": "+251923495365", "poaAddress": "Woreda 09 , Gullele , Addis Ababa ", "gmBirthdate": null, "ownerGender": "Male", "poaFaydaSub": "346656481773876498640208713502828683", "ownerAddress": "Woreda 09 , Nifas Silk-Lafto , Addis Ababa ", "poaBirthdate": "1994/12/25", "gmSameAsOwner": null, "ownerFaydaSub": "289187692944872799283592982484991027", "ownerBirthdate": "1994/04/01", "contactPersonName": "Naod Zerihun Abasiessie", "gmFaydaVerifiedAt": null, "contactPersonEmail": "hilina@gmail.com", "contactPersonPhone": "+251923495365", "generalManagerName": null, "poaFaydaVerifiedAt": "2026-08-09T12:13:50.422Z", "generalManagerEmail": null, "generalManagerPhone": null, "ownerFaydaVerifiedAt": "2026-08-09T11:56:55.950Z"}', '2026-08-09 11:55:07.463423+00', '2026-08-09 14:03:01.699685+00', NULL, NULL, NULL, NULL, NULL, NULL, 'ethiopian', 'AACATB/14/672/50355147/2018', 'Is active', '4/22/2026', '4/22/2026', '4/22/2026', '12/31/2026', 'Addis Ababa', 'Addis Ababa', 'Yeka', '08', '443/ሀ', '+251913667537', 'commercial', NULL),
+	('300d5510-e3a5-4858-bc28-6e3beda8ca80', 'Paid Import/Export Mile Demo Customer', 'customer', 'active', 'PAIDMILE01', 'PAIDMILE01', 'PMD0000000000001', 'Ethiopia', 'Addis Ababa', '251900000202', 'paid-mile-demo@edr.local', NULL, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, 'Paid Mile Demo', '251900000202', 'Demo Manager', 'paid-mile-demo@edr.local', '251900000202', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'commercial', NULL);
+
+
+--
+-- Data for Name: company_change_request; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: company_profiles; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.company_profiles VALUES
+	('532231d2-5be3-4aec-bacc-2d3a25fc5eb3', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', 'importer', NULL, 'pending', NULL, NULL, '2026-08-09 11:55:07.47001+00', '2026-08-09 11:55:07.47001+00', NULL, NULL, NULL, NULL, NULL),
+	('dfd3c985-79bb-487f-ac21-e68c6f91d06e', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', 'exporter', NULL, 'pending', NULL, NULL, '2026-08-09 11:55:07.471931+00', '2026-08-09 11:55:07.471931+00', NULL, NULL, NULL, NULL, NULL),
+	('0ef21f70-a710-4669-9c22-de7f2988177b', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', 'freight_forwarder', NULL, 'pending', NULL, NULL, '2026-08-09 11:55:21.399242+00', '2026-08-09 11:55:21.399242+00', NULL, NULL, NULL, NULL, NULL),
+	('245bde93-5dfd-4adf-9b1a-5386169a46ec', '300d5510-e3a5-4858-bc28-6e3beda8ca80', 'importer', NULL, 'active', 'PMD-LIC-0001', NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, NULL, NULL, NULL, NULL);
+
+
+--
+-- Data for Name: company_revisions; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.company_revisions VALUES
+	('a91bc6eb-d7f0-43cf-936b-7e1d6151341e', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', '70b7c52e-cd3c-4b74-89ea-3e4bd6c312c5', '12 fields changed', '[{"to": "DROGA PHARMACY PLC", "from": "Hilina''s company", "field": "name", "label": "Company name"}, {"to": "443/ሀ, 08, Yeka, Addis Ababa, Addis Ababa", "from": null, "field": "address", "label": "Address"}, {"to": "0106791545", "from": "D257513756", "field": "tin", "label": "TIN"}, {"to": "4109476001", "from": null, "field": "vatNumber", "label": "VAT number"}, {"to": "AACATB/14/672/50355147/2018", "from": null, "field": "licenceNumber", "label": "Licence number"}, {"to": "Addis Ababa", "from": null, "field": "region", "label": "Region"}, {"to": "Addis Ababa", "from": null, "field": "zone", "label": "Zone"}, {"to": "Yeka", "from": null, "field": "woreda", "label": "Woreda"}, {"to": "08", "from": null, "field": "kebele", "label": "Kebele"}, {"to": "443/ሀ", "from": null, "field": "houseNo", "label": "House No"}, {"to": "hilina@gmail.com", "from": null, "field": "email", "label": "Email"}, {"to": "+251923495365", "from": null, "field": "phone", "label": "Phone"}]', '2026-08-09 12:01:37.515024+00', '2026-08-09 12:01:37.515024+00', NULL),
+	('7a341d8a-2b30-4ac0-9dc7-b611d1dc9820', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', '70b7c52e-cd3c-4b74-89ea-3e4bd6c312c5', 'contact person name, contact person email, contact person phone changed', '[{"to": "Naod Zerihun Abasiessie", "from": null, "field": "contactPersonName", "label": "Contact person name"}, {"to": "hilina@gmail.com", "from": null, "field": "contactPersonEmail", "label": "Contact person email"}, {"to": "+251923495365", "from": null, "field": "contactPersonPhone", "label": "Contact person phone"}]', '2026-08-09 12:03:28.827201+00', '2026-08-09 12:03:28.827201+00', NULL),
+	('38ff2f0a-c2ab-4ac7-9eca-bb6db03dbf28', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', '70b7c52e-cd3c-4b74-89ea-3e4bd6c312c5', 'dars delegation paper changed', '[{"to": "sample (1).pdf", "from": null, "field": "document:poa_delegation_letter", "label": "DARS Delegation Paper", "toFileId": "cfbc6c70-fc9d-4fd4-81ba-acf07d5d713d", "fromFileId": null}]', '2026-08-09 12:14:15.139306+00', '2026-08-09 12:14:15.139306+00', NULL);
+
+
+--
+-- Data for Name: compliance_records; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: consignments; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: container_type_wagon_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.container_type_wagon_types VALUES
+	('77cf24ec-e74b-4bdb-b1cc-6f336379cc58', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7'),
+	('349072e7-8a90-4c03-b682-08976abfd7e8', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7'),
+	('77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc'),
+	('349072e7-8a90-4c03-b682-08976abfd7e8', 'efed186d-7062-4b0f-b3fe-6e793accc364'),
+	('349072e7-8a90-4c03-b682-08976abfd7e8', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc'),
+	('77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'efed186d-7062-4b0f-b3fe-6e793accc364'),
+	('349072e7-8a90-4c03-b682-08976abfd7e8', '4f65adc3-baf7-44de-88ad-0a4672fab669');
+
+
+--
+-- Data for Name: container_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.container_types VALUES
+	('77cf24ec-e74b-4bdb-b1cc-6f336379cc58', '20FT', '20FT', true, '2026-07-17 09:32:14.947+00', '2026-08-09 20:15:36.202428+00', NULL, 20, false, false, 1),
+	('349072e7-8a90-4c03-b682-08976abfd7e8', '40FT', '40FT', true, '2026-07-17 09:38:14.519+00', '2026-08-09 20:15:36.202428+00', NULL, 40, false, false, 2);
+
+
+--
+-- Data for Name: containers; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_approval_steps; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_cargo_scope; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_clearance_cycles; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_document_review; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_document_revisions; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_rate_snapshots; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_review_notes; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_routes; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_signatures; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: contract_templates; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.contract_templates VALUES
+	('8a2b08fc-1c9d-44b3-aac2-8b268215314c', 'INTERCITY_CONTAINER', 'Container Intercity Contract', 'Domestic (intercity) container transport by railway between Ethiopian terminals — Galaan Multipurpose Port, Modjo dry port, and Dire Dawa — including empty repositioning.', 'Intercity Container Transport Service by Railway', '["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."]', '[{"id": "objective", "body": "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.\nThe scope of the services comprises:\n- Railway transport service between the agreed origin and destination terminals.\n- Cargo handling at Galaan Multipurpose Port (GMP).", "order": 1, "title": "Objective and Scope of the Services"}, {"id": "client-obligations", "body": "Give written/email/electronic shipment instructions to the Service Provider for transportation of container cargo between the agreed terminals.\nPrepare all necessary documents and facilities for shipment.\nEnsure the minimum supply of containers per shipment agreed with the Service Provider for the selected loading terminal and destination.\nOne flat wagon must carry either one 40ft container or two 20ft containers.\nIf two 20ft containers are loaded on one flat wagon, their weight difference must not exceed 10 tons.\nEnsure timely loading and unloading of cargo.\nAssign representatives at both ends to oversee container handover and ensure the necessary arrangements for cargo reception at the destination upon arrival.\nMaintain and provide detailed cargo information (type, weight, destination, etc.).\nBe responsible for cargo handling, loading, and unloading of both empty and full containers at Modjo and Dire Dawa dry port.\nBook wagons at least five (5) days in advance.\nEnsure containers are ready one day before the planned loading date.\nCollect the full container from Galaan Multipurpose Port (GMP) within three (3) calendar days from the day following the arrival notice.\nIf 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.\nIf 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.\nIn 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.\nCollect 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.\nOnce 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.\nProvide clean empty containers that meet the receiving terminal''s standards; additional cleaning costs incurred due to non-compliance will be borne by the Client.\nEnsure containers are structurally intact and meet weight distribution requirements.\nProhibited cargo: cargo covered with tarpaulin is not allowed due to safety risks.\nNotify the Service Provider forty-eight (48) hours in advance before wagon booking if transporting hazardous or valuable goods.\nIf 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.\nRefund 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.\nPay 100% of the transportation fee in advance for each train set.\nSettle additional penalties due to non-compliance within ten (10) days of invoice issuance.\nLate payment incurs a penalty of an additional 10%.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "Assign the necessary voyage based on the operational schedule and cargo demand, and notify the train schedule 48 hours in advance.\nProvide a list of wagons/voyage or train number 24 hours in advance and update corrections 12 hours before arrival.\nProvide safe transportation of the containers.\nDeliver 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.\nIn 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.\nThe Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous goods.\nIf 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.\nProvide accident or defect reports if needed.\nBuy cargo liability insurance for each wagon.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.\nForce majeure shall be interpreted in accordance with the Ethiopian Civil Code.", "order": 4, "title": "Force Majeure"}, {"id": "pricing", "body": "The applicable rate per 40ft container or per two (2) 20ft containers for the agreed route is set out in the Rate Schedule immediately below, expressed as a unit price per origin → destination lane and per container.\nIf cargo exceeds 40 tons per two 20ft containers of gross weight, additional charges apply proportionally.\nGross weight shall be the total sum of cargo, packing, and container tare weight.\nPayment for any additional tonnage shall be made in advance before the container is loaded onto the wagon.\nThe 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.\nAdditional costs (if applicable):\n- 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.\n- 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.\nAll payments shall be made one hundred percent (100%) in advance.\nPayment 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.", "order": 5, "title": "Contract Price and Terms of Payment"}, {"id": "contract-documents", "body": "The following documents constitute this contract:\n- Amendments (if any).\n- This Contract Agreement.\n- Final minutes of negotiation (if any).\nIf there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.", "order": 6, "title": "Contract Documents"}, {"id": "documentation", "body": "Equipment Interchange Receipt, Railway Waybill, Container Carriage Acceptance Sheet, and incidental charges (if any).\nPayment summary as per the agreed contract price (if required).", "order": 7, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "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.\nThe 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.\nUpon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.", "order": 8, "title": "Consignment Notes"}, {"id": "amendment", "body": "This contract can be amended by mutual agreement.\nNotwithstanding 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.", "order": 9, "title": "Amendment"}, {"id": "termination", "body": "The contract may be terminated:\n- By mutual agreement.\n- Upon completion of the contract period or agreed cargo shipments.\n- If either party breaches fundamental terms.", "order": 10, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "The contract is valid once signed by both parties.", "order": 11, "title": "Contract Effectiveness"}, {"id": "duration", "body": "Valid until August 31, {{contractYear}}, with a possible extension upon mutual agreement.", "order": 12, "title": "Contract Period"}, {"id": "disputes", "body": "Disputes shall be settled amicably.\nIf unresolved, disputes shall be taken to the Federal Court in Addis Ababa.", "order": 13, "title": "Settlement of Disputes"}]', true, '2026-07-27 11:32:03.38554+00', '2026-07-27 11:32:03.38554+00', NULL, NULL, NULL, true),
+	('c5c1537b-bf5a-4f5b-aa73-ddc086f798d3', 'IMPORT_CONTAINER_NO_CUSTOMS', 'Container Import Contract', 'Import container transport by railway from SGTD (Djibouti) to Dire Dawa, Modjo dry port, or Galaan Multipurpose Port, with empty-container return.', 'Import Container Transport Service by Railway', '["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."]', '[{"id": "objective", "body": "To provide railway transportation services for 40ft and/or 20ft full containers from SGTD to Dire Dawa , Modjo dry port, Galaan Multipurpose port (GMP)  and Sebeta Railway Freight station and empty container return from Dire Dawa , Modjo dry port and Galaan Multipurpose port (GMP) and Sebeta Railway Station to SGTD.\nScope of the Services\n- Railway transport service.\n- Cargo handling at Galaan Multipurpose port and Sebeta Railway Station", "order": 1, "title": "Objective and Scope of the Services"}, {"id": "client-obligations", "body": "Give written/email/electronic shipment instructions to the Service Provider for transportation of container cargo from SGTD to Dire Dawa, Modjo dry port, Galaan Multipurpose Port (GMP) and Sebeta Railway Station.\nPrepare all necessary documents and facilities for shipment.\nEnsure the following minimum supply of containers per shipment based on the loading terminal and destination:\n- Minimum of twenty-five (25) 40ft containers or fifty (50) 20ft containers to Modjo dry port.\n- Minimum of ten (10) 40ft containers or twenty (20) 20ft containers to Dire Dawa dry port.\n- Minimum of one (1) 40ft container or two (2) TEU to Galaan Multipurpose Port (GMP).\n- Minimum of one (1) 40ft container or two (2) TEU to Sebeta Railway Station.\nOne flat wagon must carry either one 40ft container or two 20ft containers.\nIf two 20ft containers are loaded on one flat wagon, their weight difference must not exceed 10 tons.\nEnsure timely loading and unloading of cargo.\nAssign representatives at both ends to oversee container handover and ensure the necessary arrangements for cargo reception at the destination upon arrival.\nMaintain and provide detailed cargo information (type, weight, destination, etc.).\nBe responsible for cargo handling, loading, and unloading of both empty and full containers at Modjo, Dire Dawa dry port, and SGTD.\nBook wagons at least five (5) days in advance.\nEnsure containers are ready one day before the planned loading date.\nSubmit 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:\n- Delay of up to twelve (12) hours: 20% of the booked wagon price.\n- Delay exceeding twelve (12) hours but not more than one (1) day: 50% of the booked wagon price.\n- Delay of more than one (1) day: 100% of the booked wagon price.\nCollect the full container from Galaan Multipurpose Port (GMP) within three (3) calendar days from the day following the arrival notice.\nIf 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.\nIf 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.\nIn 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.\nIf 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.\nPenalty charges for delay at SGTD/Nagad upon train arrival: 20 USD per day per 20ft container; 33 USD per day per 40ft container.\nCollect 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.\nFor returning empty containers, deliver to Dire Dawa dry port, Modjo dry port,Galaan Multipurpose Port and Sebeta Railway Station.\nOnce 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.\nProvide 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.\nEnsure containers are structurally intact and meet weight distribution requirements.\nProhibited cargo: cargo covered with tarpaulin is not allowed due to safety risks.\nNotify the Service Provider forty-eight (48) hours in advance before wagon booking if transporting hazardous or valuable goods.\nIf 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.\nRefund 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.\nPay 100% of the transportation fee in advance for each train set.\nSettle additional penalties due to non-compliance within ten (10) days of invoice issuance.\nLate payment incurs a penalty of an additional 10%.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "Assign the necessary voyage based on the operational schedule and cargo demand, and notify the train schedule 48 hours in advance.\nProvide a list of wagons/voyage or train number 24 hours in advance and update corrections 12 hours before arrival.\nProvide safe transportation of the containers.\nDeliver 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.\nReturn empty containers from Dire Dawa, Modjo, Galaan Multipurpose Port and Sebeta Railway Station to SGTD within seven (7) calendar days of receipt.\nIn 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.\nThe Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous goods.\nIf 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.\nProvide accident or defect reports if needed.\nBuy cargo liability insurance for each wagon.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.\nForce majeure shall be interpreted in accordance with the Ethiopian Civil Code.", "order": 4, "title": "Force Majeure"}, {"id": "pricing", "body": "1. From {{schedule.originLabel}} to {{schedule.destinationLabel}} 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.\n1. 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 40 ft and or two 20ft containerswithout empty return.\n1. From SGTD to Gelan 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.\n1. From SGTD to Sebeta Railway Station, the rate is USD 1,993 per one 40ft or USD 2,021 per two 20ft containers with empty return, and USD 1,753 per one 40ft or USD 1,763 per two 20ft containers without empty return.\n1. If cargo exceeds 40 tons per 2*20ft of gross weight, additional charges apply proportionally.\n1. Gross weight shall be the total sum of Cargo, Packing and Container tare weight.\n1. Payment for any additional tonnage shall be made in advance before the container is loaded onto the wagon.\n1. The price of loading and unloading, and Container handling at Modjo , Diredawa dry port and SGTD container railway freight yard is not part of this contract, it is client’s responsibility.\n- Additional Costs (If Applicable):\n- Last mile delivery service by truck, from Galaan Multipurpose port or Modjo to Addis Ababa, Modjo, Sebeta and surrounding areas, shall incur an additional cost, which shall be fully covered by the client.\n- For clients utilizing EDR''s last mile logistics services, the applicable charges shall vary based on the cargo movement route.\n- The charge for last mile delivery-from Galaan Multipurpose port and Modjo dry port or Sebeta railway Station shall be communicated to the client by service provider after receiving the necessary details from the client regarding the cargo destination, type and weight.\n1. Terms of payment\n- All payments shall be made one hundred percent (100%) in advance in United States Dollars (USD).", "order": 5, "title": "Contract Price and Terms of Payment"}, {"id": "contract-documents", "body": "1. The following documents constitute this contract:\n- Amendments (if any)\n- This Contract Agreement\n- Final Minutes of Negotiation (if any)\n1. If there is any discrepancy between the documents, they shall be interpreted prioritized in the order they are listed above", "order": 6, "title": "Contract Documents"}, {"id": "documentation", "body": "Equipment Interchange Receipt of SGTD, Railway Waybill, Container Carriage Acceptance Sheet, and incidental charges (if any).\nPayment summary as per the agreed contract price (if required).", "order": 7, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "1. The service provider must certify the taking over and handing over of the container cargo on Freight Carriage Acceptance Sheet of EDR inappropriate manner and provide to the client.\n1. Freight Carriage Acceptance Sheet shall be prima facie evidence of the receipt of the container cargo by service provider, the kind, number, and weight of the goods.\n1. Upon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.", "order": 8, "title": "Consignment Notes"}, {"id": "amendment", "body": "This contract can be amended by mutual agreement.\nNotwithstanding 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.", "order": 9, "title": "Amendment"}, {"id": "termination", "body": "The contract may be terminated:\n- By mutual agreement.\n- Upon completion of the contract period or agreed cargo shipments.\n- If either party breaches fundamental terms.", "order": 10, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "Valid until {{contractEndDate}} with a possible extension upon mutual agreement.", "order": 11, "title": "Contract Effectiveness"}, {"id": "duration", "body": "Valid until {{contractEndDate}} with a possible extension upon mutual agreement.", "order": 12, "title": "Contract Period"}, {"id": "disputes", "body": "1. Disputes shall be settled amicably.\n1. If unresolved, disputes shall be taken to the Federal Court in Addis Ababa.", "order": 13, "title": "Settlement of Disputes"}]', true, '2026-07-27 11:32:03.38554+00', '2026-08-06 06:34:05.034588+00', NULL, NULL, NULL, true),
+	('52a4ae5c-f5a6-4b24-b253-1d484d9fb7c2', 'EXPORT_CONTAINER_NO_CUSTOMS', 'Container Export Contract', 'Export container transport, freight forwarding, and customs clearing from Galaan Multipurpose Port or Modjo dry port to SGTD container freight station (Djibouti).', 'Export Container Transport, Freight Forwarding and Customs Clearing Service', '["The parties have agreed on the following services: rail transport, customs clearance, transit work, freight forwarding, and handling of container cargo."]', '[{"id": "objective", "body": "1. The objective of this Contract is to provide railway container transport services for 20ft and/or 40ft full containers from Galaan Multipurpose Port (GMP), Modjo Dry Port, Dire Dawa Dry Port, and/or Sebeta Railway Station, Ethiopia, to SGTD, Djibouti, through the Addis Ababa–Djibouti Standard Gauge Railway line.\n1. Scope of the Services\n- The Service Provider shall provide:\n- Railway transportation services for export containers;\n- Cargo handling services at Galaan Multipurpose Port (GMP) and Sebeta Railway station.", "order": 1, "title": "Objective and Scope of the Services"}, {"id": "client-obligations", "body": "1. Provide written instructions, including by email or other electronic means, to the Service Provider for the transportation of container cargo from Galaan Multipurpose Port, Dire Dawa Dry Port, Modjo Dry Port, and/or Sebeta Railway Station to SGTD.\n1. Supply a minimum of two (2) 20ft containers (or an equivalent load to fill one wagon).\n1. Booking requests must be submitted at least Seventy-Two (72) hours before the scheduled train departure and must align with the vessel cut-off time.\n1. Maintain and provide detailed cargo information (type, weight, destination, etc.).\n1. For clients requiring first-mile service, a first-mile service request notice must be submitted no less than seventy-two (72) hours in advance.\n1. All cargo and documents must be delivered to the designated loading station no later than 11:59 PM on the day before the scheduled loading or train departure date.\n1. 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.\n1. The Client shall mandatorily submit a valid Release Order prior to loading the cargo onto the train.\n1. Prepare necessary documents and facilities for shipment.\n1. Submit scanned soft copies of all original shipping and customs documents in advance to EDR, SGTD, and Djibouti Customs at least 24 hours before the train arrives in Djibouti.\n1. The Client shall email the soft copies of EX8/EX3 and T1 documents to Djibouti Customs (customkhaire-dj80@gmail.com), SGTD (abdoulkader.ismail@dct.dj), and to the Client’s Djibouti agent counterpart at least twenty-four (24) hours prior to the train’s arrival in Nagad, Djibouti.\n1. Containers must have 4 undamaged corners.\n1. One wagon must carry either one 40ft container or two 20ft containers.\n1. If two 20ft containers are loaded on one wagon, their weight difference must not exceed 10 tons.\n1. Prohibited Cargo: Cargo covered with tarpaulin is not allowed due to safety risks.\n1. The client shall complete gate pass processing and submit it to Nagad Station for each shipment within eighteen (18) hours after train departure. And ensure necessary arrangements for cargo reception at the destination (SGTD) upon arrival.\n1. If a delay occurs due to incomplete export documentation, customs clearance failure, or any omission attributable to the Client after the arrival of the train at the destination (SGTD), the Client shall pay demurrage charges at the rate of USD 1,690.00 per wagon per day.\n- Demurrage shall accrue as follows:\n- Delay up to twelve (12) hours: 25% of the applicable daily demurrage;\n- Delay exceeding twelve (12) hours but not exceeding twenty-four (24) hours: 50% of the applicable daily demurrage\n- Delay exceeding twelve (12) hours but not exceeding twenty-four (24) hours:100% of the applicable daily demurrage\n1. Demurrage charges shall continue to accrue for each additional calendar day until the cause of delay is rectified and the wagon is released.\n1. In addition to Clause 17, the client may bear additional costs for storage, document preparation, and loading or unloading containers, reimbursed by the client per official receipt.\n1. If the client fails to deliver the container, complete export documents as per Article 2, Sub-Article 6, or cancels after wagon reservation, they shall pay USD 150.00 per wagon as a penalty.\n1. 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.\n1. 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.\n1. If the cargo to be transported is dangerous and/or valuable goods, the client shall notify the service provider 48 (Forty-eight) hours before the Wagon booking.\n1. 100% of the transportation fee must be paid in advance for each train set.\n1. Additional penalties due to non-compliance must be settled within 10 days of invoice issuance.\n1. Late payment shall incur a penalty of 10%.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "1. Provide the voyage number 24 hours in advance and update corrections 12 hours before departure.\n1. Assign necessary train and notify the train schedule 48 hours in advance.\n1. Provide safe transportation of the containers.\n1. Deliver the cargo within two days after train departure, assuming all required documents are submitted on time Under normal condition.\n1. If any operational, technical, or mechanical problem occurs to through out the transit , the Service Provider shall notify customs and arrange cargo transfer within 4 days if the incident occurs in Ethiopia, or within 6 days if it occurs in Djibouti.\n1. The Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous good.\n1. The Service Provider reserves the right to unload or detach containers or wagons at Nagad station if the Client fails to submit the complete set of required documents necessary for port unloading.\n1. Provide accident or defect reports if needed.\n1. The Service Provider shall maintain reasonable railway carrier liability insurance coverage for cargoes, subject to the limitations, exclusions, and conditions of the applicable insurance policy\n1. The Service Provider shall not be liable for:\n- Inherent defects of the cargo;\n- Improper packing or loading conducted by the Client;\n- Customs-related delays;\n- Delays caused by force majeure events;\n- Losses arising from inaccurate cargo declarations made by the Client.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.\nForce majeure shall be interpreted in accordance with the Ethiopian Civil Code.", "order": 4, "title": "Force Majeure"}, {"id": "pricing", "body": "1. contract Price\n- Gallan Multipurpose Port (GMP) to SGTD: USD 819.00 (Eight Hundred Nineteen United States Dollars) per 40ft container or USD 834.00 (Eight Hundred Thirty-Four United States Dollars) per two (2) 20ft containers.\n- Dire Dawa Dry Port to SGTD: USD 338.00 (Three Hundred Thirty-Eight United States Dollars) per 40ft container or per two (2) 20ft containers.\n- Modjo to SGTD: USD 725.00 (seven Hundred Twenty-Five) per 40ft container or per two 20ft containers.\n- Sebeta Railway Station to SGTD: USD 856.00 (Eight Hundred Fifty-Six) per 40ft container or 871 (USD Eight Hundred Seventy-One) per two 20ft containers.\n- If the cargo exceeds a gross weight of 50 tons per 2*20ft containers, an additional charge of USD 10 per ton will apply.\n- Gross weight shall be the total sum of Cargo, Packing and Container tare weight.\n- The price of container handling, loading and unloading at Modjo dry port and SGTD railway freight yards are not part of this agreement and are the sole responsibility of the client.\n1. Additional Costs (If Applicable):\n- First-mile delivery service by truck within Sebeta, Addis Ababa or Modjo and surrounding areas, originating from warehouses or any other places designated by client, shall incur an additional cost, which shall be fully covered by the client.\n- For clients utilizing EDR''s first or last mile logistics services, the applicable charges shall vary based on the cargo movement route.\n- The charge for First-mile delivery-to Gallan Multipurpose port and Modjo dry port shall be communicated to the client by service provider after receiving the necessary details from the client regarding the cargo origin, type and weight.\n1. Terms of payment\n- All transportation payments, including charges for any additional tonnage (if applicable), must be paid in advance prior to loading the container onto the train.\n- 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.\n- If the exchange rate changes between payment and wagon assignment date, adjustments will be made accordingly.", "order": 5, "title": "Pricing and Payment Terms"}, {"id": "contract-documents", "body": "1. The following documents shall constitute the Contract between the Client and the Service Provider:\n- Any amendments made to this Contract (if applicable).\n- This Contract Agreement.\n- Final Minutes of Negotiation (if applicable).\n1. In the event of any discrepancy between these documents, they shall be interpreted with priority in the order listed", "order": 6, "title": "Contract Documents"}, {"id": "documentation", "body": "1. Consignment Note (cargo handover document).\n1. Payment summary prepared as per the agreed tariff if required.", "order": 7, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "1. The service provider must certify the taking over and handing over of the container cargo on Freight Carriage Acceptance Sheet of EDR inappropriate manners and provide to the client.\n1. Freight Carriage Acceptance Sheet shall be prima facie evidence of the receipt of the container cargo by service provider, the kind, number, and weight of the goods.\n1. Up on delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.", "order": 8, "title": "Consignment Notes"}, {"id": "amendment", "body": "1. This contract may be amended only through written agreement signed by both parties.\n1. Notwithstanding Sub-Article 1, the Service Provider shall revise transport tariffs due to operational and regulatory changes by providing at least five (5) working days prior written notice to the Client.", "order": 9, "title": "Amendment"}, {"id": "termination", "body": "The contract may be terminated:\n- By mutual agreement.\n- Upon completion of the contract period or agreed cargo shipments.\n- If either party breaches fundamental terms.\n- If terminated for cause, the terminating party must issue a 15-day written notice specifying the breach, and allow opportunity to cure, if applicable.", "order": 10, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "This Contract shall be governed by and construed in accordance with the laws of the Federal Democratic Republic of Ethiopia", "order": 11, "title": "Governing Law"}, {"id": "duration", "body": "This contract shall remain valid until {{contractEndDate}} unless extended by mutual written agreement.", "order": 12, "title": "Contract Period"}, {"id": "26f21ab1-e529-4e13-a101-8bc88cc0d8ef", "body": "Each party shall maintain confidentiality concerning commercial, operational, technical, and shipment-related information obtained during execution of this Contract unless disclosure is required by law.", "order": 13, "title": "Confidentiality"}, {"id": "disputes", "body": "1. The parties shall endeavor to settle disputes amicably through good faith negotiation.\n1. Any dispute not resolved amicably within thirty (30) days shall be submitted to the Federal Courts of the Federal Democratic Republic of Ethiopia having jurisdiction in Addis Ababa.", "order": 14, "title": "Settlement of Disputes"}, {"id": "89247d94-ac42-4b46-a5e9-80057c174ef6", "body": "This Contract shall become effective on the date of signature by both parties.", "order": 15, "title": "Contract Effectiveness"}]', true, '2026-07-27 11:32:03.38554+00', '2026-08-06 06:35:36.337165+00', NULL, NULL, NULL, true),
+	('f6f9df81-bba2-4b5e-8171-eed8faff112e', 'EXPORT_CONTAINER_CUSTOMS', 'Container Export Contract (with customs clearing)', 'Export container transport, freight forwarding, and customs clearing from Galaan Multipurpose Port or Modjo dry port to SGTD container freight station (Djibouti). Customs clearing is performed by the Service Provider.', 'Export Container Transport, Freight Forwarding and Customs Clearing Service', '["The parties have agreed on the following services: rail transport, customs clearance, transit work, freight forwarding, and handling of container cargo."]', '[{"id": "objective", "body": "Customs clearance (Ethiopia side):\n- Processing of export declarations.\n- Coordination with the Ethiopian Customs Authority for clearance.\n- Ensuring compliance with all export regulations.\nRail transport:\n- Transportation of containers from Galaan Multipurpose Port (GMP) or Modjo dry port to SGTD container freight station.\nDjibouti transit and handling:\n- Customs clearance in Djibouti.\n- Coordination with Djibouti port and transit authorities.\n- Freight forwarding and last-mile facilitation as required.\nExcluded costs:\n- Shore handling.\n- Shifting of containers from SGTD to DMP or DMP to SGTD port.", "order": 1, "title": "Objective and Scope of the Services"}, {"id": "client-obligations", "body": "Give written/email instructions to the Service Provider for transportation of containers from Galaan Multipurpose Port (GMP) and/or Modjo to Djibouti.\nSupply a minimum of two (2) 20ft containers (or an equivalent load to fill one flat wagon).\nSubmit 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.\nFor clients requiring first-mile service, submit a first-mile service request notice no less than seventy-two (72) hours in advance.\nComplete and submit accurate export documents as per the request of the Service Provider; payment must be submitted at least 36 hours before train departure.\nDeliver all cargo to the designated loading port or freight station at least three (3) hours prior to the scheduled train loading time.\nFailure 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.\nIf 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.\nContainers must have four (4) undamaged corners.\nOne flat wagon must carry either one 40ft container or two 20ft containers.\nIf two 20ft containers are loaded on one flat wagon, their weight difference must not exceed 10 tons.\nThe 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.\nProhibited cargo: cargo covered with tarpaulin is not allowed due to safety risks.\nIf 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.\nRefund 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.\nAny delay caused by missing or incorrect documents shall be the Client''s responsibility.\n100% of the transportation and customs clearance fee must be paid in advance.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "Complete gate pass processing and submit to Nagad Station for each shipment within eighteen (18) hours after train departure.\nThe Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous goods.\nMaintain cargo liability insurance for railway transport; additional insurance for port handling or last-mile transport shall be the Client''s responsibility.\nThe Service Provider is not liable for customs penalties or demurrage due to delays beyond its control.\nNotify the Client immediately, in writing, of any delays, port issues, or customs holds.\nThe Service Provider shall not be liable for:\n- Inherent defects of the cargo.\n- Improper packing or loading conducted by the Client.\n- Customs-related delays.\n- Delays caused by force majeure events.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.\nForce majeure shall be interpreted in accordance with the Ethiopian Civil Code.", "order": 4, "title": "Force Majeure"}, {"id": "pricing", "body": "Railway Transportation Charges\n- The Client shall pay the following railway transportation charges for the transportation of containers under this Agreement:\n- From GMP to SGTD: I. USD 819 (United States Dollars Eight Hundred Nineteen) per 40ft container; ii. USD 834 (United States Dollars Eight Hundred Thirty-Four) per two (2) 20ft containers\n- From Modjo to SGTD: i. USD 725 (United States Dollars Seven Hundred Twenty-Five) per 40ft container; ii. USD 725 (United States Dollars Seven Hundred Twenty-Five) per two (2) 20ft containers.\n- Where the total cargo weight exceeds fifty (50) metric tons per two (2) 20ft containers, an additional charge of USD 10 (United States Dollars Ten) shall apply for each excess metric ton.\n1. Freight Forwarding and Customs Clearance Charges\n- The Client shall pay the following freight forwarding and customs clearance service charges:\n- From GMPtoSGTD: i. USD540(United States Dollars Five Hundred Forty) per 40ft container;  ii. USD349(United States Dollars Three Hundred Forty-Nine) per 20ft container.\n- From Modjo to SGTD: i. USD569(United States Dollars Five Hundred Sixty-Nine) per 40ft container;  ii. USD389(United States Dollars Three Hundred Eighty-Nine) per 20ft container\n- 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 USD50 per document.\n- Payment must be supported by an official receipt before cargo departs from Gelan Multipurpose Port /Mojo.\n- If the client uses PIL shipping Line, any Local charge incurred will be covered by the client as per the invoice issued from the shipping line.\n- If storage or demurrage occurs due to client-related issues (delay in document submission, payment delay, or any other client- related reason) the client will pay the payment.\n- Charges will apply per day after the free storage period, based on the invoice and SGTD tariff.\n- During export season, EDR may provide seasonal export support through the facilitation of empty containers.\n1. Additional Costs (If Applicable):\n- First-mile delivery service by truck within Addis Ababa or Modjo and surrounding areas, originating from warehouses or any other places designated by client, shall incur an additional cost, which shall be fully covered by the client.\n- For clients utilizing EDR''s first or last mile logistics services, the applicable charges shall vary based on the cargo movement route.\n- The charge for First-mile delivery-to Galaan Multipurpose Port and Modjo dry port shall be communicated to the client by service provider after receiving the necessary details from the client regarding the cargo origin, type and weight.\n- 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.\n1. Payment Terms:\n- All charges, including rail transport and customs clearance charges, remain 100% payable in advance.\n- 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\n- If the exchange rate changes between payment and wagon assignment date, adjustments will be made accordingly.\n- Any additional costs incurred due to customs issues or port delays shall be borne by the Client, and will be paid based on actual costs, supported by official receipts within 10 days.\n- Latepayment shall incurs penalty of 10 %", "order": 5, "title": "Pricing and Payment Terms"}, {"id": "contract-documents", "body": "The following documents shall constitute the contract between the Client and the Service Provider:\n- Any amendments made to this contract (if applicable).\n- This Contract Agreement.\n- Final minutes of negotiation (if applicable).\n- In the event of any discrepancy between these documents, they shall be interpreted with priority in the order listed above.", "order": 6, "title": "Contract Documents"}, {"id": "documentation", "body": "Consignment Note (cargo handover document).\nPayment summary prepared as per the agreed tariff, if required.", "order": 7, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "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.\nThe 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.\nUpon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.", "order": 8, "title": "Consignment Notes"}, {"id": "amendment", "body": "1. This contract can be amended by mutual agreement.\n1. Notwithstanding Sub-Article 1, 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.", "order": 9, "title": "Amendment"}, {"id": "termination", "body": "The contract may be terminated:\n- Bymutualagreement.\n- Upon completion of the contract period or agreed cargo shipments.\n- If either party breaches fundamental terms.\n- If terminated for cause, the terminating party must issue a 15- day written notice specifying the breach, and allow opportunity to cure, if applicable", "order": 10, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "The contract is valid once signed by both parties.", "order": 11, "title": "Contract Effectiveness"}, {"id": "duration", "body": "Valid until {{contractEndDate}} with a possible extension upon mutual agreement.", "order": 12, "title": "Contract Period"}, {"id": "disputes", "body": "Disputes shall be settled amicably\nIf amicable settlement fails, disputes shall be submitted to the Federal Court located in Addis Ababa\nThe signatory confirms 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.", "order": 13, "title": "Settlement of Disputes"}]', true, '2026-08-04 10:03:50.67187+00', '2026-08-05 18:56:31.554451+00', NULL, NULL, NULL, true),
+	('ed5d984e-c0b4-4db5-9587-b5920ffe54d6', 'IMPORT_CONTAINER_CUSTOMS', 'Container Import Contract (with customs clearing)', 'Import container transport by railway from SGTD (Djibouti) to Dire Dawa, Modjo dry port, or Galaan Multipurpose Port, with empty-container return. Customs clearing is performed by the Service Provider.', 'Import Container Transport Service by Railway', '["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."]', '[{"id": "objective", "body": "1. Customs Clearance (Djibouti side):\n- Customs clearance in Djibouti.\n- Coordination with Djibouti Port and Transit authorities.\n2. Rail Transport:\n- Transportation of containers from {{schedule.originLabel}} railway freight yard to {{schedule.destinationLabel}}\n3. Djibouti Transit and Handling:\n- Processing imports declarations.\n- Coordination with Ethiopian Customs Authority for clearance.\n- Ensuring compliance with all import regulations.\n- Freight forwarding and last-mile facilitation as required.\n4. Excluded costs\n- Shore handling\n- Shifting of containers from SGTD to DMP or DMP to SGTD port, Shifting of containers from free zone to DMP or SGTD.", "order": 1, "title": "Objective and Scope of the Services"}, {"id": "client-obligations", "body": "1. Give clear and written/email/electronic instructions to the Service Provider for transportation from Djibouti, SGTD container railway freight station to Dire Dawa, Modjo dry port and or Galaan Multipurpose Port (GMP).\n1. The Client must submit all required documents including but not limited to adequate number of original hard copy of bill of lading, certificate of origin, commercial invoice, packing list, soft copy of licenses, and other documents as per the requirement of the Service Provider at least 7 days prior to train booking.\n1. Provide a minimum of one (1) 40ft container or two (2) 20ft containers per shipment.\n1. If two 20ft containers are loaded on one flat wagon, their weight difference must not exceed 10 tons.\n1. The Client must collect the full container from Galaan Multipurpose port within Three (3) calendar days from the day following the arrival notice.\n1. 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 per day as follows:\n- 15 USD per day per 20ft container or\n- 27 USD per day per 40ft container.\n- This charges, shall be calculated based on the Commercial Bank of Ethiopia''s daily selling exchange rate on the date of the payment\n1. 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.\n1. In the event that the Client fails to collect the container(s) within the specified period, the Client shall be liable to pay double handling charges to the service providor for the affected container(s), as set out below:\n- 27 USD for 20ft container per handling or\n- 40 USD for 40ft container per handling.\n- This charges, shall be calculated based on the Commercial Bank of Ethiopia''s daily selling exchange rate on the date of the payment\n1. The client must collect the container from Diredawa and Modjo dry port within one day after the service provider finalizes all the necessary formalities and gives the notification; otherwise pay the necessary demurrage and storage charges as per the standard of the port.\n1. If a booked wagon is not loaded due to client-related issues including but not limited to (damaged container, missing lock, unpaid demurrage, port system errors, or incomplete documentation and submition), the client shall be charged 100% of the total price for the reserved wagon.\n1. 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.\n1. Clients shall return the empty containers to Galaan Multipurpose port , Modjo and Diredawa stations within two days after taking the full containers therefrom.\n1. If the 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.\n1. Penalty Charges for Delay at SGTD/Nagad Upon Train Arrival:\n- 20 USD per day per 20ft container.\n- 33 USD per day per 40ft container.\n1. The Client must provide clean empty containers that meet SGTD standards. If SGTD refuse to take over the empty container because of inside cleanness problem, Additional cleaning costs incurred due to non compliance will be borne by the Client.\n1. The Client must ensure containers are structurally intact and meet weight distribution requirements.\n1. Any delay resulting from missing, incomplete, or incorrect documentation shall be the sole responsibility of the Client. All related costs incurred due to such delays shall be borne by the client upon presentation of valid receipts. If the payment is required in Djibouti, the Client shall settle the amount in USD based on the official receipt provided.\n1. The Client must notify the Service Provider (48) hours in Advance before wagon booking if transporting hazardous or valuable goods.\n1. Cargo covered with tarpaulin is not allowed due to safety risks.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "1. The service provider shall complete the customs clearance procedure for containers within 24 work hours of arrival at Gelan Multipurpose Port, Diredawa Railway Station and Modjo Dry port under normal conditions. Storage and handling fees will apply according to the service provider’s regulations for container import to Gelan Multipurpose Port, Diredawa and Modjo dry port’s regulation for container import shall be the responsibility of the client.\n1. If storage or any demurrage occurs due to client-related reasons resulting in delays or any other circumstances beyond the service provider’s control, the client shall bear the associated costs in USD as per the receipt provided.\n1. Transit time shall be within 7 days after submission of all necessary shipment documents from Djibouti to Gelaan Multipurpose Port , Diredawa railway station and Modjo Dry port under normal conditions.\n1. The Service Provider shall return empty containers from Dire Dawa , Modjo Dry port and and Gelan Multipurpose port to SGTD within seven (7) calendar days of receipt.\n1. In the event of export cargo operations, the Service Provider may prioritize the loading of export containers during the loading of empty containers return and unloading of import containers from train at Gaalan Multipurpose port.\n1. The Service Provider shall maintain cargo liability insurance for railway transport. Additional insurance for port handling or last- mile transport shall be the Client’s responsibility.\n1. The Service Provider reserves the right to refuse the transportation of any cargo classified as dangerous good.\n1. Provide accident or defect reports, if needed.\n1. Liability Limitations: The Service Provider is not liable for customs penalties or demurrage due to delays beyond its control.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.\nForce majeure shall be interpreted in accordance with the Ethiopian Civil Code.", "order": 4, "title": "Force Majeure"}, {"id": "pricing", "body": "1. From SGTD to Galaan Multipurpose port (GMP), 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.\n1. From SGTD to Modjo Dry port , 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 40 ft and or per two 20ft containers without empty return.\n1. 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, and USD 762 per one 40ft or USD 780 per two 20ft containers without empty return.\n1. If cargo exceeds 40 tons per two 20ft containers of gross weight, additional charges apply proportionally.\n1. The price for freight forwarding, customs clearance, and port handling services at both the Djibouti and Ethiopian sides from SGTD to Galaan Multipurpose Port, Diredawa and Modjo Dry port is fixed at USD 1,307 for one 40-foot container and USD 703 for one 20-foot container. This will only include\n- Port Due Fee\n- Local Charges (based on shipping line tariff)\n- Gate Pass\n- Djibouti Customs Processing\n- Documentation / File Cost\n- Transit Service Charge\n1. The price for freight forwarding, customs clearance, and port handling services at both the Djibouti and Ethiopian sides from the Free Zone to GMP/Modjo/Diredawa is fixed at USD 1,149 for one 40-foot container and USD 619 for one 20-foot container.\n1. The charge for last-mile delivery from Galaan Multipurpose Port shall be communicated to the client by the service provider after receiving the necessary details from the client regarding the cargo destination, type and weight.\nAdditional Costs (If Applicable)\n- The payment for additional tonnage (if any) shall be paid in advance before the container loaded on wagon.\nExcluded costs\n- Any charge related to the vessel (including freight, shipping line penalties, or vessel-side operations) is not included in this agreement.\nPayment Terms:\n- All payments shall be made one hundred percent (100%) in advance in United States Dollars (USD) including rail transportation and customs clearace charge.\n- Any additional costs incurred because of custom-related issues or port delays shall be the responsibility of the Client. Such costs shall be paid based on the actual amount and currency stated in the official receipts and must be settled within ten (10) days from the date of receipt.\n- The above rates are subject to adjustment based on the actual operational or storage costs incurred by the Service Provider, supported by the relevant invoices.\n- Additional charges may include: ◆ Advance demurrage ◆ Post demurrage ◆ Storage fees ◆ other related port charges\n1. All Additional charges must be settled within 10 days from invoice submission\n1. Late payment shall incur penality of 10%.", "order": 5, "title": "Contract Price and Terms of Payment"}, {"id": "contract-documents", "body": "The following documents constitute this contract:\n- Amendments (if any).\n- This Contract Agreement.\n- Final minutes of negotiation (if any).\nIf there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.", "order": 6, "title": "Contract Documents"}, {"id": "documentation", "body": "Equipment Interchange Receipt of SGTD, Railway Waybill, Container Carriage Acceptance Sheet, and incidental charges (if any).\nPayment summary as per the agreed contract price (if required).", "order": 7, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "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.\nThe 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.\nUpon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.", "order": 8, "title": "Consignment Notes"}, {"id": "amendment", "body": "This contract can be amended by mutual agreement.\nNotwithstanding 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.", "order": 9, "title": "Amendment"}, {"id": "termination", "body": "1. The contract may be terminated:\n- By mutual agreement\n- Upon completion of the contract period or agreed cargo shipments.\n- If either party breaches fundamental terms.\n- If terminated for cause, the terminating party must issue a 15-day written notice specifying the breach, and allow opportunity to cure, if applicable", "order": 10, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "The contract is valid once signed by both parties.", "order": 11, "title": "Contract Effectiveness"}, {"id": "duration", "body": "Valid until {{contractEndDate}} with a possible extension upon mutual agreement.", "order": 12, "title": "Contract Period"}, {"id": "disputes", "body": "1. Disputes shall be settled amicably\n1. If amicable settlement fails, disputes shall be submitted to the Federal Court located in Addis Ababa\n1. The signatory confirms 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.", "order": 13, "title": "Settlement of Disputes"}]', true, '2026-08-04 10:03:50.67187+00', '2026-08-05 18:37:53.258284+00', NULL, NULL, NULL, true),
+	('22899e49-9466-4110-949c-ac767a3af2f8', 'EXPORT_BULK_NO_CUSTOMS', 'Bulk Export Contract', 'Export of bulk cargo (e.g. livestock) by railway from Ethiopian loading stations to Nagad railway freight yard, Djibouti.', 'Bulk Cargo Transportation Service by Railway', '["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."]', '[{"id": "objective", "body": "To undertake the railway transportation of bulk cargo from the agreed Ethiopian loading station to Nagad railway freight yard.", "order": 1, "title": "Objective of the Service"}, {"id": "client-obligations", "body": "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.\nMaintain 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.\nPrepare the necessary documents and facilities to make the cargo ready for transport.\nNote 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.\nEnsure 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.\nSupply 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.\nSupply the minimum amount of cargo available for at least one wagon.\nExecute 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.\nFor 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.\nBe 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.\nExecute and cover the cost of loading and unloading of cargo at both the loading station and Nagad railway freight yard.\nFollow up that the cargo is loaded and unloaded on time.\nDelegate 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.\nPrepare the necessary facilities to take over the transported cargo at Nagad freight yard upon arrival by issuing handover documents.\nTake 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.\nPay 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.\nAfter 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.\nPay the Service Provider 100% of the contract price in advance for each wagon.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "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.\nTransport the cargo from the loading station to Nagad railway freight yard.\nProvide safe transportation of the cargo throughout the transit.\nPresent customs clearance documents and mobilize the rolling stock as needed.\nProvide the wagons assigned for the freight at the agreed place and time, and follow up that the cargo is loaded on time.\nTransport and deliver the cargo taken over, in the condition received, within two (2) calendar days to Nagad railway freight yard.\nWhere 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.\nBuy a cargo liability insurance policy for each supplied wagon.\nProvide wagon cleaning service and charge the cleaning fee based on actual expenditure.\nIf the Client fails or refuses to receive the cargo beyond the allowable transport period, the Service Provider has the right to handle the cargo.\nNeither party shall be liable for any indirect or consequential loss sustained by the other in connection with this Agreement.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "The parties have no obligation to pay demurrage or any other compensation if they have failed to discharge their obligations due to force majeure.\nForce 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:\n- Acts of God (such as, but not limited to, fires, explosions, earthquakes, drought, tidal waves, and floods).\n- War, hostilities (whether war is declared or not), invasion, acts of foreign enemies, mobilization, requisition, or embargo.\n- Rebellion, revolution, insurrection, military or usurped power, or civil war.\n- Contamination by radioactivity from any nuclear fuel or nuclear waste.\n- Riot, commotion, strikes, go-slows, lockouts, or disorder.\n- Acts of terrorism.\nA 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.", "order": 4, "title": "Force Majeure"}, {"id": "pricing", "body": "The price of bulk cargo transportation from the loading station to Nagad, together with any applicable demurrage and surcharge rates, is set out in the Rate Schedule immediately below, expressed as unit prices per origin → destination lane and per wagon.\nPayment 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.\nIf 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.\nThe 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.\nThe Client shall pay 100% of the contract price in advance.\nThe Client shall pay a demurrage fee for occupied wagons at the rate set out in the Rate Schedule for the applicable occupancy band.\nDemurrage 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.", "order": 5, "title": "Contract Price and Terms of Payment"}, {"id": "contract-documents", "body": "The following documents shall constitute the contract between the Client and the Service Provider:\n- Amendments made to this contract (if any).\n- This Contract Agreement.\n- Final minutes of negotiation (if any).\nIf there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.", "order": 6, "title": "Contract Documents"}, {"id": "documentation", "body": "The following documents shall be delivered to the Client upon request for settlement:\n- Consignment Note (cargo handover document to the Client).\n- Summary of payment request of the Service Provider prepared as per the agreed tariff.", "order": 7, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "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.\nA 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.", "order": 8, "title": "Consignment Notes"}, {"id": "termination", "body": "The contract may be terminated:\n- Upon mutual consent of the parties.\n- Upon completion of the contract period.\n- If either or both parties breach a fundamental provision of the contract, upon prior legal notice delivered by either party.", "order": 9, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "The contract shall come into full force and effect on the date when all of the following are accomplished:\n- The contract is signed by the Client and the Service Provider.\n- The Service Provider has received the advance payment of 100% of the contract price for each train set of cargo.", "order": 10, "title": "Contract Effectiveness"}, {"id": "cargo-amount", "body": "The minimum cargo to be transported shall be one wagon.", "order": 11, "title": "Cargo Amount"}, {"id": "duration", "body": "The contract shall last for three (3) months starting from the date of contract signing, with possible extension upon mutual agreement.", "order": 12, "title": "Duration of Contract"}, {"id": "disputes", "body": "If a dispute arises between the parties, they shall exert efforts to settle their differences amicably.\nIf the parties fail to settle their disputes amicably, the case shall be taken to the competent Federal Court of law presiding in Addis Ababa.\nThe governing law shall be the laws of the Federal Democratic Republic of Ethiopia.", "order": 13, "title": "Settlement of Disputes"}]', true, '2026-07-27 11:32:03.38554+00', '2026-08-04 10:03:50.67187+00', '2026-08-09 18:49:32.843901+00', NULL, NULL, false),
+	('f96e3a2b-4fc6-4c7c-87b7-99dbbeb255c1', 'IMPORT_BULK_NO_CUSTOMS', 'Bulk Import Contract', 'Import of bulk cargo (e.g. steel billets) from Djibouti (DMP/Nagad) to Galaan Multipurpose Port with customs clearance and optional last-mile delivery.', 'Bulk Cargo Transportation and Customs Clearance Services', '["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."]', '[{"id": "efc0442c-f7ae-4253-8cf3-bc64523f730b", "body": "Fist-Mile service: Truck transport from the designated cargo location to the designated railway freight station, including any required shifting of cargo within the designated facility at Djibouti.\n\nRailway terminal handling: Unloading from trucks, loading cargo on train wagons and lashing. \n\nRail transport: Railway transport from {{schedule.originLabel}} railway freight stations to {{schedule.destinationLabel}}. \n\nDocumentation and freight forwarding Customs clearance in Djibouti and Ethiopia. \n\nRail Terminal Handling: unloading Wagons to load on trucks at {{schedule.destinationLabel}}\n\nLast mile service: Truck transport from {{schedule.destinationLabel}} to the client’s compound if agreed between the parties. \n\nExcluded service from this contract: loading of the cargo on trucks at free zone, DMP or any other designated location of cargo at Djibouti, unloading at clients’ warehouse and any port handling which is not clearly stated above, including but not limited to (shifting of cargo from SGTD port to free zone or DMP and shore handling)", "order": 1, "title": "Scope of the Service"}, {"id": "objective", "body": "The objective of this contract is for the service provider to provide the Client with integrated logistics services for the transportation of\n{{schedule.cargoDescription}}, including {{schedule.serviceType}} and the client to make the necessary payment as per the agreement.", "order": 2, "title": "Objective of the Services"}, {"id": "client-obligations", "body": "Give written/email/electronic instructions to the Service Provider for transportation of cargo from Djibouti to Galaan Multipurpose Port. \n\nTimely Submission of Documents and the Cargo: The Client must submit all required shipping and customs documents at least 7 days prior to train departure. \n\nEnsure a minimum supply of at least 1/one {{schedule.cargoDescription}} per shipment. \n\nIf a booked wagon is not loaded due to client-related issues (e.g. unpaid demurrage, port system errors, or incomplete documentation), the client shall be charged 100% of the total price for the reserved wagon. \n\nRefund 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. \n\nResponsibility for Delays: Any delay caused by missing or incorrect documents shall be the Client’s responsibility. \n\nThe Client shall supply sufficient cargo to fully load at least one flat wagon. The specific quantity of cargo to be loaded per flat wagon shall be determined by the Service Provider based on the wagon’s loading capacity and operational standards. \n\nMake payment to the Service Provider for services rendered in accordance with the payment terms and conditions of this contract. \n\nEnsure timely follow-up so that the cargo is loaded and unloaded on schedule. \n\nAssign representatives at both the origin and destination to consign and receive the cargo. \n\nMaintain detailed information on the type, weight, and destination of the cargo ready for shipment. Notify the service provider or its nominated agent by written notice, email, or electronic communication. Detailed dimensional information about the cargo shall be sent at least one (1) week prior to the contractual commitment and booking request. \n\nPay demurrage for delays exceeding five (3) calendar days in removing cargo from Galaan Multipurpose Port due to the Client’s fault in resolving customs, third-party, inland transport issue or other claims. Demurrage rates shall be:\n13.1. USD 30 per day per heavy machinery (Equipment) or vehicle for storage between 4–6 days.\n13.2. USD 40 per day per heavy machinery (Equipment) or vehicle for storage between 7–9 days.\n13.3. USD 50 per day per heavy machinery (Equipment) or vehicle for storage exceeding 10 days\n13.4. The demurrage payment shall be made within ten (10) calendar days from the date of the Service Provider’s claim, calculated using the selling exchange rate of the Commercial Bank of Ethiopia on the date of payment.\n\nPay any other applicable charges and fees within ten (10) calendar days after the Service Provider submits a payment request document. \n\nLate payment shall incur a penalty of 10% of the outstanding invoice amount. \n\nThe Client shall obtain prior confirmation from the Service Provider before proceeding with any booking request or making any payment.", "order": 3, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "The Service Provider shall take over the machinery cargo at the Djibouti Free Zone,DMP or designated cargo location and transport it without loss or damage, delivering it directly to the Client’s designated destination. Should the Service Provider fail to deliver the cargo in the same condition as received, it shall bear full responsibility for any loss, damage, or discrepancy. \n\nThe Service Provider shall clear the cargo within 24 hours of its arrival at Galaan Multipurpose Port under Normal condition, and any delay beyond this period shall be the sole responsibility of the Service Provider. Where the last-mile service is agreed to be undertaken by the Service Provider, failure to provide such service upon arrival shall entitle the Client to independently arrange the service. In such case, if any payment has already been made for the last-mile service, the Service Provider shall promptly refund the amount paid for the specific service not rendered. \n\nIf storage occurs due to client-related delays or circumstances beyond the service provider’s control, the client shall bear the associated costs.\n\nInsurance: The Service Provider shall maintain cargo liability insurance for railway transport. Additional insurance for port handling or last-mile transport shall be the Client’s responsibility. \n\nThe Service Provider shall provide accident or defect reports, where applicable or upon request, in relation to cargo handling, loading, or transport operations.\n\nLiability Limitations: The Service Provider is not liable for customs penalties or demurrage due to delays beyond its control.", "order": 4, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.\n\nForce majeure shall be interpreted in accordance with the Ethiopian Civil Code.", "order": 5, "title": "Force Majeure"}, {"id": "liability", "body": "Contract price\n\nThe price for transporting heavy machinery or vehicles shall be USD 3,800, (Three Thousand Eight Hundred USD) per wagon to the destination Galaan Multipurpose Port (GMP). \n\n3. The logistics and rail side handling Per unit shall be\n3.1. USD 2,500 per one Machine or truck if the cargo is to be loaded from DMP\n3.2. USD 2,300 Per one Machine or truck if the cargo is from free zone\n3.3. USD 2,600 Per one Machine or truck if the cargo is from SGDT/DMP (Containerized)\n3.4. USD 2,600 Per one Machine or truck if the cargo is from Old Port\n\nThis price includes customs clearance, first mile, loading to railway wagon at origin of cargo, unloading from wagon at destination port and Djibouti rail side handling and lashing labor cost on wagons. \n\nThe price for last mile shall be determined once the cargo departs from the loading point and shall be communicated to the client with an official email/electronic communication. \n\nThe price for Lashing Material shall be USD 100 per one Wagon.\n\nCargo Weight and size Limit: Verified Gross Mass (VGM) and the size must comply with railway restrictions. \n\n\nTerms of Payment \n\nPayment for transport and customs clearance services shall be made in USD. \n\nThe Client shall pay 100% of the transport and customs clearance price in advance. \n\nThe number of cargo per flat wagon shall be determined based on the machinery’s dimensions (L×W×H), with the exact number confirmed after consultation with the service provider.\n\nCosts related to loading on trucks, lashing labor, and other associated expenses at free zone, DMP and any designated location of cargo and unloading from truck at the final destination are not included in this contract and shall be borne by the Client.", "order": 6, "title": "Contract Price and Terms of Payment"}, {"id": "contract-documents", "body": "The following documents form part of this contract:\n- This Contract Agreement.\n- Any amendments made to this Agreement.\n- Minutes of negotiation (if any).\nIn the event of any discrepancy between these documents, they shall be interpreted with priority in the order listed above.", "order": 7, "title": "Contract Documents"}, {"id": "documentation", "body": "The following documents shall be provided to the Client upon request for settlement\n\nConsignment Note (handover document to the Client). \n\nSummary of the Service Provider’s payment request, prepared in accordance with the agreed tariff if required . \n\nDetails of any incidental charges, if applicable. Article 9- Consignment notes", "order": 8, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "The Service Provider must certify the taking over of the goods on the duplicates of the consignment note in the appropriate manner and return the duplicate to the Client. \n\nThe consignment note shall serve as prima facie evidence of the receipt of the goods by the Service Provider, including their type, quantity, and weight. \n\nUpon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.", "order": 9, "title": "Consignment Notes"}, {"id": "termination", "body": "This contract can be amended by mutual agreement.\n\nThe service provider reserves the full right to amend the price or any provision of this contract during its validity period within 5 days of prior notification.", "order": 10, "title": "Amendment"}, {"id": "effectiveness", "body": "The Contract may be terminated under the following circumstances:\nBy mutual consent of both Parties. \n2. Upon completion of the contract period. \n3. By either Party giving one (1) month’s prior notice for any reason. 4. If either Party breaches a fundamental provision of the Contract, a legal prior notice of three (3) days shall be delivered by the non-breaching party", "order": 11, "title": "Termination of Contract"}, {"id": "duration", "body": "The Contract shall come into full force and effect on the date when the Contract is signed by the Client and the Service provider.", "order": 12, "title": "Contract Effectiveness"}, {"id": "disputes", "body": "If adispute arises between the parties, they shall exert efforts to settle their differences amicably.\n2. 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.\n3. Thegoverning law shall be the laws of the Federal democratic republic of Ethiopia.", "order": 13, "title": "settlement of Disputes"}]', true, '2026-07-27 11:32:03.38554+00', '2026-08-04 13:00:56.39198+00', '2026-08-09 18:49:32.843901+00', NULL, NULL, false),
+	('171cb4c1-a26b-41eb-b776-373d24d7d018', 'INTERCITY_BULK', 'Bulk Intercity Contract', 'Domestic (intercity) bulk cargo transportation by railway between Ethiopian freight yards, e.g. Dire Dawa to Sebeta.', 'Bulk Cargo Transportation Service by Railway (Intercity)', '["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."]', '[{"id": "objective", "body": "The Service Provider shall undertake the railway transportation of {{schedule.cargoDescription}} from {{schedule.originLabel}} to {{schedule.destinationLabel}}", "order": 1, "title": "Objective of the Contract"}, {"id": "client-obligations", "body": "Provide written instructions to the Service Provider to transport a minimum of sixteen (16) wagons of cargo per consignment.\nPrepare 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.\nAssign 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.\nTransport the cargo to the designated loading points at the origin yard.\nBe 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.\nMake advance payment to the Service Provider for services in accordance with the payment terms and conditions of this contract.\nFollow up to ensure that the cargo is loaded and unloaded on time.\nDelegate representatives at the cargo destination to immediately receive the transported cargo.\nEnsure 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.\nMaintain 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.\nPrepare 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.\nUpon arrival of the train/wagon at the unloading site, sign the train arrival confirmation sheet to acknowledge the arrival time.\nInspect 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.\nAfter receiving the cargo, sign the Freight Carriage Acceptance Sheet (copies II, III, and IV) immediately to confirm delivery.\nCompensate 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.\nEach 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.\nBear 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.\nPay 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.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "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.\nProvide pre-arrival notification including the train number to the discharging terminal and customs at least 24/12 hours before train arrival.\nTransport the cargo from origin to destination within two (2) days from completion of loading (time counting starts upon completion of documentation and loading).\nProvide safe transportation of the cargo throughout transit.\nDeliver the cargo to the Client at the destination railway freight yard in the same condition as received.\nPurchase a cargo liability insurance policy for each wagon transported.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable due to a force majeure event.\nFor 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.\nThe 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.", "order": 4, "title": "Force Majeure"}, {"id": "liability", "body": "The Service Provider will be responsible for any loss, shortage, or damage occurring to the cargo it has received.", "order": 5, "title": "Liabilities Related to Damages and Losses"}, {"id": "pricing", "body": "The price for transporting cargo from the origin freight yard to the destination freight yard is set out in the Rate Schedule immediately below, expressed as a unit price per origin → destination lane and per wagon.\nEach wagon shall be loaded with a maximum of 70 (seventy) metric tons.\nPayment 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.\nIf the exchange rate changes between the payment and the wagon assignment date, payment adjustments will be made accordingly.\nThe contract price shall include the cost of railway transportation from the origin freight yard to the destination freight yard.\nExcluded cost: cargo handling (loading and unloading) is not included in the contract price and shall remain the sole responsibility of the Client.", "order": 6, "title": "Contract Price"}, {"id": "contract-documents", "body": "The following documents shall constitute the contract between the Client and the Service Provider:\n- Amendments made to this contract (if any).\n- This Contract Agreement.\n- Final minutes of negotiation (if any).\nIf there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.", "order": 7, "title": "Contract Documents"}, {"id": "documentation", "body": "The following documents shall be delivered to the Client by the Service Provider to collect and settle payment:\n- Freight Carriage Acceptance Sheet of the Ethio-Djibouti Railway.\n- Notice of collecting transportation and miscellaneous charges of the Ethio-Djibouti Railway (if any).\n- Summary of payment request of the Service Provider prepared as per the agreed tariff.\n- Railway Waybill.", "order": 8, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "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.\nThe 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.", "order": 9, "title": "Consignment Notes"}, {"id": "termination", "body": "The contract may be terminated:\n- Upon mutual consent of the parties.\n- Upon completion of the contract period or amount of cargo, whichever comes first.\n- If either or both parties breach a fundamental provision of the contract, upon one-week prior legal notice delivered by either party.", "order": 10, "title": "Termination of Contract"}, {"id": "duration", "body": "The contract duration shall be {{contractDate}} from the date of effectiveness of the contract, with possible extension upon mutual agreement of the parties.", "order": 11, "title": "Duration of Contract"}, {"id": "disputes", "body": "1. If a dispute arises between the parties, they shall exert effort to settle their differences amicably.\n1. 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.\n1. The governing law shall be the laws of the FDRE.", "order": 12, "title": "Settlement of Disputes"}, {"id": "effectiveness", "body": "The contract shall come into full force and effect on the date when the contract is signed by both parties.", "order": 13, "title": "Contract Effectiveness"}]', true, '2026-07-27 11:32:03.38554+00', '2026-08-05 19:43:09.63909+00', '2026-08-09 18:49:32.843901+00', NULL, NULL, false),
+	('dfedaebc-9377-444e-aa8d-8de60059dd27', 'IMPORT_BULK_CUSTOMS', 'Bulk Import Contract (with customs clearing)', 'Import of bulk cargo (e.g. steel billets) from Djibouti (DMP/Nagad) to Galaan Multipurpose Port with customs clearance and optional last-mile delivery. Customs clearing is performed by the Service Provider.', 'Bulk Cargo Transportation and Customs Clearance Services', '["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."]', '[{"id": "objective", "body": "The objective of this contract is to provide the Client with integrated logistics services for the transportation of bulk cargo, including:\n- First-mile transportation in Djibouti from the Client''s designated cargo location to the selected railway station (DMP or Nagad).\n- Port handling and loading onto railway wagons.\n- Railway transport from DMP and/or Nagad Railway freight station (Djibouti) to Galaan Multipurpose Port.\n- Customs clearance in Djibouti and Ethiopia.\n- Unloading from train at the destination port to load directly on truck.\n- Last-mile delivery by truck to the Client''s delivery site where the last-mile service is undertaken by the Service Provider.\nThe truck loading at Djibouti and the truck unloading at the Client''s delivery site shall be the responsibility of the Client.", "order": 1, "title": "Objective of the Services"}, {"id": "client-obligations", "body": "Provide written/email/electronic instructions specifying the cargo volume and the selected loading station (DMP or Nagad) for each shipment.\nPrepare and submit all necessary documents and permits to enable smooth service execution.\nEnsure cargo readiness in compliance with specifications (including weight, size, and contour restrictions).\nHandle truck loading at Djibouti Free Zone/Old Port/DMP and any other designated cargo location at Djibouti, and truck unloading at the delivery site.\nEnsure safety and proper securing of cargo during truck handling.\nSubmit 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.\nUpon 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.\nUpon 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.\nIn 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.\nAny 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.\nIf 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.\nIf 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.\nWhere 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.\nDesignate authorized representatives (with valid power of attorney) for handover at origin and destination.\nSettle demurrage payments within ten (10) calendar days from the date the Service Provider issues a claim.\nPay 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.\nContact the Service Provider to obtain confirmation prior to booking and proceeding with payment.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "Provide first-mile transportation in Djibouti from the Client''s designated location to the selected railway station (DMP or Nagad).\nCarry out port handling and loading onto railway wagons.\nProvide railway transportation from DMP/Nagad (Djibouti) railway freight station to Galaan Multipurpose Port.\nPerform unloading at Galaan Multipurpose Port (GMP) to load directly on truck.\nPerform customs clearance in Djibouti and Ethiopia, including border station procedures.\nPrepare and submit all required transport documentation.\nProvide cargo insurance coverage for each supplied wagon.\nNotify the Client of train schedules, wagon numbers, and expected arrival times in advance.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "Neither party shall be liable for delays or non-performance caused by force majeure events beyond their reasonable control.\nForce majeure shall be interpreted in accordance with the Ethiopian Civil Code.", "order": 4, "title": "Force Majeure"}, {"id": "liability", "body": "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.\nCompensation shall be based on the market value of the cargo, in accordance with applicable laws.", "order": 5, "title": "Liabilities Related to Damages and Losses"}, {"id": "pricing", "body": "The applicable railway freight, Djibouti handling, and any additional service and surcharge rates for this contract are set out in the Rate Schedule immediately below, expressed as unit prices per origin → destination lane and per service.\nEach 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.\nWhere lashing materials and wood are provided by the Service Provider, they shall be charged at the applicable rate set out in the Rate Schedule; the provision continues until the cargo reaches and is fully unloaded at the designated destination station.\nThe price for last-mile delivery, where not listed in the Rate Schedule, 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.\nPayments shall be made 100% in advance in USD.", "order": 6, "title": "Contract Price and Payment Terms"}, {"id": "contract-documents", "body": "The following documents form part of this contract:\n- This Contract Agreement.\n- Any amendments made to this Agreement.\n- Minutes of negotiation (if any).", "order": 7, "title": "Contract Documents"}, {"id": "documentation", "body": "The Service Provider shall deliver the following to the Client:\n- Freight Carriage Acceptance Sheet of the Addis Ababa–Djibouti Railway.\n- Notice of transportation and miscellaneous charges.\n- Summary of payment request as per the agreed tariff, if required.", "order": 8, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "The Service Provider shall certify the taking over of goods in the Freight Carriage Acceptance Sheet.\nThis document shall serve as prima facie evidence of receipt of the cargo.\nUpon delivery of the cargo to the Client, the Cargo Handover Out Voucher signed by both parties shall serve as evidence of cargo receipt.", "order": 9, "title": "Consignment Notes"}, {"id": "termination", "body": "This contract may be terminated:\n- By mutual consent.\n- Upon completion of the agreed contract period or cargo volume.\n- For breach of fundamental provisions, with one-week prior written notice.", "order": 10, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "This Agreement becomes effective on the date it is signed by both parties.", "order": 11, "title": "Contract Effectiveness"}, {"id": "duration", "body": "The contract is valid until August 31, {{contractYear}} from the date of effectiveness, extendable by mutual agreement.", "order": 12, "title": "Duration"}, {"id": "disputes", "body": "Disputes shall first be settled amicably.\nIf unresolved, disputes shall be referred to the competent Federal Court of Ethiopia in Addis Ababa.\nThe governing law shall be the laws of the Federal Democratic Republic of Ethiopia.", "order": 13, "title": "Settlement of Disputes"}, {"id": "customs-clearing", "body": "The Service Provider shall carry out customs clearing on behalf of the Client for the cargo covered by this Agreement, including declaration, lodgement, and follow-up at the customs stations of Djibouti and Ethiopia as applicable to the agreed corridor.\nThe Service Provider shall act only within the authority granted by the Client and shall not amend a declaration without the Client''s written instruction.\nCustoms duties, taxes, and any government charges assessed on the cargo remain payable by the Client and are not included in the freight price; the Service Provider shall settle them on the Client''s behalf only where the Client has placed the corresponding funds in advance.\nThe Service Provider shall hand over all customs documents obtained in the course of clearing to the Client upon completion of each shipment.", "order": 14, "title": "Customs Clearing Services"}, {"id": "customs-client-duties", "body": "Grant the Service Provider a duly signed and stamped power of attorney authorising it to act as the Client''s customs agent for the duration of this Agreement.\nSubmit every document required for declaration (commercial invoice, packing list, bill of lading or airway bill, permits, certificates of origin, and any authority-specific licence) within one (1) calendar day of the Service Provider''s request.\nWarrant that the declared description, quantity, value, and tariff classification of the cargo are complete and accurate.\nBear any penalty, demurrage, storage, or re-inspection cost arising from incorrect, incomplete, or late Client-supplied information or documentation.\nSettle assessed duties and taxes within the period notified by the Service Provider, failing which the Service Provider may suspend clearing and the cargo shall remain at the Client''s risk and cost.", "order": 15, "title": "Client Obligations for Customs Clearing"}]', true, '2026-08-04 10:03:50.67187+00', '2026-08-04 10:03:50.67187+00', '2026-08-09 18:49:32.843901+00', NULL, NULL, false),
+	('b3783928-3556-43dc-b518-a770174a9524', 'EXPORT_BULK_CUSTOMS', 'Bulk Export Contract (with customs clearing)', 'Export of bulk cargo (e.g. livestock) by railway from Ethiopian loading stations to Nagad railway freight yard, Djibouti. Customs clearing is performed by the Service Provider.', 'Bulk Cargo Transportation Service by Railway', '["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."]', '[{"id": "objective", "body": "To undertake the railway transportation of bulk cargo from the agreed Ethiopian loading station to Nagad railway freight yard.", "order": 1, "title": "Objective of the Service"}, {"id": "client-obligations", "body": "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.\nMaintain 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.\nPrepare the necessary documents and facilities to make the cargo ready for transport.\nNote 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.\nEnsure 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.\nSupply 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.\nSupply the minimum amount of cargo available for at least one wagon.\nExecute 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.\nFor 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.\nBe 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.\nExecute and cover the cost of loading and unloading of cargo at both the loading station and Nagad railway freight yard.\nFollow up that the cargo is loaded and unloaded on time.\nDelegate 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.\nPrepare the necessary facilities to take over the transported cargo at Nagad freight yard upon arrival by issuing handover documents.\nTake 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.\nPay 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.\nAfter 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.\nPay the Service Provider 100% of the contract price in advance for each wagon.", "order": 2, "title": "Obligations of the Client"}, {"id": "provider-obligations", "body": "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.\nTransport the cargo from the loading station to Nagad railway freight yard.\nProvide safe transportation of the cargo throughout the transit.\nPresent customs clearance documents and mobilize the rolling stock as needed.\nProvide the wagons assigned for the freight at the agreed place and time, and follow up that the cargo is loaded on time.\nTransport and deliver the cargo taken over, in the condition received, within two (2) calendar days to Nagad railway freight yard.\nWhere 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.\nBuy a cargo liability insurance policy for each supplied wagon.\nProvide wagon cleaning service and charge the cleaning fee based on actual expenditure.\nIf the Client fails or refuses to receive the cargo beyond the allowable transport period, the Service Provider has the right to handle the cargo.\nNeither party shall be liable for any indirect or consequential loss sustained by the other in connection with this Agreement.", "order": 3, "title": "Obligations of the Service Provider"}, {"id": "force-majeure", "body": "The parties have no obligation to pay demurrage or any other compensation if they have failed to discharge their obligations due to force majeure.\nForce 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:\n- Acts of God (such as, but not limited to, fires, explosions, earthquakes, drought, tidal waves, and floods).\n- War, hostilities (whether war is declared or not), invasion, acts of foreign enemies, mobilization, requisition, or embargo.\n- Rebellion, revolution, insurrection, military or usurped power, or civil war.\n- Contamination by radioactivity from any nuclear fuel or nuclear waste.\n- Riot, commotion, strikes, go-slows, lockouts, or disorder.\n- Acts of terrorism.\nA 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.", "order": 4, "title": "Force Majeure"}, {"id": "pricing", "body": "The price of bulk cargo transportation from the loading station to Nagad, together with any applicable demurrage and surcharge rates, is set out in the Rate Schedule immediately below, expressed as unit prices per origin → destination lane and per wagon.\nPayment 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.\nIf 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.\nThe 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.\nThe Client shall pay 100% of the contract price in advance.\nThe Client shall pay a demurrage fee for occupied wagons at the rate set out in the Rate Schedule for the applicable occupancy band.\nDemurrage 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.", "order": 5, "title": "Contract Price and Terms of Payment"}, {"id": "contract-documents", "body": "The following documents shall constitute the contract between the Client and the Service Provider:\n- Amendments made to this contract (if any).\n- This Contract Agreement.\n- Final minutes of negotiation (if any).\nIf there is any discrepancy between the documents, they shall be interpreted with priority in the order listed above.", "order": 6, "title": "Contract Documents"}, {"id": "documentation", "body": "The following documents shall be delivered to the Client upon request for settlement:\n- Consignment Note (cargo handover document to the Client).\n- Summary of payment request of the Service Provider prepared as per the agreed tariff.", "order": 7, "title": "Documentation Requirements"}, {"id": "consignment-notes", "body": "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.\nA 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.", "order": 8, "title": "Consignment Notes"}, {"id": "termination", "body": "The contract may be terminated:\n- Upon mutual consent of the parties.\n- Upon completion of the contract period.\n- If either or both parties breach a fundamental provision of the contract, upon prior legal notice delivered by either party.", "order": 9, "title": "Termination of Contract"}, {"id": "effectiveness", "body": "The contract shall come into full force and effect on the date when all of the following are accomplished:\n- The contract is signed by the Client and the Service Provider.\n- The Service Provider has received the advance payment of 100% of the contract price for each train set of cargo.", "order": 10, "title": "Contract Effectiveness"}, {"id": "cargo-amount", "body": "The minimum cargo to be transported shall be one wagon.", "order": 11, "title": "Cargo Amount"}, {"id": "duration", "body": "The contract shall last for three (3) months starting from the date of contract signing, with possible extension upon mutual agreement.", "order": 12, "title": "Duration of Contract"}, {"id": "disputes", "body": "If a dispute arises between the parties, they shall exert efforts to settle their differences amicably.\nIf the parties fail to settle their disputes amicably, the case shall be taken to the competent Federal Court of law presiding in Addis Ababa.\nThe governing law shall be the laws of the Federal Democratic Republic of Ethiopia.", "order": 13, "title": "Settlement of Disputes"}, {"id": "customs-clearing", "body": "The Service Provider shall carry out customs clearing on behalf of the Client for the cargo covered by this Agreement, including declaration, lodgement, and follow-up at the customs stations of Djibouti and Ethiopia as applicable to the agreed corridor.\nThe Service Provider shall act only within the authority granted by the Client and shall not amend a declaration without the Client''s written instruction.\nCustoms duties, taxes, and any government charges assessed on the cargo remain payable by the Client and are not included in the freight price; the Service Provider shall settle them on the Client''s behalf only where the Client has placed the corresponding funds in advance.\nThe Service Provider shall hand over all customs documents obtained in the course of clearing to the Client upon completion of each shipment.", "order": 14, "title": "Customs Clearing Services"}, {"id": "customs-client-duties", "body": "Grant the Service Provider a duly signed and stamped power of attorney authorising it to act as the Client''s customs agent for the duration of this Agreement.\nSubmit every document required for declaration (commercial invoice, packing list, bill of lading or airway bill, permits, certificates of origin, and any authority-specific licence) within one (1) calendar day of the Service Provider''s request.\nWarrant that the declared description, quantity, value, and tariff classification of the cargo are complete and accurate.\nBear any penalty, demurrage, storage, or re-inspection cost arising from incorrect, incomplete, or late Client-supplied information or documentation.\nSettle assessed duties and taxes within the period notified by the Service Provider, failing which the Service Provider may suspend clearing and the cargo shall remain at the Client''s risk and cost.", "order": 15, "title": "Client Obligations for Customs Clearing"}]', true, '2026-08-04 10:03:50.67187+00', '2026-08-04 10:03:50.67187+00', '2026-08-09 18:49:32.843901+00', NULL, NULL, false);
+
+
+--
+-- Data for Name: contracts; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: customer_truck_assignments; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: customer_truck_containers; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: customers; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: djibouti_import_incidents; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: drivers; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: dropdown_options; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.dropdown_options VALUES
+	('1d1498ba-b7f3-4f47-a59d-5244ad61c686', '98bd5f06-f4e3-440d-ba47-e19c144450e3', '3', '3 months', NULL, false, 0, NULL, '2026-07-27 11:32:01.485422+00', '2026-07-27 11:32:01.485422+00', NULL),
+	('3b034dda-71e4-4ddb-81d5-cbc3f06d6ef6', 'c47a2893-335c-4817-9328-fb9890a4b1d9', '180', '6 months', NULL, false, 0, NULL, '2026-07-27 11:32:01.491804+00', '2026-07-27 11:32:01.491804+00', NULL),
+	('629e5c65-c59a-47d1-aca1-81bf6affb55e', 'c47a2893-335c-4817-9328-fb9890a4b1d9', '365', '1 year', NULL, false, 1, NULL, '2026-07-27 11:32:01.491804+00', '2026-07-27 11:32:01.491804+00', NULL),
+	('7e65977a-ec35-47e7-aca4-3390199b8cfd', 'c47a2893-335c-4817-9328-fb9890a4b1d9', '730', '2 years', NULL, false, 2, NULL, '2026-07-27 11:32:01.491804+00', '2026-07-27 11:32:01.491804+00', NULL),
+	('da01bfc4-15d5-4945-94a0-3a51deb70e60', 'ce45706a-1179-4e8f-99d5-479fab15613e', '2', '2 days', NULL, false, 0, NULL, '2026-07-27 11:32:02.553783+00', '2026-07-27 11:32:02.553783+00', NULL),
+	('9cf87112-0fcd-41ab-b650-3e2d3124ce78', 'ce45706a-1179-4e8f-99d5-479fab15613e', '3', '3 days', NULL, false, 1, NULL, '2026-07-27 11:32:02.553783+00', '2026-07-27 11:32:02.553783+00', NULL),
+	('74acb78d-d173-4880-8806-14190b5cf495', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8002', '8002', NULL, false, 0, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('502b4864-577f-421b-9d90-e20be2028b7d', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8102', '8102', NULL, false, 1, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('08118cfb-c024-492d-9a56-fe8a5617b168', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8202', '8202', NULL, false, 2, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('301ead71-e0d7-4df4-af97-a158bf794314', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8302', '8302', NULL, false, 3, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('2b6e0ea2-83b0-4a04-8b16-77500bfdd518', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8402', '8402', NULL, false, 4, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('8fec2516-6d94-448f-be20-e79f4a4be55d', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8502', '8502', NULL, false, 5, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('51ead9ce-4f14-47d1-a8f0-1573d80835d3', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8602', '8602', NULL, false, 6, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('7fdd3fca-2f9a-4db8-ad6f-35b6e6d3b6fd', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8702', '8702', NULL, false, 7, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('849d5172-6191-4649-bbe5-13cf8a4f68b4', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8802', '8802', NULL, false, 8, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('7ac8d28d-4cf0-4ca4-aebe-52c79c4709bd', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '8902', '8902', NULL, false, 9, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('348c3355-80d9-4827-b10b-cb76baa53f79', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '9002', '9002', NULL, false, 10, NULL, '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL),
+	('43fb7b8c-ddd6-4376-aebf-847cc0cc00fb', 'c47a2893-335c-4817-9328-fb9890a4b1d9', '90', '3 months', NULL, false, 1, '{"color": "#00094"}', '2026-07-22 06:21:54.101+00', '2026-07-22 06:21:54.101+00', NULL),
+	('5c84104d-7427-4ef0-887f-5b8407671bd9', 'c47a2893-335c-4817-9328-fb9890a4b1d9', '60', '2 months', NULL, false, 2, NULL, '2026-07-22 06:21:54.101+00', '2026-07-22 06:21:54.101+00', NULL),
+	('19f26681-8f22-4d9d-ae50-e705da6abff4', 'c47a2893-335c-4817-9328-fb9890a4b1d9', '30', '1 month', NULL, false, 3, NULL, '2026-07-22 06:21:54.101+00', '2026-07-22 06:21:54.101+00', NULL),
+	('981397d5-b5fc-4371-92e0-150b881f849c', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '9008', '9008', NULL, false, 12, NULL, '2026-07-23 13:00:05.172+00', '2026-07-23 13:00:05.172+00', NULL),
+	('57414f87-4122-4814-9b2d-7bbe08e7361b', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '1014', '1014', 'BULK TRAIN', false, 13, '{"color": "#0EDF"}', '2026-07-23 13:00:05.172+00', '2026-07-23 13:00:05.172+00', NULL),
+	('8618306c-f4c8-40f1-ab62-922b4a39b07c', 'f64a70f6-30ec-49f6-88be-43e16756ae3d', '7002', '7002', 'Container', false, 14, '{"color": "#0EDF"}', '2026-07-23 13:00:05.172+00', '2026-07-23 13:00:05.172+00', NULL);
+
+
+--
+-- Data for Name: dropdown_settings; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.dropdown_settings VALUES
+	('98bd5f06-f4e3-440d-ba47-e19c144450e3', 'general_contract_period', 'General Contract Period (months)', 'How many months a general contract stays open for ordering after activation.', false, NULL, '2026-07-27 11:32:01.485422+00', '2026-07-27 11:32:01.485422+00', NULL),
+	('c47a2893-335c-4817-9328-fb9890a4b1d9', 'contract_validity_periods', 'Contract Validity Periods (days)', 'Validity durations (in days) a staff can choose when accepting a submitted contract.', false, NULL, '2026-07-27 11:32:01.491804+00', '2026-07-27 11:32:01.491804+00', NULL),
+	('ce45706a-1179-4e8f-99d5-479fab15613e', 'ro_vessel_min_days', 'RO vessel minimum lead time (days)', 'Minimum days between today and the vessel departure date on an export Release Order.', false, NULL, '2026-07-27 11:32:02.553783+00', '2026-07-27 11:32:02.553783+00', NULL),
+	('f64a70f6-30ec-49f6-88be-43e16756ae3d', 'import_train_numbers', 'Import train numbers', 'Even IMPORT run numbers (Djibouti → Ethiopia) selectable when building a train. The paired export number is derived automatically (import − 1).', false, '{"clearable": true, "searchable": true}', '2026-07-27 11:32:03.871542+00', '2026-07-27 11:32:03.871542+00', NULL);
+
+
+--
+-- Data for Name: eims_system_state; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: empty_container_returns; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: exchange_settings; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.exchange_settings VALUES
+	('02889b8a-8a21-4727-9410-bdd9ac9ec024', 162.824500, 'AUTO', '2026-08-07 08:57:41.31+00', NULL, '2026-08-05 07:47:36.666399+00', '2026-08-07 08:57:41.311509+00', NULL);
+
+
+--
+-- Data for Name: external_profiles; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.external_profiles VALUES
+	('9ae4aac8-7e8c-43f0-a707-d29b9767742a', '70b7c52e-cd3c-4b74-89ea-3e4bd6c312c5', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', 'Hilina', 'Regassa', NULL, NULL, true, '2026-08-09 11:55:07.46652+00', '2026-08-09 12:03:29.302612+00', NULL, 'poa', false);
+
+
+--
+-- Data for Name: facilities; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: facility_handling_events; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: fayda_verification_sessions; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.fayda_verification_sessions VALUES
+	('56cd07d8-be79-4809-a025-04ce745dfa65', 'iCKuTwzcpq2Gj1Rl2KUqb5Lsk2Tt0yLjWvudoklKDiY', '', 'VERIFY', 'PORTAL', false, 'COMPLETED', NULL, NULL, NULL, '2026-08-09 12:10:23.625+00', '2026-08-09 11:56:55.948+00', '2026-08-09 11:55:23.627045+00', '2026-08-09 11:56:55.950093+00', NULL),
+	('de6bcd87-3422-4e01-8f01-5cf403898178', '4z92nDqxwtUYa6qdNrZ8e9s9rS_egN2b37N25XIA_-E', '', 'VERIFY', 'PORTAL', false, 'COMPLETED', NULL, NULL, NULL, '2026-08-09 12:16:44.547+00', '2026-08-09 12:02:57.9+00', '2026-08-09 12:01:44.549122+00', '2026-08-09 12:02:57.903021+00', NULL),
+	('3d9347ec-e14a-4556-a9af-d2941ee94df9', '1y8PBJHJS_MVtXfbwc_I4MYVf86NqKk5kwVq-YcvApM', '', 'VERIFY', 'PORTAL', false, 'COMPLETED', NULL, NULL, NULL, '2026-08-09 12:18:31.954+00', '2026-08-09 12:04:51.574+00', '2026-08-09 12:03:31.956729+00', '2026-08-09 12:04:51.576704+00', NULL),
+	('1be2605d-85f7-42e0-9e97-0c19b2e3409b', 'jRN_Yi9kqION5UTKlMiTNAhDlVBXcHdHGkTtBXXvFf0', '', 'VERIFY', 'PORTAL', false, 'COMPLETED', NULL, NULL, NULL, '2026-08-09 12:23:49.136+00', '2026-08-09 12:09:34.621+00', '2026-08-09 12:08:49.139308+00', '2026-08-09 12:09:34.623765+00', NULL),
+	('960d964a-32ac-4ca4-95fc-bd2ce88faed3', 'Oj6cJTSRXHrqCJeahB5qIO7feFfTWS4sK3mpcNhC75Q', '', 'VERIFY', 'PORTAL', false, 'COMPLETED', NULL, NULL, NULL, '2026-08-09 12:27:18.283+00', '2026-08-09 12:13:50.421+00', '2026-08-09 12:12:18.285552+00', '2026-08-09 12:13:50.423474+00', NULL),
+	('7d7f9042-cd0b-4873-ac62-d2eaefe80af3', 'NXE8OstTpO-5vc0KZSwlE5AynDzrk2I_wD8hWDedDGQ', '', 'VERIFY', 'PORTAL', false, 'COMPLETED', NULL, NULL, NULL, '2026-08-09 12:30:43.275+00', '2026-08-09 12:16:54.466+00', '2026-08-09 12:15:43.276603+00', '2026-08-09 12:16:54.467576+00', NULL),
+	('39a7b2f9-a3d2-4286-993a-5f3650353ec3', 'fiH7KCIMhoicqOytynLj8rAaEfrlHr0kHJkkQCIAq20', '', 'VERIFY', 'PORTAL', false, 'COMPLETED', NULL, NULL, NULL, '2026-08-09 12:43:53.926+00', '2026-08-09 12:29:44.957+00', '2026-08-09 12:28:53.928086+00', '2026-08-09 12:29:44.958531+00', NULL),
+	('73fdac88-efba-489f-b191-edcac845de0d', 'ZP-yGtLoQzObob9elpW3wGU7dXlZv2iFV8-nuKGtKuw', 'qZ4U0SHbel3W5-OaWZ5SyuFdPVjP7nJ8VOcA3d6W_8IzFkDBwoQTy4KAhqYr2xG_RQgRWRXKXPVRb8zLty1svw', 'VERIFY', 'PORTAL', false, 'PENDING', NULL, NULL, NULL, '2026-08-09 14:18:03.474+00', NULL, '2026-08-09 14:03:03.476409+00', '2026-08-09 14:03:03.476409+00', NULL);
+
+
+--
+-- Data for Name: ff_clients; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: file_upload_fields; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.file_upload_fields VALUES
+	('ca04e1ea-e785-4655-b23f-27c9d5e19451', 'b568810c-b853-404e-95f0-8304a9ddc75e', 'Bill of Lading/Waybill', 'Bill of Lading/Waybill', NULL, true, false, 1, '{pdf}', 20, 1, '2026-08-04 10:20:34.974496+00', '2026-08-04 10:20:34.974496+00', NULL, NULL, NULL, NULL, NULL),
+	('be6cf792-5d1e-429c-a316-033f2043e78e', 'b568810c-b853-404e-95f0-8304a9ddc75e', 'Commercial Invoice', 'Commercial Invoice', NULL, true, true, 10, '{pdf}', 20, 2, '2026-08-04 10:20:34.974496+00', '2026-08-04 10:20:34.974496+00', NULL, NULL, NULL, NULL, NULL),
+	('b758736f-f83d-4231-b5b8-940d4229a5cf', 'b568810c-b853-404e-95f0-8304a9ddc75e', 'Packing List', 'Packing List', NULL, true, true, 10, '{pdf}', 20, 3, '2026-08-04 10:20:34.974496+00', '2026-08-04 10:20:34.974496+00', NULL, NULL, NULL, NULL, NULL),
+	('8bd784cb-1e56-4978-a3b8-348343eda220', 'b568810c-b853-404e-95f0-8304a9ddc75e', 'Certificate of Origin', 'Certificate of Origin', NULL, true, true, 5, '{pdf}', 20, 4, '2026-08-04 10:20:34.974496+00', '2026-08-04 10:20:34.974496+00', NULL, NULL, NULL, NULL, NULL),
+	('b5873ab6-7517-48b7-8ebd-1ffa377060ce', 'b568810c-b853-404e-95f0-8304a9ddc75e', 'Bank Permit/ Franco Valuta', 'Bank Permit/Franco Valuta', NULL, true, false, 1, '{pdf}', 20, 5, '2026-08-04 10:20:34.974496+00', '2026-08-04 10:20:34.974496+00', NULL, NULL, NULL, NULL, NULL),
+	('0118060a-eefe-4a08-a91b-0043ed4b616c', 'b568810c-b853-404e-95f0-8304a9ddc75e', 'Cargo Insurance', 'Cargo Insurance', NULL, false, false, 1, '{pdf}', 20, 6, '2026-08-04 10:20:34.974496+00', '2026-08-04 10:20:34.974496+00', NULL, NULL, NULL, NULL, NULL),
+	('838252c8-f376-4dd7-aadd-ac3e44c2b23c', 'cb1806df-7169-4dcc-8adb-801ff833f610', 'Bill of Lading/Waybill', 'Bill of Lading/Waybill', NULL, true, false, 1, '{pdf}', 20, 1, '2026-08-04 10:21:14.549605+00', '2026-08-04 10:21:14.549605+00', NULL, NULL, NULL, NULL, NULL),
+	('61b32e04-33eb-4a00-bc67-53951d88ecbc', 'cb1806df-7169-4dcc-8adb-801ff833f610', 'Bank permit/FV', 'Bank Permit/FV', NULL, true, false, 1, '{pdf}', 20, 2, '2026-08-04 10:21:14.549605+00', '2026-08-04 10:21:14.549605+00', NULL, NULL, NULL, NULL, NULL),
+	('2b677ec2-677d-4cca-a59d-f3bd3fac02ff', 'cb1806df-7169-4dcc-8adb-801ff833f610', 'Certificate of Origin', 'Certificate of Origin', NULL, true, false, 1, '{pdf}', 20, 3, '2026-08-04 10:21:14.549605+00', '2026-08-04 10:21:14.549605+00', NULL, NULL, NULL, NULL, NULL),
+	('e8af3fb7-c919-4750-adbd-7e0456e7dc39', 'cb1806df-7169-4dcc-8adb-801ff833f610', 'Commercial Invoice', 'Commercial Invoice', NULL, true, true, 5, '{pdf}', 20, 4, '2026-08-04 10:21:14.549605+00', '2026-08-04 10:21:14.549605+00', NULL, NULL, NULL, NULL, NULL),
+	('d159e493-46e8-4d75-aa27-f1c475baa51b', 'cb1806df-7169-4dcc-8adb-801ff833f610', 'Packing List', 'Packing List', NULL, true, true, 5, '{pdf}', 20, 5, '2026-08-04 10:21:14.549605+00', '2026-08-04 10:21:14.549605+00', NULL, NULL, NULL, NULL, NULL),
+	('8046903a-f7ab-4db4-bd52-2dc8144c4b66', 'cb1806df-7169-4dcc-8adb-801ff833f610', 'Cargo Insurance', 'Cargo Insurance', NULL, false, false, 1, '{pdf}', 20, 6, '2026-08-04 10:21:14.549605+00', '2026-08-04 10:21:14.549605+00', NULL, NULL, NULL, NULL, NULL),
+	('78529880-bc7e-4c7a-b16c-66bd138a6306', '1723498f-c8a8-4af8-a6cb-e80e74cacc22', 'Packing List', 'Packing List', NULL, true, true, 5, '{pdf}', 20, 1, '2026-08-04 10:26:49.082214+00', '2026-08-04 10:26:49.082214+00', NULL, NULL, NULL, NULL, NULL),
+	('b11ab134-f3a2-40cd-a05f-c0db73721cdd', '1723498f-c8a8-4af8-a6cb-e80e74cacc22', 'Import Declaration', 'Import declaration', NULL, false, true, 5, '{pdf}', 20, 2, '2026-08-04 10:26:49.082214+00', '2026-08-04 10:26:49.082214+00', NULL, NULL, NULL, NULL, NULL),
+	('6a077dc6-cb07-48ca-bc31-69a32e4bf43f', '1723498f-c8a8-4af8-a6cb-e80e74cacc22', 'Item Pictures', 'Photo of Items', NULL, false, true, 5, '{jpg,jpeg,png}', 100, 3, '2026-08-04 10:26:49.082214+00', '2026-08-04 10:26:49.082214+00', NULL, NULL, NULL, NULL, NULL),
+	('b70a7e21-15a7-4475-b1a4-59e699b5a697', '1723498f-c8a8-4af8-a6cb-e80e74cacc22', 'Bill of Lading/Waybill', 'Bill of Lading', NULL, true, false, 1, '{pdf}', 20, 4, '2026-08-04 10:26:49.082214+00', '2026-08-04 10:26:49.082214+00', NULL, NULL, NULL, NULL, NULL),
+	('43d91420-e4bc-4a63-ab2a-9fcceeef1483', '1723498f-c8a8-4af8-a6cb-e80e74cacc22', 'Ethiopia T1 and Djibouti T1', 'Ethiopia T1 and Djibouti T1', NULL, false, true, 10, '{pdf}', 30, 5, '2026-08-04 10:26:49.082214+00', '2026-08-04 10:26:49.082214+00', NULL, NULL, NULL, NULL, NULL),
+	('8e37a920-82ff-4b71-adf2-1d2e20030299', '08a29c8d-1480-41d6-b552-034c5ead4c93', 'Bill of Lading/Waybill', 'Bill of Lading/Waybill', NULL, true, false, 1, '{pdf}', 20, 1, '2026-08-04 10:29:36.693631+00', '2026-08-04 10:29:36.693631+00', NULL, NULL, NULL, NULL, NULL),
+	('843b736a-a0fe-4a53-9b37-43b039906304', '08a29c8d-1480-41d6-b552-034c5ead4c93', 'Packing List', 'Packing List', NULL, true, true, 10, '{pdf}', 20, 2, '2026-08-04 10:29:36.693631+00', '2026-08-04 10:29:36.693631+00', NULL, NULL, NULL, NULL, NULL),
+	('37a44809-8842-4bfa-9d92-9c2e516a35e0', '08a29c8d-1480-41d6-b552-034c5ead4c93', 'Import Declaration', 'Import declaration', NULL, false, true, 5, '{pdf}', 20, 3, '2026-08-04 10:29:36.693631+00', '2026-08-04 10:29:36.693631+00', NULL, NULL, NULL, NULL, NULL),
+	('641815b8-c4d5-45fa-b714-5705efde87d7', '08a29c8d-1480-41d6-b552-034c5ead4c93', 'Ethiopia T1 and Djibouti T1', 'Ethiopia T1 and Djibouti T1', NULL, false, true, 5, '{pdf}', 20, 4, '2026-08-04 10:29:36.693631+00', '2026-08-04 10:29:36.693631+00', NULL, NULL, NULL, NULL, NULL),
+	('921e0d91-6802-49a8-b0f3-bd76f757aeb8', '85e1910c-25ba-4c48-a452-6fef6d39b10a', 'Booking Confirmation', 'Booking Confirmation', NULL, true, false, 1, '{pdf}', 20, 1, '2026-08-04 10:35:27.984353+00', '2026-08-04 10:35:27.984353+00', NULL, NULL, NULL, NULL, NULL),
+	('a75cedb3-d7b5-4d7d-bd84-1c9d40597f8b', '85e1910c-25ba-4c48-a452-6fef6d39b10a', 'Shipping Instruction', 'Shipping Instruction', NULL, true, false, 1, '{pdf}', 20, 2, '2026-08-04 10:35:27.984353+00', '2026-08-04 10:35:27.984353+00', NULL, NULL, NULL, NULL, NULL),
+	('726b962d-97c0-4b62-860e-f2a20c150765', '85e1910c-25ba-4c48-a452-6fef6d39b10a', 'Verified Gross Mass (VGM)', 'Verified Gross Mass (VGM)', NULL, true, false, 1, '{pdf}', 20, 3, '2026-08-04 10:35:27.984353+00', '2026-08-04 10:35:27.984353+00', NULL, NULL, NULL, NULL, NULL),
+	('7ed6024a-7498-4877-9af4-32d98a8a5f19', '85e1910c-25ba-4c48-a452-6fef6d39b10a', 'Train Waybill', 'Train Waybill', NULL, true, false, 1, '{pdf}', 20, 4, '2026-08-04 10:35:27.984353+00', '2026-08-04 10:35:27.984353+00', NULL, NULL, NULL, NULL, NULL),
+	('015d6cfd-4740-4baa-880f-f081bd064a44', '85e1910c-25ba-4c48-a452-6fef6d39b10a', 'Commercial Invoice', 'Commercial Invoice', NULL, true, true, 5, '{pdf}', 20, 5, '2026-08-04 10:35:27.984353+00', '2026-08-04 10:35:27.984353+00', NULL, NULL, NULL, NULL, NULL),
+	('600f2e27-9fba-4d6a-ac78-7b354413a6ae', '85e1910c-25ba-4c48-a452-6fef6d39b10a', 'Packing List', 'Packing List', NULL, true, true, 5, '{pdf}', 20, 6, '2026-08-04 10:35:27.984353+00', '2026-08-04 10:35:27.984353+00', NULL, NULL, NULL, NULL, NULL),
+	('00e51737-12e5-4503-9ea6-3e4f8bc9ac3d', '85e1910c-25ba-4c48-a452-6fef6d39b10a', 'Bank Permit', 'Bank Permit', NULL, true, false, 1, '{pdf}', 20, 7, '2026-08-04 10:35:27.984353+00', '2026-08-04 10:35:27.984353+00', NULL, NULL, NULL, NULL, NULL),
+	('3ccceb6b-1e1f-4f13-a974-dd73f2c2d738', 'c1d7ae47-9703-4a1d-8cd3-0974d59acb3d', 'Release Order (RO)', 'Release Order (RO)', NULL, true, true, 5, '{pdf,jpg,jpeg,png}', 20, 1, '2026-08-04 10:38:04.440343+00', '2026-08-04 10:38:04.440343+00', NULL, NULL, NULL, NULL, NULL),
+	('9ea15c05-aebe-4133-b2ad-5f52bbbbdf58', 'c1d7ae47-9703-4a1d-8cd3-0974d59acb3d', 'Verified Gross Mass (VGM)', 'Verified Gross Mass (VGM)', NULL, true, true, 5, '{pdf,jpg,jpeg,png}', 20, 2, '2026-08-04 10:38:04.440343+00', '2026-08-04 10:38:04.440343+00', NULL, NULL, NULL, NULL, NULL),
+	('5635a410-3e82-411e-bd03-47abedcede6b', 'c1d7ae47-9703-4a1d-8cd3-0974d59acb3d', 'Export Declaration', 'Export declaration', NULL, false, true, 5, '{pdf}', 20, 3, '2026-08-04 10:38:04.440343+00', '2026-08-04 10:38:04.440343+00', NULL, NULL, NULL, NULL, NULL),
+	('5838b4a0-adfc-44ba-b648-b0ac5c17f63a', 'c1d7ae47-9703-4a1d-8cd3-0974d59acb3d', 'Export T1', 'Export T1', NULL, false, false, 1, '{pdf}', 10, 4, '2026-08-04 10:38:04.440343+00', '2026-08-04 10:38:04.440343+00', NULL, NULL, NULL, NULL, NULL),
+	('99a17b67-f198-4add-a778-10b338f75ada', '318aa395-9f14-4326-92dd-7af2ee960e00', 'Packing List', 'Packing List', NULL, true, true, 5, '{pdf,jpg,jpeg,png}', 20, 1, '2026-08-04 10:39:12.558482+00', '2026-08-04 10:39:12.558482+00', NULL, NULL, NULL, NULL, NULL),
+	('735b7cc7-586c-4f81-8fd2-c73184aa8497', '318aa395-9f14-4326-92dd-7af2ee960e00', 'Waybill', 'Waybill', NULL, true, true, 5, '{pdf,jpg,jpeg,png}', 20, 2, '2026-08-04 10:39:12.558482+00', '2026-08-04 10:39:12.558482+00', NULL, NULL, NULL, NULL, NULL),
+	('f34aeac3-657e-49a7-993b-a378434ad555', 'a017fb18-9c12-41c0-8d18-bff1b7cfd247', 'Drivers License', 'Drivers License', NULL, true, true, 5, '{pdf,jpg,jpeg,png}', 20, 1, '2026-08-04 10:41:11.331705+00', '2026-08-04 10:41:11.331705+00', NULL, NULL, NULL, NULL, NULL),
+	('8a817b47-e6c1-4dde-bcdc-8be16d5bcb99', 'a017fb18-9c12-41c0-8d18-bff1b7cfd247', 'Kebele ID', 'Kebele ID', NULL, true, false, 1, '{pdf,jpg,jpeg,png}', 10, 2, '2026-08-04 10:41:11.331705+00', '2026-08-04 10:41:11.331705+00', NULL, NULL, NULL, NULL, NULL),
+	('1b9d046c-48ea-4e93-9df1-cd8f0605ba61', 'a017fb18-9c12-41c0-8d18-bff1b7cfd247', 'Company ID', 'Company ID', NULL, false, false, 1, '{pdf,jpg,jpeg,png}', 20, 3, '2026-08-04 10:41:11.331705+00', '2026-08-04 10:41:11.331705+00', NULL, NULL, NULL, NULL, NULL),
+	('6475f9ef-dfd3-4639-b12c-b9f1fcbfb4e3', 'dbabef1b-9203-4fd3-9808-ba2cc1618c36', 'Commercial Registration', 'Commercial Registration', NULL, true, false, 1, '{pdf,jpg,jpeg,png}', 30, 1, '2026-08-04 10:43:25.014753+00', '2026-08-04 10:43:25.014753+00', NULL, NULL, NULL, NULL, NULL),
+	('efcab3cf-b166-47de-a795-e5c597df4ab1', 'dbabef1b-9203-4fd3-9808-ba2cc1618c36', 'TIN Certificate', 'TIN Certificate', NULL, true, false, 1, '{pdf,jpg,jpeg,png}', 30, 2, '2026-08-04 10:43:25.014753+00', '2026-08-04 10:43:25.014753+00', NULL, NULL, NULL, NULL, NULL),
+	('6e7b21e1-4c6a-4707-86c8-5a3039222739', 'dbabef1b-9203-4fd3-9808-ba2cc1618c36', 'Business License', 'Business License', NULL, true, false, 1, '{pdf,jpg,jpeg,png}', 30, 3, '2026-08-04 10:43:25.014753+00', '2026-08-04 10:43:25.014753+00', NULL, NULL, NULL, NULL, NULL),
+	('8e065892-e909-4635-bc88-2ef261c0e089', 'dbabef1b-9203-4fd3-9808-ba2cc1618c36', 'National ID', 'National ID', NULL, true, true, 5, '{pdf,jpg,jpeg,png}', 30, 4, '2026-08-04 10:43:25.014753+00', '2026-08-04 10:43:25.014753+00', NULL, NULL, NULL, NULL, NULL),
+	('f66e7795-749d-49b8-a34b-17bdc502a42e', 'a59d02bf-f46a-44b8-b5b5-2b88ef3f5116', 'Material Safety Data Sheet (MSDS)', 'Material Safety Data Sheet (MSDS)', NULL, true, true, 5, '{pdf}', 100, 1, '2026-08-04 10:44:03.967397+00', '2026-08-04 10:44:03.967397+00', NULL, NULL, NULL, NULL, NULL),
+	('018ec1b3-bc42-470b-984a-b670adb98d40', '14320fce-352c-4c45-aff3-2a1ac89f8e93', 'Commercial Registration', 'Commercial Registration', NULL, true, false, 1, '{pdf,jpg,jpeg,png}', 21, 1, '2026-08-04 10:50:46.395716+00', '2026-08-04 10:50:46.395716+00', NULL, NULL, NULL, NULL, NULL),
+	('27efd0e3-0152-408a-ac96-8d36231f0104', '14320fce-352c-4c45-aff3-2a1ac89f8e93', 'TIN Certificate', 'TIN Certificate', NULL, true, false, 1, '{pdf,jpg,jpeg,png}', 20, 2, '2026-08-04 10:50:46.395716+00', '2026-08-04 10:50:46.395716+00', NULL, NULL, NULL, NULL, NULL),
+	('8dc7b971-bf96-4248-b808-14dc1d9e91c5', '14320fce-352c-4c45-aff3-2a1ac89f8e93', 'Business License / Investment License', 'Business License / Investment License', NULL, true, true, 5, '{pdf,jpg,jpeg,png}', 20, 3, '2026-08-04 10:50:46.395716+00', '2026-08-04 10:50:46.395716+00', NULL, NULL, NULL, NULL, NULL),
+	('9dcccc5e-85fa-4fe3-82ab-e43528e63b82', '14320fce-352c-4c45-aff3-2a1ac89f8e93', 'Delegated person National ID', 'Delegated person National ID', NULL, true, false, 1, '{pdf,jpg,jpeg,png}', 10, 4, '2026-08-04 10:50:46.395716+00', '2026-08-04 10:50:46.395716+00', NULL, NULL, NULL, NULL, NULL),
+	('9220c51a-883f-4903-9a38-371a0f34ce70', '14320fce-352c-4c45-aff3-2a1ac89f8e93', 'Passport of Owner/Investor', 'Passport of Owner/Investor', NULL, false, false, 1, '{pdf,jpg,jpeg,png}', 21, 5, '2026-08-04 10:50:46.395716+00', '2026-08-04 10:50:46.395716+00', NULL, NULL, NULL, NULL, NULL),
+	('a5fe3255-7801-40f5-84ac-c0f28d5789f8', '8dd290f8-9ac7-466a-b754-b37ddf75a0d3', 'jj', 'j', NULL, false, false, 1, '{pdf,png,jpeg,jpg}', 10, 1, '2026-08-05 21:36:43.819425+00', '2026-08-05 21:36:43.819425+00', NULL, NULL, NULL, NULL, NULL);
+
+
+--
+-- Data for Name: file_upload_settings; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.file_upload_settings VALUES
+	('dbabef1b-9203-4fd3-9808-ba2cc1618c36', 'company_onboarding_documents_ethiopian', 'Ethiopian company onboarding documents', 'Required documents for external company onboarding, by company nationality.', 'customer', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('14320fce-352c-4c45-aff3-2a1ac89f8e93', 'company_onboarding_documents_foreign', 'Foreign company onboarding documents', 'Required documents for external company onboarding, by company nationality.', 'customer', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('b568810c-b853-404e-95f0-8304a9ddc75e', 'clearance_import_container_with_customs', 'Import container clearance documents (with customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('08a29c8d-1480-41d6-b552-034c5ead4c93', 'clearance_import_container_without_customs', 'Import container documents (without customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('85e1910c-25ba-4c48-a452-6fef6d39b10a', 'clearance_export_container_with_customs', 'Export container clearance documents (with customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('c1d7ae47-9703-4a1d-8cd3-0974d59acb3d', 'clearance_export_container_without_customs', 'Export container documents (without customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('cb1806df-7169-4dcc-8adb-801ff833f610', 'clearance_import_bulk_with_customs', 'Import bulk clearance documents (with customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('1723498f-c8a8-4af8-a6cb-e80e74cacc22', 'clearance_import_bulk_without_customs', 'Import bulk documents (without customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('520ab103-159c-4c87-adfe-32878ede33f5', 'clearance_export_bulk_with_customs', 'Export bulk clearance documents (with customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('8dd290f8-9ac7-466a-b754-b37ddf75a0d3', 'clearance_export_bulk_without_customs', 'Export bulk documents (without customs)', 'Operation/clearance documents collected after contract execution, by operation, freight type and customs.', 'booking_clearance', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('a017fb18-9c12-41c0-8d18-bff1b7cfd247', 'driver_docs', 'Driver documents', 'Documents uploaded against a driver profile (license, ID, contracts, etc.).', 'driver', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('a59d02bf-f46a-44b8-b5b5-2b88ef3f5116', 'hazardous_documents', 'Hazardous cargo documents', 'Documents required when a one-time contract''s cargo is flagged hazardous.', 'contract_intake', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL),
+	('318aa395-9f14-4326-92dd-7af2ee960e00', 'intercity_documents', 'Intercity documents', 'Intercity shipment documents — contract-level for ONE_TIME (after both signatures), per booking for GENERAL; reviewed by Operations.', 'booking', '2026-08-04 10:04:29.802713+00', '2026-08-04 10:04:29.802713+00', NULL);
+
+
+--
+-- Data for Name: files; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.files VALUES
+	('cfbc6c70-fc9d-4fd4-81ba-acf07d5d713d', '37f9df6c-95a8-41a6-81fc-4ece3c31a712', 'companies', 'poa_delegation_letter', 'sample (1).pdf', 'https://file.smartoffice.edrsc.com:443/edr-prod/companies/37f9df6c-95a8-41a6-81fc-4ece3c31a712/1786277655116_4ec4a41d_sample_1_.pdf', 18810, 'application/pdf', '2026-08-09 12:14:15.132835+00', '2026-08-09 12:14:15.132835+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL);
+
+
+--
+-- Data for Name: first_mile; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.first_mile VALUES
+	('14752f25-e0d2-416f-95ab-f310a8b45e3a', 'd1d73d4d-c2c9-4025-af7c-5c2c5327e9f1', 'READY_TO_TRANSIT', 4900.00, 0.00, 18.00, NULL, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, true),
+	('f8e18558-a5ce-4bd4-b14f-d1a28ec31964', '524ef40f-a1ee-401d-8ecb-f1ce9f5374e4', 'READY_TO_TRANSIT', 5500.00, 0.00, 18.00, NULL, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, true),
+	('0bcc4de7-1957-4b98-91ef-87e6949c1fca', 'ec0da804-5163-4f1f-87a7-8a9215159146', 'READY_TO_TRANSIT', 3200.00, 0.00, 18.00, NULL, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, true);
+
+
+--
+-- Data for Name: first_mile_container_allocations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: first_mile_vehicle_assignments; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: fleet_events; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: fuel_consumption; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: fuel_purchases; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: gps_devices; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: gps_positions; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: import_customs_finalizations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: import_djibouti_operations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.import_djibouti_operations VALUES
+	('7a3c4300-274b-4cdd-b743-0a2f6c4f93c1', '114535c3-880b-46b3-b6fc-7953a5d0de5b', '{}', NULL, NULL, NULL, '2026-08-09 20:18:31.327952+00', NULL, NULL, NULL, '2026-08-09 20:18:31.327952+00', '2026-08-09 20:18:31.327952+00', NULL);
+
+
+--
+-- Data for Name: incidents; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: interchange_document_items; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: interchange_documents; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: invoice_lines; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: invoices; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: last_mile; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.last_mile VALUES
+	('4b65f06f-1195-4eaf-85b1-fe4b8df63715', '346725c9-6075-4283-a59d-c0cfb58d2e52', 'READY_TO_TRANSIT', 5600.00, 0.00, 22.00, NULL, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, true, NULL, NULL, NULL, NULL, '{}', NULL, NULL),
+	('d732104f-ee3c-482c-8c03-20a7067844d3', 'dc105e51-7acd-4706-a7a0-b77dc4b28059', 'READY_TO_TRANSIT', 6000.00, 0.00, 22.00, NULL, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, true, NULL, NULL, NULL, NULL, '{}', NULL, NULL),
+	('3eea018d-9bf0-4ec6-9bc1-dc20a1fe7818', 'd733c2dd-f5f0-4b88-b675-1447fc30d821', 'READY_TO_TRANSIT', 4500.00, 0.00, 22.00, NULL, NULL, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, true, NULL, NULL, NULL, NULL, '{}', NULL, NULL);
+
+
+--
+-- Data for Name: last_mile_container_allocations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: last_mile_requests; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.last_mile_requests VALUES
+	('52d80132-826e-4683-8ec0-18e679fbeddf', '346725c9-6075-4283-a59d-c0cfb58d2e52', '114535c3-880b-46b3-b6fc-7953a5d0de5b', 'APPROVED', '{LMRT1234567}', '2026-08-09 20:20:00.023+00', '0270629a-1eea-43e3-adc4-fe6142d37bb3', '2026-08-09 20:45:49.576+00', 'f1534714-fa4a-4780-a081-05d4c1f6c25f', '2026-08-09 20:46:56.974+00', NULL, '4b65f06f-1195-4eaf-85b1-fe4b8df63715', '2026-08-09 20:20:00.02211+00', '2026-08-09 20:46:56.972191+00', NULL, '2026-08-15', 3500.00, '{"mode": null, "lines": [], "total": null, "currency": null, "estimatedKm": null, "advanceAmount": 3500}', '2026-08-09 20:46:56.974+00', NULL, NULL, NULL);
+
+
+--
+-- Data for Name: last_mile_vehicle_assignments; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: last_mile_vehicle_containers; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: locomotives; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.locomotives VALUES
+	('8e777b5a-2501-40d9-a138-4914d5f13cf9', 'LOCO-025', 'ERF-025', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:39:46.812+00', '2026-08-07 11:08:06.381337+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000),
+	('b34a62e0-a4a9-4563-83d6-9e2206b74b10', 'LOCO-026', 'ERF-026', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:40:34.539+00', '2026-08-07 11:08:34.146585+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000),
+	('dddc30d3-b60a-4344-bddd-71c9ad91ddec', 'LOCO-027', 'ERF-027', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:41:42.451+00', '2026-08-07 11:08:54.662291+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000),
+	('b67b7043-d216-4392-8313-7b43452e612d', 'LOCO-001', 'ERF-001', 1750.000, 'AVAILABLE', NULL, '2026-07-17 09:08:46.44+00', '2026-08-07 11:11:18.931482+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000),
+	('a752720a-46b5-4746-ad7e-8961479ba86c', 'LOCO-029', 'ERF-029', 1750.000, 'MAINTENANCE', NULL, '2026-07-17 13:44:44.639+00', '2026-08-07 11:13:43.814604+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 46.500, 10.000),
+	('18e7df4e-71ec-4928-bb51-d7ad4df6ee85', 'LOCO-021', 'ERF-021', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:00:54.921+00', '2026-08-07 11:07:06.625588+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 465.000, 10.000),
+	('a8142510-249a-491e-903f-1d05abb129f7', 'LOCO-002', 'ERF-002', 1750.000, 'AVAILABLE', NULL, '2026-07-17 09:08:58.583+00', '2026-08-07 11:01:22.208899+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('1e13bf8d-d01e-4438-993d-db77ce5203eb', 'LOCO-003', 'ERF-003', 1750.000, 'AVAILABLE', NULL, '2026-07-17 10:40:10.537+00', '2026-08-07 11:01:34.280629+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('d6907984-bcfb-4408-b823-0fecc284f393', 'LOCO-004', 'ERF-004', 1750.000, 'AVAILABLE', NULL, '2026-07-17 10:40:33.436+00', '2026-08-07 11:01:44.691011+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 93.000, 10.000),
+	('fdbb34fd-aa8a-4f55-b32d-c5629a6ae38f', 'LOCO-005', 'ERF-005', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:11:12.903+00', '2026-08-07 11:01:58.985321+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 93.000, 10.000),
+	('884ec005-4ea4-4c9c-86db-7e1617faeeba', 'LOCO-006', 'ERF-006', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:11:28.008+00', '2026-08-07 11:02:10.446392+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('5eeb26b1-0631-4870-ab4f-352ac49cf8d1', 'LOCO-007', 'ERF-007', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:31:50.666+00', '2026-08-07 11:02:25.899819+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('87662a07-2c7b-45c5-a4ff-c89fb9bc105c', 'LOCO-008', 'ERF-008', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:32:15.854+00', '2026-08-07 11:02:41.024042+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 93.000, 10.000),
+	('c07ddf04-36c6-468f-a2c6-7fd2732d8782', 'LOCO-009', 'ERF-009', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:32:25.675+00', '2026-08-07 11:02:51.893978+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 93.000, 10.000),
+	('a2fc8e45-ec84-4771-ae60-25d20fda25b1', 'LOCO-010', 'ERF-010', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:32:34.829+00', '2026-08-07 11:03:17.549299+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 'LOCO-011', 'ERF-011', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:32:40.778+00', '2026-08-07 11:03:31.795372+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('48a8700a-8c1f-449d-b731-bcb11fc94995', 'LOCO-012', 'ERF-012', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:33:10.667+00', '2026-08-07 11:03:40.907856+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('ca503969-35b6-40d4-8787-690fd8715dda', 'LOCO-013', 'ERF-013', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:34:02.086+00', '2026-08-07 11:03:59.252301+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('028d9ac6-7a2f-42c7-9168-6165afacc3ab', 'LOCO-014', 'ERF-014', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:34:31.921+00', '2026-08-07 11:04:10.060609+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('2dd03327-d9d5-4a08-af02-e59916ccea97', 'LOCO-015', 'ERF-015', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:34:55.853+00', '2026-08-07 11:04:20.359382+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('1620633d-c8ce-4130-9fb7-80edf1d86641', 'LOCO-016', 'ERF-016', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:35:35.231+00', '2026-08-07 11:04:30.669375+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('0b48c5d6-0360-49b1-b4c9-433eb1cd1a87', 'LOCO-017', 'ERF-017', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:37:25.358+00', '2026-08-07 11:04:40.055947+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('22ccb1d9-adfd-4a04-bc37-a6d4bb2ee9b7', 'LOCO-018', 'ERF-018', 1750.000, 'AVAILABLE', NULL, '2026-07-17 11:37:46.651+00', '2026-08-07 11:04:52.578328+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 'LOCO-019', 'ERF-019', 1750.000, 'AVAILABLE', NULL, '2026-07-17 12:49:06.304+00', '2026-08-07 11:05:49.794033+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('38874f67-9563-438d-b1bb-ed61c6aedc84', 'LOCO-020', 'ERF-020', 1750.000, 'AVAILABLE', NULL, '2026-07-17 12:50:06.544+00', '2026-08-07 11:06:00.483915+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 93.000, 10.000),
+	('98d11eea-94bd-4c4a-8897-f17740ea094c', 'LOCO-022', 'ERF-022', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:27:32.594+00', '2026-08-07 11:06:57.136607+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000),
+	('5d9e0a41-6b02-4f13-b431-a32bb854261c', 'LOCO-023', 'ERF-023', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:30:43.108+00', '2026-08-07 11:07:20.916649+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000),
+	('dc23c9a3-5004-4145-807e-6240b415595e', 'LOCO-024', 'ERF-024', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:31:19.365+00', '2026-08-07 11:07:37.879341+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000),
+	('c691c3cc-cfa8-4fb8-b980-ec7e53d213af', 'LOCO-031', 'ERS-031', 1750.000, 'MAINTENANCE', NULL, '2026-07-17 13:46:02.204+00', '2026-08-04 13:18:20.576924+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 93.000, 10.000),
+	('479253a8-ab4d-4d1b-8fe3-eece22e08274', 'LOCO-032', 'ERS-032', 1750.000, 'MAINTENANCE', NULL, '2026-07-17 13:46:36.005+00', '2026-08-04 13:18:47.493009+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 93.000, 10.000),
+	('d0aa7d9f-18e9-492c-b55d-790f4ce08ff2', 'LOCO-030', 'ERS-030', 1750.000, 'MAINTENANCE', NULL, '2026-07-17 13:45:24.654+00', '2026-08-04 13:19:00.259551+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 93.000, 10.000),
+	('40a7b5a3-c107-4288-ba73-70ca9a735972', 'LOCO-028', 'ERF-028', 1750.000, 'AVAILABLE', NULL, '2026-07-17 13:44:17.682+00', '2026-08-07 20:02:32.538854+00', NULL, 'ELECTRIC', 760.000, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 46.500, 10.000);
+
+
+--
+-- Data for Name: maintenance_costs; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: maintenance_intervals; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: maintenance_schedules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: migrations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.migrations VALUES
+	(300, 3250000000000, 'FreightBaseline3250000000000'),
+	(301, 3260000000000, 'InvoicePaymentProcessingStatus3260000000000'),
+	(302, 3250000000000, 'CreateLastMileRequests3250000000000'),
+	(303, 3270000000000, 'YardGpsLocation3270000000000'),
+	(304, 3280000000000, 'LastMileRateBands3280000000000'),
+	(305, 3290000000000, 'LastMileRequestContract3290000000000'),
+	(306, 3300000000000, 'BookingWagonCancellations3300000000000'),
+	(307, 3310000000000, 'WagonStatusLogs3310000000000'),
+	(308, 3320000000000, 'BulkContractTemplates3320000000000'),
+	(309, 3330000000000, 'EimsInvoiceRegistration3330000000000'),
+	(310, 3340000000000, 'EimsDocumentNumberSequence3340000000000'),
+	(311, 3350000000000, 'SupportContent3350000000000'),
+	(312, 3360000000000, 'SupportHelpSections3360000000000'),
+	(313, 3370000000000, 'SupportHelpInlineMedia3370000000000'),
+	(314, 3370000000000, 'BookingExportHandoverMode3370000000000');
+
+
+--
+-- Data for Name: notifications; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.notifications VALUES
+	('1a42f47f-09c5-4a8f-83c4-a478216c2f1a', '0326574c-f81e-45b4-8b4f-cf578fa161dc', 'BACKOFFICE', 'SCHEDULE_UPDATE', 'Last-mile confirmation expected', 'train LMR-TEST-01 carrying booking PAID-IMP-001 has departed Djibouti — awaiting the customer''s last-mile confirmation.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'HIGH', false, NULL, '{"email": true}', '2026-08-09 20:20:00.040406+00', '2026-08-09 20:20:00.054716+00', NULL),
+	('6fafe0f4-fcc1-4e6f-8e8a-ce0ac2690e60', 'aaa04914-b7ee-47b3-9c63-4324046a26bd', 'BACKOFFICE', 'SCHEDULE_UPDATE', 'Last-mile confirmation expected', 'train LMR-TEST-01 carrying booking PAID-IMP-001 has departed Djibouti — awaiting the customer''s last-mile confirmation.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'HIGH', false, NULL, '{"sms": true, "email": true}', '2026-08-09 20:20:00.057377+00', '2026-08-09 20:20:00.07081+00', NULL),
+	('bdb3000c-87fa-4923-8b96-bb73a36c1495', '16357eab-47bd-4599-b048-53fc34f5462f', 'BACKOFFICE', 'SCHEDULE_UPDATE', 'Last-mile confirmation expected', 'train LMR-TEST-01 carrying booking PAID-IMP-001 has departed Djibouti — awaiting the customer''s last-mile confirmation.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'HIGH', false, NULL, '{"sms": true, "email": true}', '2026-08-09 20:20:00.076129+00', '2026-08-09 20:20:00.087579+00', NULL),
+	('5a818934-c214-4490-9f07-5e5661445c2c', 'f1534714-fa4a-4780-a081-05d4c1f6c25f', 'BACKOFFICE', 'SCHEDULE_UPDATE', 'Last-mile confirmation expected', 'train LMR-TEST-01 carrying booking PAID-IMP-001 has departed Djibouti — awaiting the customer''s last-mile confirmation.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'HIGH', false, NULL, '{"email": true}', '2026-08-09 20:20:00.090851+00', '2026-08-09 20:20:00.101123+00', NULL),
+	('6c9438cb-1c7f-4a00-8695-f283ad7b86cf', '3d3bf567-82de-46a3-9214-a1cd0621d2ee', 'BACKOFFICE', 'SCHEDULE_UPDATE', 'Last-mile confirmation expected', 'train LMR-TEST-01 carrying booking PAID-IMP-001 has departed Djibouti — awaiting the customer''s last-mile confirmation.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'HIGH', false, NULL, '{"sms": true, "email": true}', '2026-08-09 20:20:00.105244+00', '2026-08-09 20:20:00.119322+00', NULL),
+	('6732565f-8dae-4821-8844-7690999b2a57', 'ed741a64-6aa1-4bbd-bff7-1d1d143aac1c', 'BACKOFFICE', 'SCHEDULE_UPDATE', 'Last-mile confirmation expected', 'train LMR-TEST-01 carrying booking PAID-IMP-001 has departed Djibouti — awaiting the customer''s last-mile confirmation.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'HIGH', false, NULL, '{"sms": true, "email": true}', '2026-08-09 20:20:00.123918+00', '2026-08-09 20:20:00.138757+00', NULL),
+	('50b6a6ab-5bc1-4e84-8666-5b8ca29f4fb3', '66bba880-b46b-425e-a8c6-463ed61f725f', 'BACKOFFICE', 'SCHEDULE_UPDATE', 'Last-mile confirmation expected', 'train LMR-TEST-01 carrying booking PAID-IMP-001 has departed Djibouti — awaiting the customer''s last-mile confirmation.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'HIGH', false, NULL, '{"email": true}', '2026-08-09 20:20:00.14304+00', '2026-08-09 20:20:00.155759+00', NULL),
+	('feb08ee2-6d6a-4d13-8c9b-2eb55d11067c', '0326574c-f81e-45b4-8b4f-cf578fa161dc', 'BACKOFFICE', 'REQUEST_SUBMITTED', 'Last-mile request ready for review', 'Booking PAID-IMP-001 confirmed 1 container(s) for EDR last-mile.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'NORMAL', false, NULL, NULL, '2026-08-09 20:45:49.585522+00', '2026-08-09 20:45:49.585522+00', NULL),
+	('b90458ca-a530-49bf-9a6b-387557f8434b', 'aaa04914-b7ee-47b3-9c63-4324046a26bd', 'BACKOFFICE', 'REQUEST_SUBMITTED', 'Last-mile request ready for review', 'Booking PAID-IMP-001 confirmed 1 container(s) for EDR last-mile.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'NORMAL', false, NULL, NULL, '2026-08-09 20:45:49.592451+00', '2026-08-09 20:45:49.592451+00', NULL),
+	('7383758e-4d74-432c-ab61-ee792e98e4b5', '16357eab-47bd-4599-b048-53fc34f5462f', 'BACKOFFICE', 'REQUEST_SUBMITTED', 'Last-mile request ready for review', 'Booking PAID-IMP-001 confirmed 1 container(s) for EDR last-mile.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'NORMAL', false, NULL, NULL, '2026-08-09 20:45:49.600261+00', '2026-08-09 20:45:49.600261+00', NULL),
+	('afe68ab8-64b0-4214-88d9-107a374ab595', 'f1534714-fa4a-4780-a081-05d4c1f6c25f', 'BACKOFFICE', 'REQUEST_SUBMITTED', 'Last-mile request ready for review', 'Booking PAID-IMP-001 confirmed 1 container(s) for EDR last-mile.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'NORMAL', false, NULL, NULL, '2026-08-09 20:45:49.604792+00', '2026-08-09 20:45:49.604792+00', NULL),
+	('d42118c8-7cf0-4cad-8e2f-483d412c4247', '3d3bf567-82de-46a3-9214-a1cd0621d2ee', 'BACKOFFICE', 'REQUEST_SUBMITTED', 'Last-mile request ready for review', 'Booking PAID-IMP-001 confirmed 1 container(s) for EDR last-mile.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'NORMAL', false, NULL, NULL, '2026-08-09 20:45:49.609172+00', '2026-08-09 20:45:49.609172+00', NULL),
+	('4dbb4a7c-e820-44fa-b260-6dc2a7f66995', 'ed741a64-6aa1-4bbd-bff7-1d1d143aac1c', 'BACKOFFICE', 'REQUEST_SUBMITTED', 'Last-mile request ready for review', 'Booking PAID-IMP-001 confirmed 1 container(s) for EDR last-mile.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'NORMAL', false, NULL, NULL, '2026-08-09 20:45:49.613467+00', '2026-08-09 20:45:49.613467+00', NULL),
+	('2fd0b2ae-828d-4228-b86f-5d69d2295bea', '66bba880-b46b-425e-a8c6-463ed61f725f', 'BACKOFFICE', 'REQUEST_SUBMITTED', 'Last-mile request ready for review', 'Booking PAID-IMP-001 confirmed 1 container(s) for EDR last-mile.', '/dashboard/operations/last-mile?tab=requests', '{"bookingId": "346725c9-6075-4283-a59d-c0cfb58d2e52", "requestId": "52d80132-826e-4683-8ec0-18e679fbeddf"}', 'NORMAL', false, NULL, NULL, '2026-08-09 20:45:49.617206+00', '2026-08-09 20:45:49.617206+00', NULL);
+
+
+--
+-- Data for Name: otp_verifications; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: parts; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: payment_refunds; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: payment_webhook_events; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: payments; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: priority_configs; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.priority_configs VALUES
+	('1d0bf65b-24d0-44c9-9274-9f7545580944', 'CUSTOMS', 'With customs 1–10 wagons', NULL, 1, 10, 7, true, 1, '2026-07-27 11:32:03.224028+00', '2026-07-27 11:32:03.224028+00', NULL),
+	('55623761-0614-4f5f-9f4f-b66bd386f24d', 'WAGON', '1784277238848', NULL, 1, 4, 5, true, 3, '2026-07-17 08:34:02.653+00', '2026-07-17 08:34:02.653+00', NULL),
+	('db61041d-6294-4400-b2a2-a02d8e392c37', 'WAGON', '1784277274795', NULL, 5, 10, 7, true, 4, '2026-07-17 08:34:35.43+00', '2026-07-17 08:34:35.43+00', NULL),
+	('c5e33432-4c8e-4be8-83b9-68452c7bc672', 'WAGON', '1784277311022', NULL, 11, 15, 10, true, 5, '2026-07-17 08:35:11.976+00', '2026-07-17 08:35:11.976+00', NULL),
+	('98e63b88-a9cc-46c2-85fe-01cdfdf1c5ec', 'WAGON', '1784277346036', NULL, 16, 20, 12, true, 6, '2026-07-17 08:35:46.904+00', '2026-07-17 08:35:46.904+00', NULL),
+	('14d40ef2-a97f-4003-86c3-dc569e127855', 'WAGON', '1784277392144', NULL, 21, 30, 15, true, 7, '2026-07-17 08:36:32.835+00', '2026-07-17 08:36:32.835+00', NULL),
+	('b392b2f7-6c7c-4449-91e3-2e81b72314fc', 'WAGON', '1784277437088', NULL, 31, 40, 30, true, 8, '2026-07-17 08:37:18.01+00', '2026-07-17 08:37:18.01+00', NULL),
+	('6cd1e9e9-8c03-40dc-92f3-a3bfe5a63b4c', 'CURRENCY', '1784277766313', 'USD', 1, 25, 17, true, 10, '2026-07-17 08:42:47.741+00', '2026-07-17 08:42:47.741+00', NULL),
+	('985c2e4d-1d01-4634-9aec-57105367efe0', 'WAGON', '1784277554742', NULL, 41, 54, 50, true, 9, '2026-07-17 08:39:20.59+00', '2026-07-18 05:34:17.075+00', NULL),
+	('5aa6cb93-39f5-4954-ae5a-c9257951addd', 'CURRENCY', '1784278089451', 'USD', 26, 54, 35, true, 11, '2026-07-17 08:48:11.061+00', '2026-07-18 05:35:33.992+00', NULL),
+	('89f6ecdb-09d5-471c-847a-2411c3c622f8', 'CUSTOMS', 'With customs 11–53 wagons', NULL, 11, 54, 15, true, 2, '2026-07-27 11:32:03.224028+00', '2026-08-04 07:47:39.081638+00', NULL);
+
+
+--
+-- Data for Name: priority_rule_change_requests; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.priority_rule_change_requests VALUES
+	('200988a4-907a-4117-b5ff-7ee08c1a6d57', 'UPDATE', '89f6ecdb-09d5-471c-847a-2411c3c622f8', '{"type": "CUSTOMS", "label": "With customs 11–53 wagons", "isActive": true, "scorePoints": 15, "maxWagonCount": 54, "minWagonCount": 11}', 'APPROVED', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-04 07:47:39.082+00', NULL, '2026-08-04 07:47:33.389467+00', '2026-08-04 07:47:39.085002+00', NULL);
+
+
+--
+-- Data for Name: priority_rules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: rate_change_requests; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: rates; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.rates VALUES
+	('eaa9bb9f-54eb-4d1e-a59e-c81981aec213', 'CONTAINER_IMPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 845.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:57.82+00', '2026-08-05 11:30:04.445362+00', '2026-08-05 17:00:57.820623+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('d4066936-06a9-44e8-8d5c-884ff651e174', 'CONTAINER_IMPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 753.5000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:49.627+00', '2026-08-05 11:31:16.406767+00', '2026-08-05 17:00:49.628175+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('173ab9ac-9dad-474f-98b3-16129fe7df58', 'CONTAINER_IMPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 1507.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:55.444+00', '2026-08-05 11:30:38.084249+00', '2026-08-05 17:00:55.444438+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('7655da1f-51dc-48c3-b1f7-b32e0847e004', 'RETURN_SURCHARGE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 108.5000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:01.843+00', '2026-08-05 11:58:37.632036+00', '2026-08-05 17:00:01.843767+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('cef5e799-c0a7-4810-acfc-3ba8cfafd0b9', 'RETURN_SURCHARGE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 127.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:08.388+00', '2026-08-05 11:55:45.087401+00', '2026-08-05 17:00:08.388788+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('b6461912-f6ce-4407-9660-d0e5c31dca9b', 'RETURN_SURCHARGE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 240.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:13.802+00', '2026-08-05 11:53:39.1735+00', '2026-08-05 17:00:13.802488+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('768572e3-0b34-48f6-b476-a1cf8bf659f5', 'CONTAINER_EXPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 'USD', 422.5000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:16.181+00', '2026-08-05 11:48:41.298291+00', '2026-08-05 17:00:16.181439+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('261c3464-1db0-433b-ae02-8ed584d88fa1', 'CONTAINER_IMPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 401.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:21.284+00', '2026-08-05 11:46:59.934116+00', '2026-08-05 17:00:21.285064+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('5ddf51ce-191b-46af-ac4c-f6dbaf6f4bb4', 'CONTAINER_IMPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 784.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:25.882+00', '2026-08-05 11:46:25.676389+00', '2026-08-05 17:00:25.882702+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('4a8c6ff1-0b63-4e9d-9c8b-add7971397c1', 'CONTAINER_EXPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 'USD', 169.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:28.178+00', '2026-08-05 11:44:55.14852+00', '2026-08-05 17:00:28.179031+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d3ccfc65-5f54-498b-98e7-26e2a2ba6a15', 'CONTAINER_EXPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 'USD', 362.5000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:32.026+00', '2026-08-05 11:41:00.797236+00', '2026-08-05 17:00:32.026662+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('7d5644e8-a87a-444a-a98a-250a00c6599b', 'CONTAINER_EXPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 'USD', 338.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:33.27+00', '2026-08-05 11:41:40.439308+00', '2026-08-05 17:00:33.270849+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b06173b7-3fc8-48f4-ac97-0382335d52f7', 'CONTAINER_EXPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 'USD', 417.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:38.039+00', '2026-08-05 11:40:00.071666+00', '2026-08-05 17:00:38.039567+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b3051840-0f40-4d6d-9324-05eae45ffa6d', 'CONTAINER_EXPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 'USD', 819.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:40.994+00', '2026-08-05 11:39:31.511351+00', '2026-08-05 17:00:40.994702+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('f4478ee7-8ec6-45ab-bf81-27436f867ee6', 'CONTAINER_EXPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 'USD', 830.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:18.849+00', '2026-08-05 11:47:31.026479+00', '2026-08-07 16:21:21.936406+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('84a9d3f8-4c10-4721-a2ad-6fe100991a36', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 39.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:53.484+00', '2026-08-05 12:54:02.253281+00', '2026-08-05 16:58:53.484339+00', NULL, 'BULK', 'ALWAYS', '654618d6-a380-4e4c-aa60-2bb1c299066a', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('35b75ebc-5b8d-4854-9b1c-ae371d7f95b8', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 38.1000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:56.217+00', '2026-08-05 12:53:43.309533+00', '2026-08-05 16:58:56.217864+00', NULL, 'BULK', 'ALWAYS', '654618d6-a380-4e4c-aa60-2bb1c299066a', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('576dd27c-e244-4fe5-bef0-baddf1f82574', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 42.6000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:02.034+00', '2026-08-05 12:53:20.494759+00', '2026-08-05 16:59:02.035111+00', NULL, 'BULK', 'ALWAYS', '654618d6-a380-4e4c-aa60-2bb1c299066a', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('4c27adbc-4bec-4d7b-8c27-e8fe84509346', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 40.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:04.355+00', '2026-08-05 12:52:59.542922+00', '2026-08-05 16:59:04.355631+00', NULL, 'BULK', 'ALWAYS', '654618d6-a380-4e4c-aa60-2bb1c299066a', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('2b917ac8-da8e-4312-9acb-672c5bcd5316', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 43.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:08.706+00', '2026-08-05 12:52:03.342591+00', '2026-08-05 16:59:08.706856+00', NULL, 'BULK', 'ALWAYS', 'eb5f5443-5801-48d1-8bb8-7494645c5e10', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('f1eabb0b-14d8-42d0-9af7-5098648cb147', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 43.5000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:11.2+00', '2026-08-05 12:51:42.976818+00', '2026-08-05 16:59:11.200785+00', NULL, 'BULK', 'ALWAYS', 'eb5f5443-5801-48d1-8bb8-7494645c5e10', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('86268882-94e3-4d2c-8842-ffc490fa6d6d', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 47.1600, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:13.61+00', '2026-08-05 12:51:20.559059+00', '2026-08-05 16:59:13.610997+00', NULL, 'BULK', 'ALWAYS', 'eb5f5443-5801-48d1-8bb8-7494645c5e10', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('52b3cb56-164b-4b7b-a8c4-2c0140c81512', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 47.7600, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:16.393+00', '2026-08-05 12:50:44.479822+00', '2026-08-05 16:59:16.393598+00', NULL, 'BULK', 'ALWAYS', 'eb5f5443-5801-48d1-8bb8-7494645c5e10', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('922d4a0d-b4c7-40cf-8c5e-990c0159e273', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 44.7500, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:18.935+00', '2026-08-05 12:50:23.641904+00', '2026-08-05 16:59:18.936162+00', NULL, 'BULK', 'ALWAYS', 'eb5f5443-5801-48d1-8bb8-7494645c5e10', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('f89402f0-c8ba-4eee-91dd-01dd79899a8e', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 42.8500, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:22.178+00', '2026-08-05 12:50:01.203144+00', '2026-08-05 16:59:22.178644+00', NULL, 'BULK', 'ALWAYS', 'eb5f5443-5801-48d1-8bb8-7494645c5e10', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('357d4864-9fb9-4191-ba81-e3473285430d', 'INTERCITY_BULK', NULL, NULL, 'USD', 1166.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:31.608+00', '2026-08-05 12:42:29.812388+00', '2026-08-05 16:59:31.609193+00', NULL, 'INTERCITY', 'ALWAYS', 'a5991d3a-d690-4b7e-98fd-ea3333aa16e7', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('5e2a8bbc-e24b-453d-9e68-536078defdd5', 'INTERCITY_BULK', NULL, NULL, 'USD', 1605.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:33.846+00', '2026-08-05 12:41:30.63642+00', '2026-08-05 16:59:33.847137+00', NULL, 'INTERCITY', 'ALWAYS', '9462ef16-5609-4d5c-8f0d-d0acdb0f8b06', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('4255cc89-9319-4826-a4a0-b4fc771a8b2e', 'INTERCITY_BULK', NULL, NULL, 'USD', 1297.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:36.085+00', '2026-08-05 12:14:06.495107+00', '2026-08-05 16:59:36.085453+00', NULL, 'INTERCITY', 'ALWAYS', 'bc9989ca-878c-43a7-ad2b-2a6c7899c956', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('9557462b-e752-4410-9070-5be72367c8ae', 'BULK_EXPORT', NULL, 'EXPORT', 'USD', 696.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:38.257+00', '2026-08-05 12:12:42.008942+00', '2026-08-05 16:59:38.257483+00', NULL, 'BULK', 'ALWAYS', 'd700fe89-18f4-40ce-860a-7c6b17966929', '23fda607-6cc6-4923-b05b-56b7adb1626b', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', NULL, NULL),
+	('b85c0878-b4ae-4661-9279-31fd0ab68cf9', 'RETURN_SURCHARGE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 91.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:40.557+00', '2026-08-05 12:07:10.387+00', '2026-08-05 16:59:40.558121+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('fd5e8c6b-5569-4918-8673-6b18e09458ae', 'RETURN_SURCHARGE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 176.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:44.191+00', '2026-08-05 12:04:23.98986+00', '2026-08-05 16:59:44.191937+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('9a9d504e-7fc8-4eb2-8a76-e2a3436cf8b5', 'RETURN_SURCHARGE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 240.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:49.006+00', '2026-08-05 12:03:03.414831+00', '2026-08-05 16:59:49.00659+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '1e2fa308-c9eb-4480-840c-e486b1d98029', NULL, NULL),
+	('1d04e928-6d3d-49a1-bdf1-2967670eda49', 'CONTAINER_EXPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 'USD', 435.5000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:51.279+00', '2026-08-05 12:01:12.797102+00', '2026-08-05 16:59:51.280133+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '1e2fa308-c9eb-4480-840c-e486b1d98029', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('789e418d-6c14-464d-9368-d7dc5e508e89', 'CONTAINER_EXPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 'USD', 856.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:55.022+00', '2026-08-05 12:00:39.260862+00', '2026-08-05 16:59:55.022426+00', NULL, 'CONTAINER', 'ALWAYS', NULL, '1e2fa308-c9eb-4480-840c-e486b1d98029', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('734d679c-9f1f-4f0c-82f1-25132cfb9171', 'CONTAINER_IMPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 883.5000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:57.237+00', '2026-08-05 11:59:39.568807+00', '2026-08-05 16:59:57.238128+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '1e2fa308-c9eb-4480-840c-e486b1d98029', NULL, NULL),
+	('a57820e6-821a-4e43-9c7a-3f9b7a459979', 'CONTAINER_IMPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 1753.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:59.197+00', '2026-08-05 11:59:13.248122+00', '2026-08-05 16:59:59.197879+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '1e2fa308-c9eb-4480-840c-e486b1d98029', NULL, NULL),
+	('b73f5cbf-a08d-40f5-863f-04a9e99682b5', 'RETURN_SURCHARGE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 207.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:04.96+00', '2026-08-05 11:57:44.833563+00', '2026-08-05 17:00:04.960851+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('454f5e4f-44d6-4da6-8e57-5d42d3777862', 'LASHING', NULL, 'IMPORT', 'USD', 200.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 13:49:23.999+00', '2026-08-05 13:37:19.965186+00', '2026-08-05 13:49:23.99961+00', NULL, 'OTHER', 'LASHING', '8291ccc3-0dd9-4d78-aa44-284d028a19ce', NULL, NULL, NULL, NULL),
+	('99ec256a-2ce0-4a77-8219-73bef28d3551', 'CUSTOMS_CLEARANCE', NULL, 'IMPORT', 'USD', 20.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 13:50:14.997+00', '2026-08-05 13:34:31.710232+00', '2026-08-05 13:50:14.998153+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', '8291ccc3-0dd9-4d78-aa44-284d028a19ce', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('7f9c0ad0-e7ba-4f64-809b-be20be8180c3', 'CUSTOMS_CLEARANCE', NULL, 'IMPORT', 'USD', 2600.0000, 'PER_ITEM', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:56:36.443+00', '2026-08-05 13:33:22.661381+00', '2026-08-05 16:56:36.44417+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', '28bc4d22-5bc5-4917-b1af-bb08d28f2a05', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('92025b1b-963d-47ad-88cb-d0e6bb661533', 'CUSTOMS_CLEARANCE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 'USD', 389.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:56:40.683+00', '2026-08-05 13:32:20.888202+00', '2026-08-05 16:56:40.683295+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('6461a106-3e1b-48c3-82e2-602c6391d280', 'CUSTOMS_CLEARANCE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 'USD', 569.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:56:43.405+00', '2026-08-05 13:31:42.112267+00', '2026-08-05 16:56:43.405407+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1f1c4739-5188-442d-9956-36d82b8e11f5', 'CUSTOMS_CLEARANCE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 'USD', 349.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:56:46.232+00', '2026-08-05 13:31:06.597308+00', '2026-08-05 16:56:46.232493+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('682d921f-8ef3-4f71-a916-0c8d4edfd74f', 'CUSTOMS_CLEARANCE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 'USD', 540.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:56:48.57+00', '2026-08-05 13:30:18.375767+00', '2026-08-05 16:56:48.571156+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('816f2328-b28b-4261-a549-c393434bfc7a', 'CUSTOMS_CLEARANCE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 703.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:56:51.659+00', '2026-08-05 13:28:34.606658+00', '2026-08-05 16:56:51.659575+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('3fe4ca8a-1f37-4a87-ba66-81beb09ed6be', 'CUSTOMS_CLEARANCE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 703.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:56:54.664+00', '2026-08-05 13:28:02.03346+00', '2026-08-05 16:56:54.66473+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('dba57a37-30d3-43a6-b0b8-91c454b1ac42', 'CUSTOMS_CLEARANCE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 1307.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:08.976+00', '2026-08-05 13:27:15.530503+00', '2026-08-05 16:57:08.976789+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('7dc6eec9-dbb9-498a-a058-5f95dd7e0ff7', 'CUSTOMS_CLEARANCE', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 1307.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:12.717+00', '2026-08-05 13:26:22.454508+00', '2026-08-05 16:57:12.717581+00', NULL, 'OTHER', 'CUSTOMS_CLEARANCE', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('51808179-6ade-4142-87d5-e531b9c3d146', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 937.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:16.048+00', '2026-08-05 13:25:14.6463+00', '2026-08-05 16:57:16.048634+00', NULL, 'BULK', 'ALWAYS', 'bc9989ca-878c-43a7-ad2b-2a6c7899c956', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('913c11f8-66f3-4d52-9b48-37ddca7ba8d3', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 2080.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:18.954+00', '2026-08-05 13:24:23.313548+00', '2026-08-05 16:57:18.954521+00', NULL, 'BULK', 'ALWAYS', 'bc9989ca-878c-43a7-ad2b-2a6c7899c956', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('702dd5c8-4d89-4bb3-9f74-2c84982deede', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 2270.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:22.133+00', '2026-08-05 13:23:57.272948+00', '2026-08-05 16:57:22.134045+00', NULL, 'BULK', 'ALWAYS', 'bc9989ca-878c-43a7-ad2b-2a6c7899c956', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('770f6a10-dae7-49c3-8322-28a54206301b', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 1000.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:24.995+00', '2026-08-05 13:23:29.954853+00', '2026-08-05 16:57:24.99571+00', NULL, 'BULK', 'ALWAYS', 'bc9989ca-878c-43a7-ad2b-2a6c7899c956', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('8bdb4ee9-fa4a-4480-a076-2213d5854259', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 2143.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:28.303+00', '2026-08-05 13:22:58.537224+00', '2026-08-05 16:57:28.303946+00', NULL, 'BULK', 'ALWAYS', 'bc9989ca-878c-43a7-ad2b-2a6c7899c956', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('9bfdd103-00fc-4945-a7d6-32d0de2d9b2f', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 2334.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:30.901+00', '2026-08-05 13:21:16.88163+00', '2026-08-05 16:57:30.901714+00', NULL, 'BULK', 'ALWAYS', 'bc9989ca-878c-43a7-ad2b-2a6c7899c956', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('e9932ed0-3f5a-4e74-a2f6-7f3b6eea2f0e', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 3800.0000, 'PER_WAGON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:34.23+00', '2026-08-05 13:20:25.447417+00', '2026-08-05 16:57:34.231171+00', NULL, 'BULK', 'ALWAYS', '28bc4d22-5bc5-4917-b1af-bb08d28f2a05', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('fc8565fc-d3a2-466e-a719-e03a8ae45e90', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 47.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:37.564+00', '2026-08-05 13:19:42.475819+00', '2026-08-05 16:57:37.564313+00', NULL, 'BULK', 'ALWAYS', '9c2bc39e-1fe8-418c-b187-c0b2329faeb9', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('5cfc09cd-2fab-4d6a-babe-bec8dc3cf39b', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 40.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:42.042+00', '2026-08-05 13:19:17.704429+00', '2026-08-05 16:57:42.042846+00', NULL, 'BULK', 'ALWAYS', '9c2bc39e-1fe8-418c-b187-c0b2329faeb9', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('6006c4c3-6ab2-4b90-8ae5-0baac283cef3', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 39.4000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:44.704+00', '2026-08-05 13:18:55.762756+00', '2026-08-05 16:57:44.704515+00', NULL, 'BULK', 'ALWAYS', '9c2bc39e-1fe8-418c-b187-c0b2329faeb9', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('39001ca2-8663-416a-9941-0aef934d86f5', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 47.7600, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:47.729+00', '2026-08-05 13:18:23.16636+00', '2026-08-05 16:57:47.730025+00', NULL, 'BULK', 'ALWAYS', '9c2bc39e-1fe8-418c-b187-c0b2329faeb9', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('36f1a699-425a-41e7-a62a-c6662885d8a1', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 41.3400, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:50.967+00', '2026-08-05 13:17:55.777444+00', '2026-08-05 16:57:50.967246+00', NULL, 'BULK', 'ALWAYS', '9c2bc39e-1fe8-418c-b187-c0b2329faeb9', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('d884c66e-b8a9-45e5-b762-cfce0a8894f8', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 40.5000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:53.363+00', '2026-08-05 13:17:30.99085+00', '2026-08-05 16:57:53.363483+00', NULL, 'BULK', 'ALWAYS', '9c2bc39e-1fe8-418c-b187-c0b2329faeb9', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('2f46d36c-48bf-4838-8f59-1bd7f273cef4', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 50.5300, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:57:55.841+00', '2026-08-05 13:17:03.901612+00', '2026-08-05 16:57:55.841511+00', NULL, 'BULK', 'ALWAYS', '700bbbb8-e31d-4860-8227-47a5496dd81b', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('e6666684-dd5a-4ca0-a514-31690bb206ee', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 45.6000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:03.577+00', '2026-08-05 13:16:01.037466+00', '2026-08-05 16:58:03.577738+00', NULL, 'BULK', 'ALWAYS', '700bbbb8-e31d-4860-8227-47a5496dd81b', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('a101299e-fedd-4355-9773-f981987eadbe', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 51.2000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:06.493+00', '2026-08-05 13:15:30.649947+00', '2026-08-05 16:58:06.493364+00', NULL, 'BULK', 'ALWAYS', '700bbbb8-e31d-4860-8227-47a5496dd81b', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('59a668c7-416d-4059-a99c-99bb439dc4b7', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 48.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:09.308+00', '2026-08-05 13:14:54.814892+00', '2026-08-05 16:58:09.308703+00', NULL, 'BULK', 'ALWAYS', '700bbbb8-e31d-4860-8227-47a5496dd81b', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('54b0e98a-736f-44bb-bb79-accb44f6a9c4', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 46.9000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:13.158+00', '2026-08-05 13:14:32.038173+00', '2026-08-05 16:58:13.158852+00', NULL, 'BULK', 'ALWAYS', '700bbbb8-e31d-4860-8227-47a5496dd81b', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('4abf0f13-f92a-42ce-a38d-1bc746cb6438', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 47.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:15.652+00', '2026-08-05 13:06:27.850211+00', '2026-08-05 16:58:15.652564+00', NULL, 'BULK', 'ALWAYS', 'ba24cc4b-f8a0-4e5e-b111-aebaaf96fd00', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('9de1eb97-6e39-4204-bba3-b506c0a3cd4c', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 40.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:38.433+00', '2026-08-05 13:05:54.341024+00', '2026-08-05 16:58:38.434081+00', NULL, 'BULK', 'ALWAYS', 'ba24cc4b-f8a0-4e5e-b111-aebaaf96fd00', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('363fede1-a1fa-493b-ad72-9b975e24a71c', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 47.7600, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:43.024+00', '2026-08-05 13:04:42.988179+00', '2026-08-05 16:58:43.024866+00', NULL, 'BULK', 'ALWAYS', 'ba24cc4b-f8a0-4e5e-b111-aebaaf96fd00', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('a614d7e7-e55a-4336-ba87-1950bed1a8a7', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 44.1500, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:45.23+00', '2026-08-05 13:03:54.36318+00', '2026-08-05 16:58:45.23051+00', NULL, 'BULK', 'ALWAYS', 'ba24cc4b-f8a0-4e5e-b111-aebaaf96fd00', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('9cac7573-3a74-489a-90d1-e9c703714f03', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 43.8000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:47.996+00', '2026-08-05 12:56:14.000352+00', '2026-08-05 16:58:47.996685+00', NULL, 'BULK', 'ALWAYS', 'ba24cc4b-f8a0-4e5e-b111-aebaaf96fd00', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('1d84d386-9f6b-433f-8968-4a537dd96b75', 'OVERWEIGHT_PER_TON', NULL, NULL, 'USD', 10.0000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 13:49:27.021+00', '2026-08-05 13:35:39.8713+00', '2026-08-05 13:49:27.021974+00', NULL, 'OTHER', 'OVERWEIGHT', NULL, NULL, NULL, NULL, NULL),
+	('d2239b0e-4dee-4071-8d83-b1a7d8fc172a', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 46.6000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:00.143+00', '2026-08-05 13:16:39.42881+00', '2026-08-05 16:58:00.143849+00', NULL, 'BULK', 'ALWAYS', '700bbbb8-e31d-4860-8227-47a5496dd81b', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('f7e206ce-58db-47d8-8a3e-5488390f20f7', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 39.4000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:40.773+00', '2026-08-05 13:05:24.825393+00', '2026-08-05 16:58:40.774168+00', NULL, 'BULK', 'ALWAYS', 'ba24cc4b-f8a0-4e5e-b111-aebaaf96fd00', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('2c5cdce1-e2ca-4c30-b402-0af6c401a7c9', 'CONTAINER_EXPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 'USD', 725.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:35.826+00', '2026-08-05 11:40:33.442602+00', '2026-08-05 17:00:35.827084+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('bd399a79-3de5-40fb-a062-d188242ef283', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 42.1000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:58:50.75+00', '2026-08-05 12:54:23.926705+00', '2026-08-05 16:58:50.750938+00', NULL, 'BULK', 'ALWAYS', '654618d6-a380-4e4c-aa60-2bb1c299066a', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('c39101c7-ff2b-49b7-8452-3da78ace9e98', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 39.2000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:06.624+00', '2026-08-05 12:52:37.542535+00', '2026-08-05 16:59:06.624559+00', NULL, 'BULK', 'ALWAYS', '654618d6-a380-4e4c-aa60-2bb1c299066a', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL, NULL),
+	('91900e5a-992e-4ad8-a3f5-2cd8ea7b32a2', 'BULK_IMPORT', NULL, 'IMPORT', 'USD', 59.4000, 'PER_TON', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:24.671+00', '2026-08-05 12:48:30.532436+00', '2026-08-05 16:59:24.67219+00', NULL, 'BULK', 'ALWAYS', '8291ccc3-0dd9-4d78-aa44-284d028a19ce', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('0b4081aa-f087-4d98-8b7e-b59ea16f6f0d', 'REEFER_SURCHARGE', NULL, NULL, 'USD', 212.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:29.574+00', '2026-08-05 12:44:36.679766+00', '2026-08-05 16:59:29.574271+00', NULL, 'OTHER', 'REEFER', NULL, NULL, NULL, NULL, NULL),
+	('d86db2d8-860a-437b-9a75-b551161ece25', 'RETURN_SURCHARGE', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 127.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 16:59:46.655+00', '2026-08-05 12:03:32.003137+00', '2026-08-05 16:59:46.655292+00', NULL, 'OTHER', 'WITH_RETURN', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '1e2fa308-c9eb-4480-840c-e486b1d98029', NULL, NULL),
+	('39d18fad-7a60-4711-9d51-3ab0ddcf07ad', 'CONTAINER_IMPORT', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 'USD', 390.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:44.045+00', '2026-08-05 11:32:30.271067+00', '2026-08-05 17:00:44.045609+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('38ab107e-2051-4765-b93c-c6abddbf7700', 'CONTAINER_IMPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 762.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:00:46.443+00', '2026-08-05 11:31:56.49775+00', '2026-08-05 17:00:46.443725+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', NULL, NULL),
+	('d6d8e553-7f6e-44c5-9295-624e2945d854', 'CONTAINER_IMPORT', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 'USD', 1676.0000, 'PER_CONTAINER', 'LIVE', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', 'dff56e4a-750d-4e7a-9baa-0ba703b8a0f7', '2026-08-05 17:01:01.073+00', '2026-08-05 11:29:37.575294+00', '2026-08-05 17:01:01.073344+00', NULL, 'CONTAINER', 'ALWAYS', NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL);
+
+
+--
+-- Data for Name: route_milestones; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.route_milestones VALUES
+	('dcb9d9a3-3aef-4282-b0ad-e9fffbf39cb3', '63bfcd70-60bc-4c88-99f2-323549d16249', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 1, '2026-08-06 07:08:20.086899+00', '2026-08-06 07:08:20.086899+00', NULL, 0.00),
+	('6a2e0c88-5a0c-41a3-a99c-218304fc6c47', '63bfcd70-60bc-4c88-99f2-323549d16249', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 2, '2026-08-06 07:08:20.086899+00', '2026-08-06 07:08:20.086899+00', NULL, 880.00),
+	('abe0184a-d019-40bb-97d5-c6cb84b2c866', '22949d74-2f82-46bf-92b0-b0e566a1f0f2', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 1, '2026-08-07 06:52:03.962271+00', '2026-08-07 06:52:03.962271+00', NULL, 0.00),
+	('f6f3c54e-a100-48e4-9c53-60d821708bc8', '22949d74-2f82-46bf-92b0-b0e566a1f0f2', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 2, '2026-08-07 06:52:03.962271+00', '2026-08-07 06:52:03.962271+00', NULL, 55.40),
+	('382e3529-0f8a-48f2-ab8c-8f6e632cb57f', '22949d74-2f82-46bf-92b0-b0e566a1f0f2', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 3, '2026-08-07 06:52:03.962271+00', '2026-08-07 06:52:03.962271+00', NULL, 938.00),
+	('a1ef3b55-48e4-4e8f-bd7b-52546914f932', 'cc8dda89-d384-4220-a7e8-2cb55a145126', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 1, '2026-08-05 11:16:08.780895+00', '2026-08-05 11:16:08.780895+00', NULL, 0.00),
+	('f7691238-9d89-4f70-b24c-5dfef9289bd2', 'cc8dda89-d384-4220-a7e8-2cb55a145126', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 2, '2026-08-05 11:16:08.780895+00', '2026-08-05 11:16:08.780895+00', NULL, 938.00),
+	('e7a91b14-236d-48b8-9864-b93c7d301260', 'cc8dda89-d384-4220-a7e8-2cb55a145126', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 3, '2026-08-05 11:16:08.780895+00', '2026-08-05 11:16:08.780895+00', NULL, 55.40),
+	('e96cd761-b02e-4f66-aa90-91aed9998144', 'f7bb1230-458d-4d97-b0ee-d2721699ce2e', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 1, '2026-08-05 14:06:31.009187+00', '2026-08-05 14:06:31.009187+00', NULL, 0.00),
+	('6d241d83-d510-4cf3-933d-2268137f56b8', 'f7bb1230-458d-4d97-b0ee-d2721699ce2e', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 2, '2026-08-05 14:06:31.009187+00', '2026-08-05 14:06:31.009187+00', NULL, 869.00),
+	('2da377eb-9dad-47e6-ae95-0bd43bd967f7', '52be9a20-02fb-43dc-bc7f-25231726e20c', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 1, '2026-08-05 14:06:57.594416+00', '2026-08-05 14:06:57.594416+00', NULL, 0.00),
+	('67f2aeba-ddeb-459c-93cf-578efe7c036f', '52be9a20-02fb-43dc-bc7f-25231726e20c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 2, '2026-08-05 14:06:57.594416+00', '2026-08-05 14:06:57.594416+00', NULL, 819.00),
+	('dd0788a0-e63f-494c-acab-3687e2287a52', 'fed1f0a3-3dcf-4735-a358-ad2845160f8f', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 1, '2026-08-05 14:07:23.20218+00', '2026-08-05 14:07:23.20218+00', NULL, 0.00),
+	('c11c1530-21d3-4302-8835-3192c42a4710', 'fed1f0a3-3dcf-4735-a358-ad2845160f8f', '23fda607-6cc6-4923-b05b-56b7adb1626b', 2, '2026-08-05 14:07:23.20218+00', '2026-08-05 14:07:23.20218+00', NULL, 746.00),
+	('a741808c-0172-4d52-9465-7b76ac208c16', '23e26088-6c5a-454d-bf4e-d6f277011f52', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 1, '2026-08-05 14:07:36.296418+00', '2026-08-05 14:07:36.296418+00', NULL, 0.00),
+	('e5f38f9a-4f2e-4613-9228-535ddc924c04', '23e26088-6c5a-454d-bf4e-d6f277011f52', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 2, '2026-08-05 14:07:36.296418+00', '2026-08-05 14:07:36.296418+00', NULL, 319.00),
+	('120ec38a-3061-4cc5-ac4d-8d98206abd57', 'f1593e6a-bf3f-450a-be86-f78ceebd2589', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 1, '2026-08-05 14:07:51.131289+00', '2026-08-05 14:07:51.131289+00', NULL, 0.00),
+	('5f805b96-81e0-45f9-9e04-8eddaf67e9e0', 'f1593e6a-bf3f-450a-be86-f78ceebd2589', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 2, '2026-08-05 14:07:51.131289+00', '2026-08-05 14:07:51.131289+00', NULL, 880.00),
+	('3a8f878f-5517-4894-997f-c779de5d857e', 'f21497dc-e3e5-44a9-892e-19a385361298', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 1, '2026-08-05 14:08:09.370413+00', '2026-08-05 14:08:09.370413+00', NULL, 0.00),
+	('3178ea9f-d87a-4ece-8e68-d1747fb3a3d3', 'f21497dc-e3e5-44a9-892e-19a385361298', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 2, '2026-08-05 14:08:09.370413+00', '2026-08-05 14:08:09.370413+00', NULL, 938.00),
+	('1afba0ac-d6ea-40ec-abed-51798404d80a', '181baaef-17df-450e-9d88-62e0edb9d956', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 1, '2026-08-05 14:08:29.867502+00', '2026-08-05 14:08:29.867502+00', NULL, 0.00),
+	('aa98b1d0-80bd-4df2-92ba-228597762bb3', '181baaef-17df-450e-9d88-62e0edb9d956', '23fda607-6cc6-4923-b05b-56b7adb1626b', 2, '2026-08-05 14:08:29.867502+00', '2026-08-05 14:08:29.867502+00', NULL, 858.00),
+	('22919ae4-69e7-4399-8f12-ae011a01f666', 'f780d18f-73e0-4f7d-a039-a3e7d86f7235', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 1, '2026-08-05 14:09:05.906869+00', '2026-08-05 14:09:05.906869+00', NULL, 0.00),
+	('22d4b362-7429-419c-864f-44ff47ea79be', 'f780d18f-73e0-4f7d-a039-a3e7d86f7235', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 2, '2026-08-05 14:09:05.906869+00', '2026-08-05 14:09:05.906869+00', NULL, 334.00),
+	('d5750b0a-f87e-40f5-91f1-5f6b6d418f6b', '6f349546-d2f9-4c3d-84af-ad2c4de95962', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 1, '2026-08-05 14:09:32.74991+00', '2026-08-05 14:09:32.74991+00', NULL, 0.00),
+	('53b7dde9-2e84-4c88-813c-ad612dd44cab', '6f349546-d2f9-4c3d-84af-ad2c4de95962', '1e2fa308-c9eb-4480-840c-e486b1d98029', 2, '2026-08-05 14:09:32.74991+00', '2026-08-05 14:09:32.74991+00', NULL, 918.00),
+	('b28d2711-332d-492b-8f92-435923eb6cea', 'f5c5a87d-8857-45a3-b96b-dc247bf60825', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 1, '2026-08-05 14:09:51.98609+00', '2026-08-05 14:09:51.98609+00', NULL, 0.00),
+	('30321667-a380-4f39-bbe9-b896dcbe5eca', 'f5c5a87d-8857-45a3-b96b-dc247bf60825', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 2, '2026-08-05 14:09:51.98609+00', '2026-08-05 14:09:51.98609+00', NULL, 380.00),
+	('347efb52-fea8-45bd-a62a-045520cae78e', '3bd7be53-1dfe-4722-a4ad-312f9d348149', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 1, '2026-08-05 14:10:47.861587+00', '2026-08-05 14:10:47.861587+00', NULL, 0.00),
+	('4ed08991-e370-4654-93cc-d01203dfd979', '3bd7be53-1dfe-4722-a4ad-312f9d348149', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 2, '2026-08-05 14:10:47.861587+00', '2026-08-05 14:10:47.861587+00', NULL, 55.40),
+	('c6cfedc5-4e39-4871-beb5-a2318ccb14f5', '99adb2d0-a9c6-4843-acc4-5221de84c0b3', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 1, '2026-08-05 18:27:58.540829+00', '2026-08-05 18:27:58.540829+00', NULL, 0.00),
+	('464223fe-41ca-4113-b251-1677303f0940', '99adb2d0-a9c6-4843-acc4-5221de84c0b3', 'fc558b95-da28-4fc3-8348-311a290c34ae', 2, '2026-08-05 18:27:58.540829+00', '2026-08-05 18:27:58.540829+00', NULL, 817.00),
+	('933b6f0c-714b-4ee1-9b2c-2a794163c0e0', 'd5e84d21-9378-4ac0-a51d-a8a792074a29', 'fc558b95-da28-4fc3-8348-311a290c34ae', 1, '2026-08-05 18:31:16.11487+00', '2026-08-05 18:31:16.11487+00', NULL, 0.00),
+	('6f69b0fa-fdd5-4dda-86a4-b09615ec1e44', 'd5e84d21-9378-4ac0-a51d-a8a792074a29', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 2, '2026-08-05 18:31:16.11487+00', '2026-08-05 18:31:16.11487+00', NULL, 867.00),
+	('58b8286a-e27e-43ef-b681-58b7b22fe618', '5c3a27c3-1f0a-475f-ba5d-7ebb47680e80', 'fc558b95-da28-4fc3-8348-311a290c34ae', 1, '2026-08-05 18:31:39.026533+00', '2026-08-05 18:31:39.026533+00', NULL, 0.00),
+	('f5214cf8-ee87-468b-858d-712ce2e15467', '5c3a27c3-1f0a-475f-ba5d-7ebb47680e80', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 2, '2026-08-05 18:31:39.026533+00', '2026-08-05 18:31:39.026533+00', NULL, 817.00),
+	('2d121dcc-aa84-4c9f-8d75-8b4fcec10b8b', 'dc53225a-4dad-493d-a056-1e73a7942f46', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 1, '2026-08-05 18:33:27.682507+00', '2026-08-05 18:33:27.682507+00', NULL, 0.00),
+	('9efe4e8a-5db1-4afc-b10d-dbc4cb1f4e35', 'dc53225a-4dad-493d-a056-1e73a7942f46', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 2, '2026-08-05 18:33:27.682507+00', '2026-08-05 18:33:27.682507+00', NULL, 375.00),
+	('51efa9a9-6e1d-459e-b5e8-9b1236e3ea5e', 'f2af32aa-ad89-4b94-b91a-32eca30355ea', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 1, '2026-08-05 18:34:04.004295+00', '2026-08-05 18:34:04.004295+00', NULL, 0.00),
+	('2bc5768d-d9c2-460e-827c-edcb55a4de83', 'f2af32aa-ad89-4b94-b91a-32eca30355ea', 'fc558b95-da28-4fc3-8348-311a290c34ae', 2, '2026-08-05 18:34:04.004295+00', '2026-08-05 18:34:04.004295+00', NULL, 867.00),
+	('45db2e4c-330e-4f68-8d75-61a36fa84df5', '24450a51-c0e4-42fa-94ba-f3fec5c86ffe', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 1, '2026-08-05 18:45:52.116137+00', '2026-08-05 18:45:52.116137+00', NULL, 0.00),
+	('8a45df4e-57f4-4185-a13a-12c2c4e4a5bf', '24450a51-c0e4-42fa-94ba-f3fec5c86ffe', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 2, '2026-08-05 18:45:52.116137+00', '2026-08-05 18:45:52.116137+00', NULL, 938.00),
+	('915470f6-125a-4c0c-b554-22624eb86fa5', 'c870cbd4-a73d-47f8-8ff7-350d08e9f8fb', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 1, '2026-08-05 18:47:05.753193+00', '2026-08-05 18:47:05.753193+00', NULL, 0.00),
+	('d4a1a560-fca2-47aa-8f33-e6226ec6dd73', 'c870cbd4-a73d-47f8-8ff7-350d08e9f8fb', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 2, '2026-08-05 18:47:05.753193+00', '2026-08-05 18:47:05.753193+00', NULL, 869.00),
+	('3073c5c8-d8a6-48d5-87e7-c2c5dc7c0b05', 'cfae237c-37e7-4fe0-b3f7-97b156b4db15', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 1, '2026-08-05 18:51:10.910676+00', '2026-08-05 18:51:10.910676+00', NULL, 0.00),
+	('154dfb65-1c94-4d96-b9d1-7e9c54f683bd', 'cfae237c-37e7-4fe0-b3f7-97b156b4db15', '23fda607-6cc6-4923-b05b-56b7adb1626b', 2, '2026-08-05 18:51:10.910676+00', '2026-08-05 18:51:10.910676+00', NULL, 76.00),
+	('4704437b-c00f-4647-ad17-0193e8b286a4', '8978e3c6-0c68-4756-909a-5ac73596ecc8', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 1, '2026-08-07 20:53:47.427657+00', '2026-08-07 20:53:47.427657+00', NULL, 0.00),
+	('8e7f4a55-4dbb-45ab-bd21-4ee2049ac4b7', '8978e3c6-0c68-4756-909a-5ac73596ecc8', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 2, '2026-08-07 20:53:47.427657+00', '2026-08-07 20:53:47.427657+00', NULL, 380.00),
+	('a91018ba-e857-4693-8ea7-1edcbdcb247d', '8978e3c6-0c68-4756-909a-5ac73596ecc8', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 3, '2026-08-07 20:53:47.427657+00', '2026-08-07 20:53:47.427657+00', NULL, 334.00);
+
+
+--
+-- Data for Name: routes; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.routes VALUES
+	('cc8dda89-d384-4220-a7e8-2cb55a145126', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '2026-08-05 11:16:08.780895+00', '2026-08-05 11:16:08.780895+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('f7bb1230-458d-4d97-b0ee-d2721699ce2e', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '2026-08-05 14:06:31.009187+00', '2026-08-05 14:06:31.009187+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('52be9a20-02fb-43dc-bc7f-25231726e20c', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '2026-08-05 14:06:57.594416+00', '2026-08-05 14:06:57.594416+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('fed1f0a3-3dcf-4735-a358-ad2845160f8f', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '23fda607-6cc6-4923-b05b-56b7adb1626b', '2026-08-05 14:07:23.20218+00', '2026-08-05 14:07:23.20218+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('23e26088-6c5a-454d-bf4e-d6f277011f52', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', '2026-08-05 14:07:36.296418+00', '2026-08-05 14:07:36.296418+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('f1593e6a-bf3f-450a-be86-f78ceebd2589', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '2026-08-05 14:07:51.131289+00', '2026-08-05 14:07:51.131289+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('f21497dc-e3e5-44a9-892e-19a385361298', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '2026-08-05 14:08:09.370413+00', '2026-08-05 14:08:09.370413+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('181baaef-17df-450e-9d88-62e0edb9d956', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '23fda607-6cc6-4923-b05b-56b7adb1626b', '2026-08-05 14:08:29.867502+00', '2026-08-05 14:08:29.867502+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('f780d18f-73e0-4f7d-a039-a3e7d86f7235', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', '2026-08-05 14:09:05.906869+00', '2026-08-05 14:09:05.906869+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('6f349546-d2f9-4c3d-84af-ad2c4de95962', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '1e2fa308-c9eb-4480-840c-e486b1d98029', '2026-08-05 14:09:32.74991+00', '2026-08-05 14:09:32.74991+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('f5c5a87d-8857-45a3-b96b-dc247bf60825', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '2026-08-05 14:09:51.98609+00', '2026-08-05 14:09:51.98609+00', NULL, 'AVAILABLE', 'DOMESTIC'),
+	('3bd7be53-1dfe-4722-a4ad-312f9d348149', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '2026-08-05 14:10:47.861587+00', '2026-08-05 14:10:47.861587+00', NULL, 'AVAILABLE', 'DOMESTIC'),
+	('99adb2d0-a9c6-4843-acc4-5221de84c0b3', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 'fc558b95-da28-4fc3-8348-311a290c34ae', '2026-08-05 18:27:58.540829+00', '2026-08-05 18:27:58.540829+00', NULL, 'AVAILABLE', 'EXPORT'),
+	('d5e84d21-9378-4ac0-a51d-a8a792074a29', 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '2026-08-05 18:31:16.11487+00', '2026-08-05 18:31:16.11487+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('5c3a27c3-1f0a-475f-ba5d-7ebb47680e80', 'fc558b95-da28-4fc3-8348-311a290c34ae', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '2026-08-05 18:31:39.026533+00', '2026-08-05 18:31:39.026533+00', NULL, 'AVAILABLE', 'IMPORT'),
+	('dc53225a-4dad-493d-a056-1e73a7942f46', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '2026-08-05 18:33:27.682507+00', '2026-08-05 18:33:27.682507+00', NULL, 'AVAILABLE', 'DOMESTIC'),
+	('f2af32aa-ad89-4b94-b91a-32eca30355ea', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 'fc558b95-da28-4fc3-8348-311a290c34ae', '2026-08-05 18:34:04.004295+00', '2026-08-05 18:34:04.004295+00', NULL, 'AVAILABLE', 'EXPORT'),
+	('24450a51-c0e4-42fa-94ba-f3fec5c86ffe', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '2026-08-04 11:17:57.378645+00', '2026-08-05 18:45:52.116137+00', NULL, 'AVAILABLE', 'EXPORT'),
+	('c870cbd4-a73d-47f8-8ff7-350d08e9f8fb', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '2026-08-01 07:41:17.411558+00', '2026-08-05 18:47:05.753193+00', NULL, 'AVAILABLE', 'EXPORT'),
+	('cfae237c-37e7-4fe0-b3f7-97b156b4db15', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '23fda607-6cc6-4923-b05b-56b7adb1626b', '2026-07-22 06:42:53.719+00', '2026-08-05 18:51:10.910676+00', NULL, 'AVAILABLE', 'DOMESTIC'),
+	('63bfcd70-60bc-4c88-99f2-323549d16249', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '2026-08-06 07:08:20.086899+00', '2026-08-06 07:08:20.086899+00', NULL, 'AVAILABLE', 'EXPORT'),
+	('22949d74-2f82-46bf-92b0-b0e566a1f0f2', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '2026-08-04 11:20:00.592454+00', '2026-08-07 06:52:03.962271+00', NULL, 'AVAILABLE', 'EXPORT'),
+	('8978e3c6-0c68-4756-909a-5ac73596ecc8', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '2026-08-02 11:56:34.070422+00', '2026-08-07 20:53:47.427657+00', NULL, 'AVAILABLE', 'EXPORT');
+
+
+--
+-- Data for Name: saved_signatures; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: schedule_wagon_adjustment_logs; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: scheduling_events; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: service_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.service_types VALUES
+	('c652e3a9-73a5-404e-882f-55a64c5b195b', 'Rail Transport Only', NULL, true, false, false, false, true, 1, '2026-07-27 11:31:59.400905+00', '2026-07-27 11:31:59.400905+00', NULL, 'RAIL'),
+	('f60a0787-98d9-4ab1-9ad7-8f9bf8afdcac', 'Rail Transport with Customs', NULL, true, true, true, true, true, 1, '2026-07-17 08:23:05.206+00', '2026-08-04 09:23:32.063154+00', NULL, 'TRAIN_TRANSPORT_WITH_CUSTOMS'),
+	('76ec1857-294d-4eef-95ab-84b0eff3261c', 'Rail Container with Paid First/Last Mile', 'Demo service type for paid import/export bookings with a single mile leg', true, true, true, false, true, 11, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, 'RAIL_CONTAINER_PAID_MILE');
+
+
+--
+-- Data for Name: shipping_lines; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.shipping_lines VALUES
+	('3e0821c1-293b-4107-81f0-0fe364768168', 'PIL', 'PIL (Pacific International Lines)', NULL, false, true, '2026-08-04 11:16:01.544746+00', '2026-08-04 11:16:01.544746+00', NULL),
+	('56b36e3d-214b-4903-9a06-2f908ef24172', 'MSC', 'MSC (Mediterranean Shipping Company)', NULL, false, true, '2026-08-04 11:17:21.096097+00', '2026-08-04 11:17:21.096097+00', NULL),
+	('8fab083d-71bb-42b3-902d-56e248461cb4', 'CMA CGM', 'CMA CGM', NULL, false, true, '2026-08-04 11:17:50.562108+00', '2026-08-04 11:17:50.562108+00', NULL),
+	('2c157bca-2865-4d94-b615-86fcbe6b77a1', 'MAERSK', 'Maersk', NULL, false, true, '2026-08-04 11:18:26.243578+00', '2026-08-04 11:18:26.243578+00', NULL),
+	('e66f5330-de00-4a3d-b717-5cba53fba974', 'EVERGREEN', 'Evergreen', NULL, false, true, '2026-08-04 11:19:59.784698+00', '2026-08-04 11:19:59.784698+00', NULL);
+
+
+--
+-- Data for Name: support_conversations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: support_document_versions; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.support_document_versions VALUES
+	('1d978c47-db4c-480c-9645-e2b7eb59ddf7', 'aef07887-6a67-43e4-a267-3e457a049573', 1, '{"email": "support@edrfreight.com", "hours": "Monday – Saturday, 8:30 AM – 5:30 PM (EAT)", "phone": "+251 11 000 0000", "office": "Addis Ababa, Ethiopia"}', NULL, 'Initial content', '2026-08-09 18:50:22.738193+00', '2026-08-09 18:50:22.738193+00', NULL),
+	('c5c697c1-627a-4b3d-af68-a13425bf44cd', '9dc7987f-2d92-47f0-805f-1755ef904a3f', 1, '{"title": "Help & Support", "sections": [{"id": "help-walkthrough", "body": "A guided tour of the portal — registering your company, raising a booking against a contract, and settling an invoice.\n\n![](/assets/edr-portal-guide.webm)", "heading": "Portal walkthrough"}, {"id": "help-chat", "body": "Signed-in customers can open a support conversation from the headset button at the bottom right of every portal page. You can send screenshots and documents in the chat, and replies appear there and as a notification.\n\n[Open the portal](/portal)", "heading": "Chat with our team"}, {"id": "help-contact", "body": "- **Email** — [{{supportEmail}}](mailto:{{supportEmail}}). Best for document issues and anything needing an attachment.\n- **Phone** — [{{supportPhone}}](tel:{{supportPhoneTel}}). Best for urgent problems with cargo already in transit.\n- **Head office** — {{supportOffice}}. Walk-in support during working hours.\n- **Support hours** — {{supportHours}}. Outside these hours, email us and we reply the next working day.", "heading": "Contact us"}, {"id": "help-topics", "body": "- **[Account & onboarding](/faq)** — registering your company, uploading your trade licence and TIN, and getting an operational profile approved.\n- **[Contracts](/faq)** — requesting a freight contract, reviewing its terms and signing it with your saved signature and stamp.\n- **[Bookings & tracking](/faq)** — raising a booking against a contract, adding last-mile transport and following the consignment along the corridor.\n- **[Invoices & payments](/faq)** — finding invoices, paying through the bank channels and confirming a payment that has not yet settled.", "heading": "Common topics"}, {"id": "help-checklist", "body": "- Your company name and the email you sign in with.\n- The reference of the contract, booking or invoice involved.\n- What you expected to happen and what happened instead.\n- A screenshot of any error message the portal showed.", "heading": "What to include when you contact us"}], "subtitle": "Get answers fast — watch the walkthrough, browse the common topics, check the FAQ, or reach our team directly."}', NULL, 'Initial content', '2026-08-09 18:50:22.743044+00', '2026-08-09 18:50:22.743044+00', NULL),
+	('23b95137-0c23-443b-9731-ad7a058c46b8', '6cec5868-f597-49b3-a2c0-be0c3d46b802', 1, '{"title": "Frequently Asked Questions", "footer": {"body": "Our team is on {{supportEmail}} and {{supportPhone}}, or you can start a chat from the support button inside the portal.", "ctaTo": "/help", "heading": "Still need a hand?", "ctaLabel": "Go to Help & Support"}, "groups": [{"id": "faq-getting-started", "items": [{"id": "faq-open-account", "answer": "Sign up with your work email and verify the one-time code we send you. After you set a password, the onboarding wizard collects your company details, trade licence, TIN certificate and the operational services you need (importer, exporter, freight forwarder or transporter). Submit the wizard and our team reviews the application.", "question": "How do I open an account on EDR Freight?"}, {"id": "faq-approval-time", "answer": "Most complete applications are reviewed within two working days. You will see the status on your dashboard, and we email you when a profile is approved or when a document needs to be re-uploaded.", "question": "How long does account approval take?"}, {"id": "faq-rejected", "answer": "The rejection notice states the reason. Open Settings, correct the details or replace the document that was flagged, and re-apply — you do not need to create a new account.", "question": "My profile was rejected. What now?"}, {"id": "faq-multiple-services", "answer": "Yes. A company can hold importer, exporter, freight forwarder and transporter profiles at the same time. Each is approved separately, and the header lets you switch between the ones you hold.", "question": "Can one company hold several operational services?"}], "title": "Getting started"}, {"id": "faq-contracts-bookings", "items": [{"id": "faq-contract-vs-booking", "answer": "A contract is the commercial agreement covering a cargo movement — route, commodity, volume and rates. A booking is a single shipment executed under that contract. You create the contract once, then raise bookings against it for each consignment.", "question": "What is the difference between a contract and a booking?"}, {"id": "faq-create-booking", "answer": "Open the contract from the Contracts list and choose New Booking. Provide the consignment details, containers or tonnage, and the last-mile requirement if you need one. Bookings can also be started from the Bookings page, which routes you through contract selection first.", "question": "How do I create a booking?"}, {"id": "faq-sign-contract", "answer": "The contract document is the binding agreement for the movement. You must scroll to the end, accept the terms, and sign it with your saved signature and stamp before EDR schedules any wagon against it.", "question": "Why do I have to sign a contract before shipping?"}, {"id": "faq-signature-setup", "answer": "Under Signature & Stamp in the portal. It is saved once and reused for every contract you sign, so you do not have to upload it per document.", "question": "Where do I set up my signature and stamp?"}, {"id": "faq-change-booking", "answer": "You can edit a booking while it is still pending review. Once EDR has confirmed it and allocated capacity, changes go through our operations team — contact support with the booking reference.", "question": "Can I change a booking after submitting it?"}, {"id": "faq-track-consignment", "answer": "Open the booking and use the tracking panel, which shows the current milestone, the wagon or container assigned, and the timestamps recorded at each corridor point.", "question": "How do I track a consignment?"}], "title": "Contracts and bookings"}, {"id": "faq-invoices-payments", "items": [{"id": "faq-find-invoices", "answer": "The Invoices page lists every invoice raised against your company, with its status, due date and outstanding balance. Open any invoice to see its line items and download a PDF copy.", "question": "Where do I find my invoices?"}, {"id": "faq-payment-methods", "answer": "Payments are made through the integrated bank channels shown at checkout. After you complete the payment on the bank''s page you are returned to the portal, and the invoice status updates once the bank confirms the transaction.", "question": "Which payment methods are supported?"}, {"id": "faq-payment-not-settled", "answer": "Bank confirmations can lag by a few minutes. Use the Check Payment Status page linked from your receipt; if it still has not settled after an hour, email support with the invoice number and the bank reference and we will reconcile it.", "question": "My payment was deducted but the invoice still shows unpaid."}, {"id": "faq-rounding", "answer": "Some bank channels only accept whole-birr amounts, so invoices routed through them are rounded up to the nearest birr. The rounding is shown on the invoice detail page.", "question": "Why is my invoice amount rounded?"}], "title": "Invoices and payments"}, {"id": "faq-account-security", "items": [{"id": "faq-reset-password", "answer": "Use Forgot Password on the sign-in page. We email you a reset link that is valid for a limited time. If a member of our staff issued the link, it works the same way even if you are already signed in.", "question": "How do I reset my password?"}, {"id": "faq-add-colleagues", "answer": "Yes. Company administrators can invite additional users from Settings. Each user signs in with their own credentials, and actions are recorded against the individual who performed them.", "question": "Can I add colleagues to my company account?"}, {"id": "faq-update-company", "answer": "Edit them in Settings. Changes to regulated fields — trade licence, TIN, legal name — are re-verified by our team before they take effect.", "question": "How do I update company details after approval?"}], "title": "Account and security"}], "subtitle": "Answers to the questions customers ask most about registering, booking cargo and settling invoices on EDR Freight."}', NULL, 'Initial content', '2026-08-09 18:50:22.747104+00', '2026-08-09 18:50:22.747104+00', NULL),
+	('dfb3f456-7646-45f4-98fb-a0a97421c915', '9b4518c5-94b0-42c9-a275-e20156f584f4', 1, '{"title": "Privacy Policy", "sections": [{"id": "privacy-1", "body": "The Ethio-Djibouti Standard Gauge Rail Share Company (\"EDR\", \"we\", \"us\") operates the EDR Freight platform, which lets customers register their business, agree freight contracts, raise bookings, track consignments and settle invoices online.\n\nThis policy explains what personal and business information we collect through the platform, why we collect it, how long we keep it and what rights you have over it. It applies to the EDR Freight customer portal and the services reached through it.", "heading": "1. Introduction"}, {"id": "privacy-2", "body": "We collect information you give us, information generated by your use of the platform, and information we receive from the regulators and financial institutions we work with.\n\n- Account details — name, work email address, phone number and the credentials used to sign in.\n- Company and compliance records — legal name, trade licence, TIN certificate, VAT registration, ownership and manager details, and the operational services you apply for.\n- Identity verification data — where you verify through a national identity service, the verification result and the attributes that service returns to us.\n- Operational data — contracts, bookings, consignment and cargo details, container and wagon assignments, tracking events and delivery confirmations.\n- Financial data — invoices, payment references, transaction status and settlement confirmations received from banks. We do not store your card numbers or online banking credentials.\n- Support data — the messages and files you send us through the in-app support chat or by email.\n- Technical data — IP address, device and browser information, and event logs generated when you use the platform.", "heading": "2. Information we collect"}, {"id": "privacy-3", "body": "- To create and administer your account and verify that your company is entitled to the services it applies for.\n- To perform the freight contracts and bookings you place, including allocating capacity and coordinating rail and last-mile movements.\n- To issue invoices, process payments and keep the accounting records the law requires us to keep.\n- To provide customer support and respond to the questions and complaints you raise.\n- To keep the platform secure, detect misuse and investigate incidents.\n- To meet our legal, tax, customs and regulatory obligations in Ethiopia and Djibouti.\n- To improve the platform — measuring which features are used and where users encounter errors, using aggregated and pseudonymised data wherever that is sufficient.", "heading": "3. How we use your information"}, {"id": "privacy-4", "body": "We process your information because it is necessary to perform the contract between you and EDR, because we have a legal obligation to do so (customs, tax and transport regulation), or because we have a legitimate interest in operating and securing the platform. Where we rely on your consent — for example, optional marketing messages — you can withdraw it at any time.", "heading": "4. Legal basis for processing"}, {"id": "privacy-5", "body": "We do not sell your information. We share it only where it is necessary to deliver the service or where the law requires it.\n\n- Government and regulatory bodies — customs, revenue and transport authorities in Ethiopia and Djibouti, to the extent required for the movement of your cargo.\n- Ports, terminals and last-mile transporters involved in executing your bookings.\n- Banks and payment providers, to initiate and reconcile the payments you make.\n- Technology suppliers who host and maintain the platform on our behalf, under contracts that restrict them to processing data on our instructions.\n- Courts, law enforcement and other authorities where we are legally compelled to disclose.", "heading": "5. Sharing your information"}, {"id": "privacy-6", "body": "Cross-border freight inherently involves parties in more than one country, so consignment and clearance information is shared with counterparties and authorities in Djibouti as well as Ethiopia. Where we transfer information outside Ethiopia, we do so only as far as the movement requires or the law permits, and we require recipients to protect it to a comparable standard.", "heading": "6. International transfers"}, {"id": "privacy-7", "body": "We keep account and company records for as long as your account is active. Contract, booking, customs and financial records are kept for the period required by Ethiopian commercial, tax and customs law after the relevant transaction, because we are obliged to be able to produce them. Support conversations and technical logs are kept for a shorter period, sufficient to resolve disputes and investigate security incidents.", "heading": "7. Data retention"}, {"id": "privacy-8", "body": "Access to the platform requires authentication, and staff access to customer records is limited to what each role needs. Data is transmitted over encrypted connections and stored on systems protected by access controls and logging. No system is perfectly secure, so please keep your credentials confidential and tell us immediately if you believe your account has been compromised.", "heading": "8. Security"}, {"id": "privacy-9", "body": "Subject to Ethiopian law, you may ask us to give you a copy of the personal information we hold about you, correct it if it is inaccurate, restrict or object to certain processing, or delete it where we are not required to keep it. Requests are handled through the contact details below; we may need to verify your identity before acting.", "heading": "9. Your rights"}, {"id": "privacy-10", "body": "The platform uses cookies and browser storage to keep you signed in, remember your interface preferences and measure how the product is used so we can fix problems. Essential cookies cannot be turned off without breaking sign-in. You can clear or block the rest through your browser settings.", "heading": "10. Cookies and similar technologies"}, {"id": "privacy-11", "body": "The platform is a business service and is not directed at children. We do not knowingly collect information from anyone under 18.", "heading": "11. Children"}, {"id": "privacy-12", "body": "We may update this policy as the platform and the law change. Material changes are announced in the portal before they take effect, and the date at the top of this page always reflects the current version.", "heading": "12. Changes to this policy"}, {"id": "privacy-13", "body": "Questions about this policy or about how we handle your information can be sent to {{supportEmail}}, called in on {{supportPhone}}, or addressed to our head office in {{supportOffice}}.", "heading": "13. Contact us"}], "subtitle": "How EDR Freight collects, uses, shares and protects the information you provide when you use the platform.", "lastUpdated": "6 August 2026"}', NULL, 'Initial content', '2026-08-09 18:50:22.750948+00', '2026-08-09 18:50:22.750948+00', NULL),
+	('051f61a2-0c6f-4ae6-8f67-8d36ffb50df2', 'e6aaa986-cceb-4d99-a3e1-06f596b8474f', 1, '{"title": "Terms of Service", "sections": [{"id": "terms-1", "body": "These terms govern your use of the EDR Freight platform operated by the Ethio-Djibouti Standard Gauge Rail Share Company (\"EDR\"). By creating an account or using the platform, the company you represent agrees to them.\n\nThe platform is the channel through which you register, request and manage freight services. The commercial terms of each movement — routes, rates, volumes and payment terms — are set out in the freight contract you sign in the platform. Where a signed contract and these terms conflict, the signed contract governs that movement.", "heading": "1. These terms"}, {"id": "terms-2", "body": "- The platform is for registered businesses. You confirm that you are authorised to act for the company you register and to bind it to these terms.\n- The information and documents you submit — trade licence, TIN, VAT registration, ownership details — must be accurate, current and genuine.\n- Accounts and operational profiles are activated only after EDR has reviewed and approved them, and approval may be refused or withdrawn.\n- You are responsible for keeping credentials confidential and for everything done under your account. Tell us at once if you suspect unauthorised use.", "heading": "2. Eligibility and accounts"}, {"id": "terms-3", "body": "- A freight contract takes effect when it is signed in the platform by you and countersigned by EDR.\n- A booking is a request for a specific movement under a contract. It becomes binding when EDR confirms it and allocates capacity — submission alone does not reserve a wagon or container.\n- You are responsible for the accuracy of consignment data: commodity description, weight, dimensions, container numbers, hazardous classification and consignee details.\n- Capacity is finite. EDR may decline, defer or reschedule a booking where capacity, safety, operating conditions or regulatory direction require it.", "heading": "3. Contracts and bookings"}, {"id": "terms-4", "body": "- You must obtain and provide every permit, customs declaration and clearance document the movement requires, and you warrant that the cargo may lawfully be carried.\n- Prohibited and restricted goods may not be tendered without EDR''s prior written agreement and any licence the law requires.\n- Cargo must be packed, secured and, where applicable, labelled to the standard the mode of carriage requires. EDR may inspect, refuse or offload cargo that is misdeclared or unsafe.\n- You are liable for fines, demurrage, storage charges and losses arising from misdeclared cargo, missing documents or delays attributable to you.", "heading": "4. Cargo, documents and compliance"}, {"id": "terms-5", "body": "- Charges are calculated from the rates in your contract, the tariffs published in the platform, and any accessorial services actually rendered.\n- Invoices are issued in the platform and are payable by the due date shown on them, through the payment channels the platform offers.\n- Payment is confirmed when the funds are confirmed by the bank, not when payment is initiated.\n- Overdue amounts may attract interest and may result in suspension of new bookings or of the account until the balance is cleared.\n- Taxes and statutory duties are your responsibility unless the contract expressly says otherwise.", "heading": "5. Rates, invoicing and payment"}, {"id": "terms-6", "body": "Transit times shown in the platform are estimates based on planned schedules. They are not guarantees, and EDR is not liable for indirect or consequential loss, loss of profit or loss of market arising from delay.\n\nEDR''s liability for loss of or damage to cargo is limited to the extent set out in the applicable freight contract and in the transport law governing the carriage. Claims must be notified in writing within the period the contract specifies; late claims may be rejected.\n\nNeither party is liable for failure to perform caused by events beyond its reasonable control, including natural disasters, industrial action, civil unrest, infrastructure failure, or acts of government and regulatory authorities.", "heading": "6. Delivery, delay and liability"}, {"id": "terms-7", "body": "- Use the platform only for its intended purpose and in accordance with applicable law.\n- Do not attempt to gain unauthorised access, probe or disrupt the service, or interfere with other customers'' data.\n- Do not scrape, resell or redistribute platform content, rates or data without written permission.\n- Do not upload malware or content that infringes the rights of others.", "heading": "7. Acceptable use of the platform"}, {"id": "terms-8", "body": "You agree that contracts signed in the platform using your stored signature and stamp are validly executed, that the records the platform keeps of those signatures are admissible evidence of them, and that they carry the same effect as signatures on paper.", "heading": "8. Electronic signatures and records"}, {"id": "terms-9", "body": "We aim to keep the platform available, but it may be interrupted for maintenance, upgrades or reasons outside our control. We may add, change or withdraw features. Where a change materially affects how you use the platform, we will give reasonable notice in the portal.", "heading": "9. Availability and changes to the service"}, {"id": "terms-10", "body": "We may suspend or terminate access where these terms are breached, where documents prove to be false, where amounts remain unpaid, or where the law or a regulator requires it. You may stop using the platform at any time. Termination does not affect obligations already incurred — cargo in transit, invoices outstanding, or records we are required to retain.", "heading": "10. Suspension and termination"}, {"id": "terms-11", "body": "The platform, its software, design and content belong to EDR or its licensors. You are granted a non-exclusive, non-transferable right to use it for your own freight operations. Your commercial and consignment data remains yours; you grant us the right to process it as needed to deliver the service and as described in the Privacy Policy.", "heading": "11. Intellectual property"}, {"id": "terms-12", "body": "Each party will keep the other''s non-public commercial information confidential and use it only for the purposes of the services. Our handling of personal information is described in the Privacy Policy, which forms part of these terms.", "heading": "12. Confidentiality and data protection"}, {"id": "terms-13", "body": "These terms are governed by the laws of the Federal Democratic Republic of Ethiopia. The parties will first attempt to resolve any dispute amicably; failing that, the dispute is subject to the jurisdiction of the competent courts of Ethiopia, without prejudice to any arbitration clause agreed in a specific freight contract.", "heading": "13. Governing law and disputes"}, {"id": "terms-14", "body": "We may update these terms as the service and the law change. Updates are published here and announced in the portal. Continuing to use the platform after an update takes effect means you accept the revised terms.", "heading": "14. Changes to these terms"}, {"id": "terms-15", "body": "For questions about these terms, write to {{supportEmail}} or call {{supportPhone}}.", "heading": "15. Contact"}], "subtitle": "The terms on which EDR provides the EDR Freight platform and the freight services you request through it.", "lastUpdated": "6 August 2026"}', NULL, 'Initial content', '2026-08-09 18:50:22.755212+00', '2026-08-09 18:50:22.755212+00', NULL);
+
+
+--
+-- Data for Name: support_documents; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.support_documents VALUES
+	('aef07887-6a67-43e4-a267-3e457a049573', 'CONTACT', '{"email": "support@edrfreight.com", "hours": "Monday – Saturday, 8:30 AM – 5:30 PM (EAT)", "phone": "+251 11 000 0000", "office": "Addis Ababa, Ethiopia"}', 1, NULL, '2026-08-09 18:50:22.734138+00', '2026-08-09 18:50:22.734138+00', NULL),
+	('9dc7987f-2d92-47f0-805f-1755ef904a3f', 'HELP', '{"title": "Help & Support", "sections": [{"id": "help-walkthrough", "body": "A guided tour of the portal — registering your company, raising a booking against a contract, and settling an invoice.\n\n![](/assets/edr-portal-guide.webm)", "heading": "Portal walkthrough"}, {"id": "help-chat", "body": "Signed-in customers can open a support conversation from the headset button at the bottom right of every portal page. You can send screenshots and documents in the chat, and replies appear there and as a notification.\n\n[Open the portal](/portal)", "heading": "Chat with our team"}, {"id": "help-contact", "body": "- **Email** — [{{supportEmail}}](mailto:{{supportEmail}}). Best for document issues and anything needing an attachment.\n- **Phone** — [{{supportPhone}}](tel:{{supportPhoneTel}}). Best for urgent problems with cargo already in transit.\n- **Head office** — {{supportOffice}}. Walk-in support during working hours.\n- **Support hours** — {{supportHours}}. Outside these hours, email us and we reply the next working day.", "heading": "Contact us"}, {"id": "help-topics", "body": "- **[Account & onboarding](/faq)** — registering your company, uploading your trade licence and TIN, and getting an operational profile approved.\n- **[Contracts](/faq)** — requesting a freight contract, reviewing its terms and signing it with your saved signature and stamp.\n- **[Bookings & tracking](/faq)** — raising a booking against a contract, adding last-mile transport and following the consignment along the corridor.\n- **[Invoices & payments](/faq)** — finding invoices, paying through the bank channels and confirming a payment that has not yet settled.", "heading": "Common topics"}, {"id": "help-checklist", "body": "- Your company name and the email you sign in with.\n- The reference of the contract, booking or invoice involved.\n- What you expected to happen and what happened instead.\n- A screenshot of any error message the portal showed.", "heading": "What to include when you contact us"}], "subtitle": "Get answers fast — watch the walkthrough, browse the common topics, check the FAQ, or reach our team directly."}', 1, NULL, '2026-08-09 18:50:22.740709+00', '2026-08-09 18:50:22.740709+00', NULL),
+	('6cec5868-f597-49b3-a2c0-be0c3d46b802', 'FAQ', '{"title": "Frequently Asked Questions", "footer": {"body": "Our team is on {{supportEmail}} and {{supportPhone}}, or you can start a chat from the support button inside the portal.", "ctaTo": "/help", "heading": "Still need a hand?", "ctaLabel": "Go to Help & Support"}, "groups": [{"id": "faq-getting-started", "items": [{"id": "faq-open-account", "answer": "Sign up with your work email and verify the one-time code we send you. After you set a password, the onboarding wizard collects your company details, trade licence, TIN certificate and the operational services you need (importer, exporter, freight forwarder or transporter). Submit the wizard and our team reviews the application.", "question": "How do I open an account on EDR Freight?"}, {"id": "faq-approval-time", "answer": "Most complete applications are reviewed within two working days. You will see the status on your dashboard, and we email you when a profile is approved or when a document needs to be re-uploaded.", "question": "How long does account approval take?"}, {"id": "faq-rejected", "answer": "The rejection notice states the reason. Open Settings, correct the details or replace the document that was flagged, and re-apply — you do not need to create a new account.", "question": "My profile was rejected. What now?"}, {"id": "faq-multiple-services", "answer": "Yes. A company can hold importer, exporter, freight forwarder and transporter profiles at the same time. Each is approved separately, and the header lets you switch between the ones you hold.", "question": "Can one company hold several operational services?"}], "title": "Getting started"}, {"id": "faq-contracts-bookings", "items": [{"id": "faq-contract-vs-booking", "answer": "A contract is the commercial agreement covering a cargo movement — route, commodity, volume and rates. A booking is a single shipment executed under that contract. You create the contract once, then raise bookings against it for each consignment.", "question": "What is the difference between a contract and a booking?"}, {"id": "faq-create-booking", "answer": "Open the contract from the Contracts list and choose New Booking. Provide the consignment details, containers or tonnage, and the last-mile requirement if you need one. Bookings can also be started from the Bookings page, which routes you through contract selection first.", "question": "How do I create a booking?"}, {"id": "faq-sign-contract", "answer": "The contract document is the binding agreement for the movement. You must scroll to the end, accept the terms, and sign it with your saved signature and stamp before EDR schedules any wagon against it.", "question": "Why do I have to sign a contract before shipping?"}, {"id": "faq-signature-setup", "answer": "Under Signature & Stamp in the portal. It is saved once and reused for every contract you sign, so you do not have to upload it per document.", "question": "Where do I set up my signature and stamp?"}, {"id": "faq-change-booking", "answer": "You can edit a booking while it is still pending review. Once EDR has confirmed it and allocated capacity, changes go through our operations team — contact support with the booking reference.", "question": "Can I change a booking after submitting it?"}, {"id": "faq-track-consignment", "answer": "Open the booking and use the tracking panel, which shows the current milestone, the wagon or container assigned, and the timestamps recorded at each corridor point.", "question": "How do I track a consignment?"}], "title": "Contracts and bookings"}, {"id": "faq-invoices-payments", "items": [{"id": "faq-find-invoices", "answer": "The Invoices page lists every invoice raised against your company, with its status, due date and outstanding balance. Open any invoice to see its line items and download a PDF copy.", "question": "Where do I find my invoices?"}, {"id": "faq-payment-methods", "answer": "Payments are made through the integrated bank channels shown at checkout. After you complete the payment on the bank''s page you are returned to the portal, and the invoice status updates once the bank confirms the transaction.", "question": "Which payment methods are supported?"}, {"id": "faq-payment-not-settled", "answer": "Bank confirmations can lag by a few minutes. Use the Check Payment Status page linked from your receipt; if it still has not settled after an hour, email support with the invoice number and the bank reference and we will reconcile it.", "question": "My payment was deducted but the invoice still shows unpaid."}, {"id": "faq-rounding", "answer": "Some bank channels only accept whole-birr amounts, so invoices routed through them are rounded up to the nearest birr. The rounding is shown on the invoice detail page.", "question": "Why is my invoice amount rounded?"}], "title": "Invoices and payments"}, {"id": "faq-account-security", "items": [{"id": "faq-reset-password", "answer": "Use Forgot Password on the sign-in page. We email you a reset link that is valid for a limited time. If a member of our staff issued the link, it works the same way even if you are already signed in.", "question": "How do I reset my password?"}, {"id": "faq-add-colleagues", "answer": "Yes. Company administrators can invite additional users from Settings. Each user signs in with their own credentials, and actions are recorded against the individual who performed them.", "question": "Can I add colleagues to my company account?"}, {"id": "faq-update-company", "answer": "Edit them in Settings. Changes to regulated fields — trade licence, TIN, legal name — are re-verified by our team before they take effect.", "question": "How do I update company details after approval?"}], "title": "Account and security"}], "subtitle": "Answers to the questions customers ask most about registering, booking cargo and settling invoices on EDR Freight."}', 1, NULL, '2026-08-09 18:50:22.744919+00', '2026-08-09 18:50:22.744919+00', NULL),
+	('9b4518c5-94b0-42c9-a275-e20156f584f4', 'PRIVACY', '{"title": "Privacy Policy", "sections": [{"id": "privacy-1", "body": "The Ethio-Djibouti Standard Gauge Rail Share Company (\"EDR\", \"we\", \"us\") operates the EDR Freight platform, which lets customers register their business, agree freight contracts, raise bookings, track consignments and settle invoices online.\n\nThis policy explains what personal and business information we collect through the platform, why we collect it, how long we keep it and what rights you have over it. It applies to the EDR Freight customer portal and the services reached through it.", "heading": "1. Introduction"}, {"id": "privacy-2", "body": "We collect information you give us, information generated by your use of the platform, and information we receive from the regulators and financial institutions we work with.\n\n- Account details — name, work email address, phone number and the credentials used to sign in.\n- Company and compliance records — legal name, trade licence, TIN certificate, VAT registration, ownership and manager details, and the operational services you apply for.\n- Identity verification data — where you verify through a national identity service, the verification result and the attributes that service returns to us.\n- Operational data — contracts, bookings, consignment and cargo details, container and wagon assignments, tracking events and delivery confirmations.\n- Financial data — invoices, payment references, transaction status and settlement confirmations received from banks. We do not store your card numbers or online banking credentials.\n- Support data — the messages and files you send us through the in-app support chat or by email.\n- Technical data — IP address, device and browser information, and event logs generated when you use the platform.", "heading": "2. Information we collect"}, {"id": "privacy-3", "body": "- To create and administer your account and verify that your company is entitled to the services it applies for.\n- To perform the freight contracts and bookings you place, including allocating capacity and coordinating rail and last-mile movements.\n- To issue invoices, process payments and keep the accounting records the law requires us to keep.\n- To provide customer support and respond to the questions and complaints you raise.\n- To keep the platform secure, detect misuse and investigate incidents.\n- To meet our legal, tax, customs and regulatory obligations in Ethiopia and Djibouti.\n- To improve the platform — measuring which features are used and where users encounter errors, using aggregated and pseudonymised data wherever that is sufficient.", "heading": "3. How we use your information"}, {"id": "privacy-4", "body": "We process your information because it is necessary to perform the contract between you and EDR, because we have a legal obligation to do so (customs, tax and transport regulation), or because we have a legitimate interest in operating and securing the platform. Where we rely on your consent — for example, optional marketing messages — you can withdraw it at any time.", "heading": "4. Legal basis for processing"}, {"id": "privacy-5", "body": "We do not sell your information. We share it only where it is necessary to deliver the service or where the law requires it.\n\n- Government and regulatory bodies — customs, revenue and transport authorities in Ethiopia and Djibouti, to the extent required for the movement of your cargo.\n- Ports, terminals and last-mile transporters involved in executing your bookings.\n- Banks and payment providers, to initiate and reconcile the payments you make.\n- Technology suppliers who host and maintain the platform on our behalf, under contracts that restrict them to processing data on our instructions.\n- Courts, law enforcement and other authorities where we are legally compelled to disclose.", "heading": "5. Sharing your information"}, {"id": "privacy-6", "body": "Cross-border freight inherently involves parties in more than one country, so consignment and clearance information is shared with counterparties and authorities in Djibouti as well as Ethiopia. Where we transfer information outside Ethiopia, we do so only as far as the movement requires or the law permits, and we require recipients to protect it to a comparable standard.", "heading": "6. International transfers"}, {"id": "privacy-7", "body": "We keep account and company records for as long as your account is active. Contract, booking, customs and financial records are kept for the period required by Ethiopian commercial, tax and customs law after the relevant transaction, because we are obliged to be able to produce them. Support conversations and technical logs are kept for a shorter period, sufficient to resolve disputes and investigate security incidents.", "heading": "7. Data retention"}, {"id": "privacy-8", "body": "Access to the platform requires authentication, and staff access to customer records is limited to what each role needs. Data is transmitted over encrypted connections and stored on systems protected by access controls and logging. No system is perfectly secure, so please keep your credentials confidential and tell us immediately if you believe your account has been compromised.", "heading": "8. Security"}, {"id": "privacy-9", "body": "Subject to Ethiopian law, you may ask us to give you a copy of the personal information we hold about you, correct it if it is inaccurate, restrict or object to certain processing, or delete it where we are not required to keep it. Requests are handled through the contact details below; we may need to verify your identity before acting.", "heading": "9. Your rights"}, {"id": "privacy-10", "body": "The platform uses cookies and browser storage to keep you signed in, remember your interface preferences and measure how the product is used so we can fix problems. Essential cookies cannot be turned off without breaking sign-in. You can clear or block the rest through your browser settings.", "heading": "10. Cookies and similar technologies"}, {"id": "privacy-11", "body": "The platform is a business service and is not directed at children. We do not knowingly collect information from anyone under 18.", "heading": "11. Children"}, {"id": "privacy-12", "body": "We may update this policy as the platform and the law change. Material changes are announced in the portal before they take effect, and the date at the top of this page always reflects the current version.", "heading": "12. Changes to this policy"}, {"id": "privacy-13", "body": "Questions about this policy or about how we handle your information can be sent to {{supportEmail}}, called in on {{supportPhone}}, or addressed to our head office in {{supportOffice}}.", "heading": "13. Contact us"}], "subtitle": "How EDR Freight collects, uses, shares and protects the information you provide when you use the platform.", "lastUpdated": "6 August 2026"}', 1, NULL, '2026-08-09 18:50:22.749059+00', '2026-08-09 18:50:22.749059+00', NULL),
+	('e6aaa986-cceb-4d99-a3e1-06f596b8474f', 'TERMS', '{"title": "Terms of Service", "sections": [{"id": "terms-1", "body": "These terms govern your use of the EDR Freight platform operated by the Ethio-Djibouti Standard Gauge Rail Share Company (\"EDR\"). By creating an account or using the platform, the company you represent agrees to them.\n\nThe platform is the channel through which you register, request and manage freight services. The commercial terms of each movement — routes, rates, volumes and payment terms — are set out in the freight contract you sign in the platform. Where a signed contract and these terms conflict, the signed contract governs that movement.", "heading": "1. These terms"}, {"id": "terms-2", "body": "- The platform is for registered businesses. You confirm that you are authorised to act for the company you register and to bind it to these terms.\n- The information and documents you submit — trade licence, TIN, VAT registration, ownership details — must be accurate, current and genuine.\n- Accounts and operational profiles are activated only after EDR has reviewed and approved them, and approval may be refused or withdrawn.\n- You are responsible for keeping credentials confidential and for everything done under your account. Tell us at once if you suspect unauthorised use.", "heading": "2. Eligibility and accounts"}, {"id": "terms-3", "body": "- A freight contract takes effect when it is signed in the platform by you and countersigned by EDR.\n- A booking is a request for a specific movement under a contract. It becomes binding when EDR confirms it and allocates capacity — submission alone does not reserve a wagon or container.\n- You are responsible for the accuracy of consignment data: commodity description, weight, dimensions, container numbers, hazardous classification and consignee details.\n- Capacity is finite. EDR may decline, defer or reschedule a booking where capacity, safety, operating conditions or regulatory direction require it.", "heading": "3. Contracts and bookings"}, {"id": "terms-4", "body": "- You must obtain and provide every permit, customs declaration and clearance document the movement requires, and you warrant that the cargo may lawfully be carried.\n- Prohibited and restricted goods may not be tendered without EDR''s prior written agreement and any licence the law requires.\n- Cargo must be packed, secured and, where applicable, labelled to the standard the mode of carriage requires. EDR may inspect, refuse or offload cargo that is misdeclared or unsafe.\n- You are liable for fines, demurrage, storage charges and losses arising from misdeclared cargo, missing documents or delays attributable to you.", "heading": "4. Cargo, documents and compliance"}, {"id": "terms-5", "body": "- Charges are calculated from the rates in your contract, the tariffs published in the platform, and any accessorial services actually rendered.\n- Invoices are issued in the platform and are payable by the due date shown on them, through the payment channels the platform offers.\n- Payment is confirmed when the funds are confirmed by the bank, not when payment is initiated.\n- Overdue amounts may attract interest and may result in suspension of new bookings or of the account until the balance is cleared.\n- Taxes and statutory duties are your responsibility unless the contract expressly says otherwise.", "heading": "5. Rates, invoicing and payment"}, {"id": "terms-6", "body": "Transit times shown in the platform are estimates based on planned schedules. They are not guarantees, and EDR is not liable for indirect or consequential loss, loss of profit or loss of market arising from delay.\n\nEDR''s liability for loss of or damage to cargo is limited to the extent set out in the applicable freight contract and in the transport law governing the carriage. Claims must be notified in writing within the period the contract specifies; late claims may be rejected.\n\nNeither party is liable for failure to perform caused by events beyond its reasonable control, including natural disasters, industrial action, civil unrest, infrastructure failure, or acts of government and regulatory authorities.", "heading": "6. Delivery, delay and liability"}, {"id": "terms-7", "body": "- Use the platform only for its intended purpose and in accordance with applicable law.\n- Do not attempt to gain unauthorised access, probe or disrupt the service, or interfere with other customers'' data.\n- Do not scrape, resell or redistribute platform content, rates or data without written permission.\n- Do not upload malware or content that infringes the rights of others.", "heading": "7. Acceptable use of the platform"}, {"id": "terms-8", "body": "You agree that contracts signed in the platform using your stored signature and stamp are validly executed, that the records the platform keeps of those signatures are admissible evidence of them, and that they carry the same effect as signatures on paper.", "heading": "8. Electronic signatures and records"}, {"id": "terms-9", "body": "We aim to keep the platform available, but it may be interrupted for maintenance, upgrades or reasons outside our control. We may add, change or withdraw features. Where a change materially affects how you use the platform, we will give reasonable notice in the portal.", "heading": "9. Availability and changes to the service"}, {"id": "terms-10", "body": "We may suspend or terminate access where these terms are breached, where documents prove to be false, where amounts remain unpaid, or where the law or a regulator requires it. You may stop using the platform at any time. Termination does not affect obligations already incurred — cargo in transit, invoices outstanding, or records we are required to retain.", "heading": "10. Suspension and termination"}, {"id": "terms-11", "body": "The platform, its software, design and content belong to EDR or its licensors. You are granted a non-exclusive, non-transferable right to use it for your own freight operations. Your commercial and consignment data remains yours; you grant us the right to process it as needed to deliver the service and as described in the Privacy Policy.", "heading": "11. Intellectual property"}, {"id": "terms-12", "body": "Each party will keep the other''s non-public commercial information confidential and use it only for the purposes of the services. Our handling of personal information is described in the Privacy Policy, which forms part of these terms.", "heading": "12. Confidentiality and data protection"}, {"id": "terms-13", "body": "These terms are governed by the laws of the Federal Democratic Republic of Ethiopia. The parties will first attempt to resolve any dispute amicably; failing that, the dispute is subject to the jurisdiction of the competent courts of Ethiopia, without prejudice to any arbitration clause agreed in a specific freight contract.", "heading": "13. Governing law and disputes"}, {"id": "terms-14", "body": "We may update these terms as the service and the law change. Updates are published here and announced in the portal. Continuing to use the platform after an update takes effect means you accept the revised terms.", "heading": "14. Changes to these terms"}, {"id": "terms-15", "body": "For questions about these terms, write to {{supportEmail}} or call {{supportPhone}}.", "heading": "15. Contact"}], "subtitle": "The terms on which EDR provides the EDR Freight platform and the freight services you request through it.", "lastUpdated": "6 August 2026"}', 1, NULL, '2026-08-09 18:50:22.753243+00', '2026-08-09 18:50:22.753243+00', NULL);
+
+
+--
+-- Data for Name: support_messages; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: tracking_events; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: train_checkpoint_events; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: train_composition_removal_logs; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: train_locomotives; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.train_locomotives VALUES
+	('787b33ae-8a78-4057-abc6-1e1eedf799a4', '76671a28-3517-4f04-a903-32162959d615', 'd6907984-bcfb-4408-b823-0fecc284f393', 0, '2026-08-06 06:53:26.770184+00', '2026-08-06 06:53:26.770184+00', NULL),
+	('24a720d2-1d07-40ce-90ca-6ba4f68b8593', '76671a28-3517-4f04-a903-32162959d615', 'fdbb34fd-aa8a-4f55-b32d-c5629a6ae38f', 1, '2026-08-06 06:53:26.770184+00', '2026-08-06 06:53:26.770184+00', NULL),
+	('15e6a66d-fb51-43ce-8ca4-4a835a854bb5', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 'b67b7043-d216-4392-8313-7b43452e612d', 0, '2026-08-07 07:18:16.026107+00', '2026-08-07 07:18:16.026107+00', NULL),
+	('351b4fd8-4e69-4d3c-b1a4-0b944a87c5eb', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 'a8142510-249a-491e-903f-1d05abb129f7', 1, '2026-08-07 07:18:16.026107+00', '2026-08-07 07:18:16.026107+00', NULL),
+	('68af1b56-e0f3-46ad-bd0b-8f0023bd17a2', '0da257e0-c825-4104-822b-82f27aa2c710', '87662a07-2c7b-45c5-a4ff-c89fb9bc105c', 0, '2026-08-07 07:57:18.217074+00', '2026-08-07 07:57:18.217074+00', NULL),
+	('dcfbbbc7-7e6e-44ee-a146-186a549ab97d', '0da257e0-c825-4104-822b-82f27aa2c710', 'c07ddf04-36c6-468f-a2c6-7fd2732d8782', 1, '2026-08-07 07:57:18.217074+00', '2026-08-07 07:57:18.217074+00', NULL),
+	('a6a410b0-5265-4c97-84b9-5b8597811179', '6de97a77-dbf1-4099-92ea-295416ab0d97', '1e13bf8d-d01e-4438-993d-db77ce5203eb', 0, '2026-08-07 08:41:48.883013+00', '2026-08-07 08:41:48.883013+00', NULL),
+	('8739ba65-a50e-4167-9c29-8f48f54676a3', '6de97a77-dbf1-4099-92ea-295416ab0d97', '884ec005-4ea4-4c9c-86db-7e1617faeeba', 1, '2026-08-07 08:41:48.883013+00', '2026-08-07 08:41:48.883013+00', NULL),
+	('1b35bd25-9e69-4a80-b7e7-fa6fe270127b', '7217d519-4204-43ca-aef1-3e86f3ec240b', '5eeb26b1-0631-4870-ab4f-352ac49cf8d1', 0, '2026-08-07 10:45:57.982977+00', '2026-08-07 10:45:57.982977+00', NULL),
+	('eda94226-015c-4057-bb0d-d2dfa97a1908', '7217d519-4204-43ca-aef1-3e86f3ec240b', 'a2fc8e45-ec84-4771-ae60-25d20fda25b1', 1, '2026-08-07 10:45:57.982977+00', '2026-08-07 10:45:57.982977+00', NULL),
+	('bc8d1ed3-d0b9-4968-9ece-2fa720a77d24', '1064cee0-359d-4fa6-9157-975be624f378', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0, '2026-08-07 11:20:58.845314+00', '2026-08-07 11:20:58.845314+00', NULL),
+	('90a98589-98a2-4cc6-9ab3-3a2f48d3e47d', '1064cee0-359d-4fa6-9157-975be624f378', '48a8700a-8c1f-449d-b731-bcb11fc94995', 1, '2026-08-07 11:20:58.845314+00', '2026-08-07 11:20:58.845314+00', NULL),
+	('3cd63931-27f3-4fc0-8874-263f9182cbc3', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-07 12:33:42.219594+00', '2026-08-07 12:33:42.219594+00', NULL),
+	('41957df6-5ea5-48cc-bcca-5f4af7616f0d', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-07 12:33:42.219594+00', '2026-08-07 12:33:42.219594+00', NULL),
+	('807c25ae-a6ec-4f39-9d09-215d972536b5', '2012fe72-e966-404d-a5c4-f43ac0e5a767', '22ccb1d9-adfd-4a04-bc37-a6d4bb2ee9b7', 0, '2026-08-07 13:01:06.938962+00', '2026-08-07 13:01:06.938962+00', NULL),
+	('e375299d-b6dc-495d-a466-f1b2ba7e104e', '2012fe72-e966-404d-a5c4-f43ac0e5a767', '0b48c5d6-0360-49b1-b4c9-433eb1cd1a87', 1, '2026-08-07 13:01:06.938962+00', '2026-08-07 13:01:06.938962+00', NULL),
+	('d26ec9dd-c510-47ff-aec5-55d83913bb71', '91c02bb9-0f91-46ee-9272-9eecf28734d9', '2dd03327-d9d5-4a08-af02-e59916ccea97', 0, '2026-08-07 13:38:21.83353+00', '2026-08-07 13:38:21.83353+00', NULL),
+	('3bc4fabc-e1a5-4b8f-bcf8-b25eb03822ac', '91c02bb9-0f91-46ee-9272-9eecf28734d9', '1620633d-c8ce-4130-9fb7-80edf1d86641', 1, '2026-08-07 13:38:21.83353+00', '2026-08-07 13:38:21.83353+00', NULL),
+	('8fd86c5d-f271-4cc5-b6d4-c3d16efdf0f2', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 0, '2026-08-07 13:59:31.242735+00', '2026-08-07 13:59:31.242735+00', NULL),
+	('b7a36307-8631-495d-8b63-1cafdc639ca4', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', '38874f67-9563-438d-b1bb-ed61c6aedc84', 1, '2026-08-07 13:59:31.242735+00', '2026-08-07 13:59:31.242735+00', NULL);
+
+
+--
+-- Data for Name: train_schedule_bookings; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.train_schedule_bookings VALUES
+	('94f5b7c7-5d50-45ab-ac16-78802df4cad8', '114535c3-880b-46b3-b6fc-7953a5d0de5b', '346725c9-6075-4283-a59d-c0cfb58d2e52', '2026-08-09 20:18:31.414872+00', '2026-08-09 20:18:31.414872+00', NULL, 'LOADED');
+
+
+--
+-- Data for Name: train_schedules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.train_schedules VALUES
+	('114535c3-880b-46b3-b6fc-7953a5d0de5b', '45cd3f95-b00c-42a8-812a-2c945271c44c', '7d1b9c9c-372a-41ea-8125-363163fc6351', '91c3912b-036a-4a09-b9f7-f70d0da0b717', '2026-08-09 20:18:18.791138+00', NULL, 'DISPATCHED', '2026-08-09 20:18:18.791138+00', '2026-08-09 20:18:18.791138+00', NULL, NULL, 'LMR-TEST-01', 'IMPORT', NULL, NULL, NULL, NULL, 53, 'OPEN', NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false);
+
+
+--
+-- Data for Name: train_scheduling_global_rules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.train_scheduling_global_rules VALUES
+	('e141950e-bdc7-4c2e-9069-d0a0b77379b0', 760.00, 3500.000, 53, 30.000, 10.000, '2026-07-27 11:32:00.19775+00', '2026-08-04 12:11:01.847296+00', NULL, 5, 24, 8, 0.0333, 1, 7200, 17, 120, 120, 7200);
+
+
+--
+-- Data for Name: train_set_locomotives; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.train_set_locomotives VALUES
+	('0d77437a-d010-41d2-aeff-d1f508891ab1', 'e877c44e-9292-453d-bb28-616075071bb3', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 0, '2026-07-23 07:51:41.716+00', '2026-07-23 07:51:41.716+00', NULL),
+	('957eef9a-fe23-4940-b576-fcc9043c2af7', 'e877c44e-9292-453d-bb28-616075071bb3', '38874f67-9563-438d-b1bb-ed61c6aedc84', 1, '2026-07-23 07:51:41.716+00', '2026-07-23 07:51:41.716+00', NULL),
+	('74f57812-9b0a-4be8-8e25-14837f2d3e08', '6d83b300-aa08-42bf-bcee-f0f1df37cde5', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 0, '2026-07-23 12:20:25.037+00', '2026-07-23 12:20:25.037+00', NULL),
+	('ebd7c1dc-8e8c-4029-9781-b4d45281426b', '6d83b300-aa08-42bf-bcee-f0f1df37cde5', '38874f67-9563-438d-b1bb-ed61c6aedc84', 1, '2026-07-23 12:20:25.037+00', '2026-07-23 12:20:25.037+00', NULL),
+	('803b3f85-177a-4922-a01d-360f945726a7', 'f3e40915-ff4c-4db3-9a45-ca4b2b56fce5', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0, '2026-07-23 14:51:39.728+00', '2026-07-23 14:51:39.728+00', NULL),
+	('e26e0518-e6b0-41a3-8455-acb987a950a2', 'f3e40915-ff4c-4db3-9a45-ca4b2b56fce5', '48a8700a-8c1f-449d-b731-bcb11fc94995', 1, '2026-07-23 14:51:39.728+00', '2026-07-23 14:51:39.728+00', NULL),
+	('0994a3a7-b4f8-4e5c-b2b7-df998f3c3ec5', '8476735c-01cc-44b7-9c43-d59370f26f69', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0, '2026-07-17 21:34:19.872+00', '2026-07-17 21:34:19.872+00', NULL),
+	('4ff3a2ca-612f-463d-940b-046f8c63bdbb', '8476735c-01cc-44b7-9c43-d59370f26f69', '48a8700a-8c1f-449d-b731-bcb11fc94995', 1, '2026-07-17 21:34:19.872+00', '2026-07-17 21:34:19.872+00', NULL),
+	('466526e9-547b-4f92-b994-c41a76b3dbec', '892ed0d9-60d8-4508-a33c-6e053cf7ddc2', 'b34a62e0-a4a9-4563-83d6-9e2206b74b10', 0, '2026-07-18 06:22:56.277+00', '2026-07-18 06:22:56.277+00', NULL),
+	('36ec494c-d4b2-45d9-98c3-57ba29ca5829', '892ed0d9-60d8-4508-a33c-6e053cf7ddc2', 'dddc30d3-b60a-4344-bddd-71c9ad91ddec', 1, '2026-07-18 06:22:56.277+00', '2026-07-18 06:22:56.277+00', NULL),
+	('5b8a6dff-1019-4e45-940a-c432d222dcd1', '21799060-5741-4416-81b8-0dda9e325e80', '2dd03327-d9d5-4a08-af02-e59916ccea97', 0, '2026-07-18 06:52:10.897+00', '2026-07-18 06:52:10.897+00', NULL),
+	('e4398bd8-ced8-46ac-ae54-dd280c27e3c6', '21799060-5741-4416-81b8-0dda9e325e80', '1620633d-c8ce-4130-9fb7-80edf1d86641', 1, '2026-07-18 06:52:10.897+00', '2026-07-18 06:52:10.897+00', NULL),
+	('4a055734-4d23-48ac-b814-93d6b7689ac7', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0, '2026-07-18 17:16:00.198+00', '2026-07-18 17:16:00.198+00', NULL),
+	('63ac422c-93ba-412c-bbc4-44300efdcb32', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '48a8700a-8c1f-449d-b731-bcb11fc94995', 1, '2026-07-18 17:16:00.198+00', '2026-07-18 17:16:00.198+00', NULL),
+	('01578201-72a0-4764-9b39-ea118a46e10d', 'b8827cf5-99d5-4ecf-8939-1e7ad7e660d0', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0, '2026-07-19 18:49:42.372+00', '2026-07-19 18:49:42.372+00', NULL),
+	('d57b62f4-f4e8-4e1f-b466-13d1a9ee3e34', 'b8827cf5-99d5-4ecf-8939-1e7ad7e660d0', '48a8700a-8c1f-449d-b731-bcb11fc94995', 1, '2026-07-19 18:49:42.372+00', '2026-07-19 18:49:42.372+00', NULL),
+	('c6c4c706-cfaa-4c1d-b228-9f8054ec7ba1', '83a0229a-8975-4b9b-a97f-7b3004215aef', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0, '2026-07-20 06:58:42.624+00', '2026-07-20 06:58:42.624+00', NULL),
+	('9b1d08ca-b51e-426d-a2f8-60a2ef6fdf04', '83a0229a-8975-4b9b-a97f-7b3004215aef', '48a8700a-8c1f-449d-b731-bcb11fc94995', 1, '2026-07-20 06:58:42.624+00', '2026-07-20 06:58:42.624+00', NULL),
+	('e9aaa39c-0f0a-4393-a60a-e692593d9031', 'd7604bf1-29ee-40f3-b054-b48f35b5f16f', '2dd03327-d9d5-4a08-af02-e59916ccea97', 0, '2026-07-20 11:11:12.51+00', '2026-07-20 11:11:12.51+00', NULL),
+	('293690d1-a525-47ed-a290-22ff768bcb19', 'd7604bf1-29ee-40f3-b054-b48f35b5f16f', '1620633d-c8ce-4130-9fb7-80edf1d86641', 1, '2026-07-20 11:11:12.51+00', '2026-07-20 11:11:12.51+00', NULL),
+	('5db80f65-3740-407c-9574-f3b0e9bee59f', 'fa0d99de-c596-44e0-a137-551cef7399b5', '0b48c5d6-0360-49b1-b4c9-433eb1cd1a87', 0, '2026-07-20 11:37:38.394+00', '2026-07-20 11:37:38.394+00', NULL),
+	('8cc68fe6-9558-4454-9a9a-1a5c17b91d66', 'fa0d99de-c596-44e0-a137-551cef7399b5', '22ccb1d9-adfd-4a04-bc37-a6d4bb2ee9b7', 1, '2026-07-20 11:37:38.394+00', '2026-07-20 11:37:38.394+00', NULL),
+	('9c920647-e7d2-46be-8fb4-fb8ba1723954', 'f9fdfe34-cad5-45c0-9d19-91bc0c89ebce', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-07-20 12:56:46.918+00', '2026-07-20 12:56:46.918+00', NULL),
+	('4210c90f-3d6c-46a1-8d00-ef474b414629', 'f9fdfe34-cad5-45c0-9d19-91bc0c89ebce', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-07-20 12:56:46.918+00', '2026-07-20 12:56:46.918+00', NULL),
+	('53efe324-9186-45c8-9318-7de8c60d44de', '065de839-5edb-4a08-ae6e-d1142579fd99', '5eeb26b1-0631-4870-ab4f-352ac49cf8d1', 0, '2026-07-21 05:57:50.914+00', '2026-07-21 05:57:50.914+00', NULL),
+	('65efbe29-20c5-4875-9d2f-3a1e389e2d24', '065de839-5edb-4a08-ae6e-d1142579fd99', '87662a07-2c7b-45c5-a4ff-c89fb9bc105c', 1, '2026-07-21 05:57:50.914+00', '2026-07-21 05:57:50.914+00', NULL),
+	('e572e71b-6c6d-4d57-9065-0eb0dd4e9b93', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 0, '2026-07-21 08:44:06.202+00', '2026-07-21 08:44:06.202+00', NULL),
+	('3dcd4d58-ba9b-4e96-b05f-2d2844fd9281', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '38874f67-9563-438d-b1bb-ed61c6aedc84', 1, '2026-07-21 08:44:06.202+00', '2026-07-21 08:44:06.202+00', NULL),
+	('b7e7b2c8-78c0-4022-be8f-689a59f76dec', '86f76fa6-bfc6-4c03-801c-c37e645c3010', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-07-21 13:25:30.605+00', '2026-07-21 13:25:30.605+00', NULL),
+	('fdd742af-98cc-4726-a4f5-d577126676a2', '86f76fa6-bfc6-4c03-801c-c37e645c3010', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-07-21 13:25:30.605+00', '2026-07-21 13:25:30.605+00', NULL),
+	('f777ea8b-55b1-423d-aa80-79d9da3492cb', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 0, '2026-07-22 06:29:45.056+00', '2026-07-22 06:29:45.056+00', NULL),
+	('6cbb62b3-b7c5-48ef-9eb8-5ae2ab443199', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '38874f67-9563-438d-b1bb-ed61c6aedc84', 1, '2026-07-22 06:29:45.056+00', '2026-07-22 06:29:45.056+00', NULL),
+	('6fa6f54d-512e-4ffe-9851-019648c30573', '3b753131-834f-4763-892e-a8f4a8ca837c', 'dc23c9a3-5004-4145-807e-6240b415595e', 0, '2026-07-22 07:50:00.012+00', '2026-07-22 07:50:00.012+00', NULL),
+	('cc562ae3-85de-4d88-ad48-16c607d9a4f3', '3b753131-834f-4763-892e-a8f4a8ca837c', 'c691c3cc-cfa8-4fb8-b980-ec7e53d213af', 1, '2026-07-22 07:50:00.012+00', '2026-07-22 07:50:00.012+00', NULL),
+	('e821b29e-2036-4b78-8e86-967c9ca55af4', 'dfb01a05-181d-4105-87be-d3e7d14bf31c', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0, '2026-07-22 11:01:10.338+00', '2026-07-22 11:01:10.338+00', NULL),
+	('5b5ec1e1-7bf9-4b54-949e-ac3a7123a742', 'dfb01a05-181d-4105-87be-d3e7d14bf31c', '48a8700a-8c1f-449d-b731-bcb11fc94995', 1, '2026-07-22 11:01:10.338+00', '2026-07-22 11:01:10.338+00', NULL),
+	('3dd4e15e-8748-4098-afd2-5b5d0535b0e6', '88857e3d-8002-43c2-ba69-6ef2f96f6de7', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-07-22 11:09:57.907+00', '2026-07-22 11:09:57.907+00', NULL),
+	('89c5a832-6e85-42bc-a1c9-75146bf11a68', '88857e3d-8002-43c2-ba69-6ef2f96f6de7', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-07-22 11:09:57.907+00', '2026-07-22 11:09:57.907+00', NULL),
+	('dc70701e-28a4-4e38-9ebb-b93164298a91', 'd226d18d-1a48-427b-8e51-236178d65a49', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-07-22 13:22:17.957+00', '2026-07-22 13:22:17.957+00', NULL),
+	('2bfc0999-0d50-4e7c-a13c-cff803531827', 'd226d18d-1a48-427b-8e51-236178d65a49', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-07-22 13:22:17.957+00', '2026-07-22 13:22:17.957+00', NULL),
+	('38520303-1551-4e57-a6c0-705430482cfa', '379c7434-f412-4a79-ae2d-e4740c63b49a', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 0, '2026-07-23 07:53:11.819+00', '2026-07-23 07:53:11.819+00', NULL),
+	('461add8c-aa5f-45b2-940f-cfab6adab7bd', '379c7434-f412-4a79-ae2d-e4740c63b49a', '38874f67-9563-438d-b1bb-ed61c6aedc84', 1, '2026-07-23 07:53:11.819+00', '2026-07-23 07:53:11.819+00', NULL),
+	('aaead3b5-1cef-4b67-8723-534a59dfe006', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '2dd03327-d9d5-4a08-af02-e59916ccea97', 0, '2026-08-01 07:46:34.634417+00', '2026-08-01 07:46:34.634417+00', NULL),
+	('81a9c6c9-49fc-4c97-8abd-205f8933d8d6', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '1620633d-c8ce-4130-9fb7-80edf1d86641', 1, '2026-08-01 07:46:34.634417+00', '2026-08-01 07:46:34.634417+00', NULL),
+	('5c750cec-08ce-44f7-ab9e-c09b63d75a41', '0c11098b-3d44-44f6-b90a-574e9fabfb40', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-01 08:12:08.843992+00', '2026-08-01 08:12:08.843992+00', NULL),
+	('6224b578-fa0b-4884-879c-4bc8f8af24e2', '0c11098b-3d44-44f6-b90a-574e9fabfb40', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-01 08:12:08.843992+00', '2026-08-01 08:12:08.843992+00', NULL),
+	('766af2b2-661b-4051-82d3-e20db54516e2', '6b113c6c-9f5c-4052-a61f-346a7746f641', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-01 13:03:45.741808+00', '2026-08-01 13:03:45.741808+00', NULL),
+	('415cce39-b323-4174-8731-7df51d43fc35', '6b113c6c-9f5c-4052-a61f-346a7746f641', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-01 13:03:45.741808+00', '2026-08-01 13:03:45.741808+00', NULL),
+	('e0d20803-fff8-4b6e-95e7-df999845ac35', '43be694a-48fc-4c14-8b13-cded4791ec63', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-02 11:57:57.394811+00', '2026-08-02 11:57:57.394811+00', NULL),
+	('6ddfe402-6c3e-4bf9-a693-5023670ecfa3', '43be694a-48fc-4c14-8b13-cded4791ec63', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-02 11:57:57.394811+00', '2026-08-02 11:57:57.394811+00', NULL),
+	('aeb18625-d90b-4fa4-973f-aff3fa879977', '13a077a6-56e8-4fc1-997c-342787f814bd', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-04 06:58:42.499476+00', '2026-08-04 06:58:42.499476+00', NULL),
+	('1d060340-5233-4a16-ad23-c9ce92c5e7e7', '13a077a6-56e8-4fc1-997c-342787f814bd', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-04 06:58:42.499476+00', '2026-08-04 06:58:42.499476+00', NULL),
+	('6328e10c-356c-47e2-8f39-e3e5a2fc3c99', 'ba774692-e3be-4107-a1e6-6a497950d371', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-04 11:28:19.986023+00', '2026-08-04 11:28:19.986023+00', NULL),
+	('eee7914b-712f-491b-8be7-9c8c069f6562', 'ba774692-e3be-4107-a1e6-6a497950d371', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-04 11:28:19.986023+00', '2026-08-04 11:28:19.986023+00', NULL),
+	('39302f74-ce16-4d01-8db5-938a4c8801c4', '37a3cdde-377c-4cbf-ae1f-9571034024e2', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-04 12:12:58.232085+00', '2026-08-04 12:12:58.232085+00', NULL),
+	('04a44acf-9ec9-47a9-b9a1-1a3b1ae4ea9c', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-04 12:12:58.232085+00', '2026-08-04 12:12:58.232085+00', NULL),
+	('2d441e84-b77f-4873-aa30-2e6163fe9681', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', 'ca503969-35b6-40d4-8787-690fd8715dda', 0, '2026-08-05 11:18:48.962975+00', '2026-08-05 11:18:48.962975+00', NULL),
+	('191e632f-9913-4882-adfb-d0f364dff45d', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '028d9ac6-7a2f-42c7-9168-6165afacc3ab', 1, '2026-08-05 11:18:48.962975+00', '2026-08-05 11:18:48.962975+00', NULL),
+	('ce30c7ca-78f7-4514-95d4-7848a23260f2', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', 'd6907984-bcfb-4408-b823-0fecc284f393', 0, '2026-08-06 07:07:10.980795+00', '2026-08-06 07:07:10.980795+00', NULL),
+	('52007832-9eb0-4e40-921c-73cbc2721a79', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', 'fdbb34fd-aa8a-4f55-b32d-c5629a6ae38f', 1, '2026-08-06 07:07:10.980795+00', '2026-08-06 07:07:10.980795+00', NULL),
+	('7b11ea70-351e-42b0-a3d9-9b85e602b59d', '7e076f85-0f80-4edc-9787-01129e2e46c4', 'd6907984-bcfb-4408-b823-0fecc284f393', 0, '2026-08-06 07:09:19.925174+00', '2026-08-06 07:09:19.925174+00', NULL),
+	('7ca99bc4-495a-46c5-bd37-1140b44c0371', '7e076f85-0f80-4edc-9787-01129e2e46c4', 'fdbb34fd-aa8a-4f55-b32d-c5629a6ae38f', 1, '2026-08-06 07:09:19.925174+00', '2026-08-06 07:09:19.925174+00', NULL),
+	('488b0054-ba1b-439a-8d87-ca988f1e365f', '45cd3f95-b00c-42a8-812a-2c945271c44c', 'b67b7043-d216-4392-8313-7b43452e612d', 0, '2026-08-07 07:54:42.670851+00', '2026-08-07 07:54:42.670851+00', NULL),
+	('eab28041-e8a6-42f4-8c77-42e5883b1de8', '45cd3f95-b00c-42a8-812a-2c945271c44c', 'a8142510-249a-491e-903f-1d05abb129f7', 1, '2026-08-07 07:54:42.670851+00', '2026-08-07 07:54:42.670851+00', NULL),
+	('6deb5158-8852-4a65-87c9-34d8e18f7a24', '6838d0a3-66da-434e-8ba1-3597e3948006', '87662a07-2c7b-45c5-a4ff-c89fb9bc105c', 0, '2026-08-07 07:59:41.542479+00', '2026-08-07 07:59:41.542479+00', NULL),
+	('c6642f82-b581-451b-b712-22cf138cdbed', '6838d0a3-66da-434e-8ba1-3597e3948006', 'c07ddf04-36c6-468f-a2c6-7fd2732d8782', 1, '2026-08-07 07:59:41.542479+00', '2026-08-07 07:59:41.542479+00', NULL),
+	('89373e2d-3778-448f-9254-2473b080b5c0', 'bd5ba4e0-ab2b-48d3-acd4-79dc73336793', 'd6907984-bcfb-4408-b823-0fecc284f393', 0, '2026-08-07 08:01:06.455736+00', '2026-08-07 08:01:06.455736+00', NULL),
+	('80ad6bc7-dd39-403a-a773-fda5a5f4962e', 'bd5ba4e0-ab2b-48d3-acd4-79dc73336793', 'fdbb34fd-aa8a-4f55-b32d-c5629a6ae38f', 1, '2026-08-07 08:01:06.455736+00', '2026-08-07 08:01:06.455736+00', NULL),
+	('93019860-a7ad-4cf1-960b-3546f216c543', '7ae66722-c16f-43a2-aa0c-1c28c1c81898', 'd6907984-bcfb-4408-b823-0fecc284f393', 0, '2026-08-07 08:01:31.382496+00', '2026-08-07 08:01:31.382496+00', NULL),
+	('3815bf87-c34c-43f7-af76-9aa03661e30d', '7ae66722-c16f-43a2-aa0c-1c28c1c81898', 'fdbb34fd-aa8a-4f55-b32d-c5629a6ae38f', 1, '2026-08-07 08:01:31.382496+00', '2026-08-07 08:01:31.382496+00', NULL),
+	('f0cc5d2a-1829-4919-91d6-ced622637388', '62a426ca-52e7-4359-8a43-a8ac038638db', 'd6907984-bcfb-4408-b823-0fecc284f393', 0, '2026-08-07 08:02:18.250869+00', '2026-08-07 08:02:18.250869+00', NULL),
+	('070bb1fa-8676-4737-a2ca-43ffea3fb06d', '62a426ca-52e7-4359-8a43-a8ac038638db', 'fdbb34fd-aa8a-4f55-b32d-c5629a6ae38f', 1, '2026-08-07 08:02:18.250869+00', '2026-08-07 08:02:18.250869+00', NULL);
+
+
+--
+-- Data for Name: train_set_wagons; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.train_set_wagons VALUES
+	('67a7f36f-1f82-4aca-9335-4c0b814d3a69', '892ed0d9-60d8-4508-a33c-6e053cf7ddc2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 28.000, '2026-07-18 06:34:32.389+00', '2026-07-18 06:34:32.389+00', NULL, '746dfb2c-9cc1-4475-b110-bd0d5efa31b8', 'RESERVED', NULL, NULL),
+	('4130fd03-d4ea-47f1-bf4d-0e4d3a229faa', 'e877c44e-9292-453d-bb28-616075071bb3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 21.000, '2026-07-23 09:13:32.47+00', '2026-07-23 09:13:32.47+00', NULL, 'ded1f6e9-8498-44b7-8d2d-ec56febc4b90', 'RESERVED', NULL, NULL),
+	('02559453-f816-4f88-8a94-a8809d40e953', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '8ecb831d-4d07-4c56-b46c-d8fb7aff20d2', 'RESERVED', NULL, NULL),
+	('b4d35e23-7046-4b53-835e-f60f47a93c9c', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'f8e2efe7-8f72-4ced-9485-760f7e16b816', 'RESERVED', NULL, NULL),
+	('49ea2dcd-b532-45f1-b9f6-f6198f261ace', 'f9fdfe34-cad5-45c0-9d19-91bc0c89ebce', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 28.000, '2026-07-20 13:13:15.741+00', '2026-07-20 13:13:15.741+00', NULL, '72122c32-6b76-4881-aa5d-d9cdf2b787e1', 'RESERVED', NULL, NULL),
+	('9f2fba91-01c9-4761-8dda-71da8b7f4d98', 'f9fdfe34-cad5-45c0-9d19-91bc0c89ebce', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 29.000, '2026-07-20 13:13:15.741+00', '2026-07-20 13:13:15.741+00', NULL, '49bfa4cc-5644-4ef3-b121-27ccea8d80b1', 'RESERVED', NULL, NULL),
+	('288365be-18f9-4e12-bcab-31dfc4b0fbc1', '379c7434-f412-4a79-ae2d-e4740c63b49a', '8eec3a7d-8482-4397-96b6-59a028210722', 1, 70.000, 17.066, 70.000, '2026-07-23 09:23:37.952+00', '2026-07-23 09:23:37.952+00', NULL, '5157d855-6ff4-4d76-93e8-3ed09005f07a', 'RESERVED', NULL, NULL),
+	('2eef66b6-ad35-402d-b3a9-2fa2626d4d2f', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 21.610, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'c00f78c4-e526-4272-953d-4d8c62c464ac', 'RESERVED', NULL, NULL),
+	('6fc68a29-f52f-4953-8bf1-3b536f215550', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 19.660, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'f6463fb1-5e59-4eab-a3e5-dfb2ba9f51e0', 'RESERVED', NULL, NULL),
+	('e4e8dde9-66fb-4c50-b02a-75d425d0a85f', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 18.860, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'c9f2906d-4e11-464f-922a-1b37bc95de15', 'RESERVED', NULL, NULL),
+	('2c4d9694-4ee5-4126-9830-2414186df13d', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 24.210, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '72122c32-6b76-4881-aa5d-d9cdf2b787e1', 'RESERVED', NULL, NULL),
+	('2883ad7f-46c2-4af7-823a-4de450a3ea87', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 26.590, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '49bfa4cc-5644-4ef3-b121-27ccea8d80b1', 'RESERVED', NULL, NULL),
+	('75965127-17e5-4aba-9044-0cb83d23e2e5', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 25.160, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '273d5cdf-193f-494e-927a-f30e2e800ee3', 'RESERVED', NULL, NULL),
+	('ab6ca4cf-454e-4a9b-b247-efe5edd7f1ba', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 20.300, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '8de9ad3b-fae0-499a-98ef-e5d5d2ee41d8', 'RESERVED', NULL, NULL),
+	('1991500d-4645-4217-9165-ac00144a97e0', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 20.260, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'b034a5f5-8eff-4f31-bf89-945d920749fe', 'RESERVED', NULL, NULL),
+	('565f8eef-c8b8-4e9e-b198-70ade7b1969a', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 22.790, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'd3779672-5f85-4a03-a437-7ef6ec2097b2', 'RESERVED', NULL, NULL),
+	('58981af8-7aa8-4f6a-88df-6d6785157a8f', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 25.320, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'dcf8af0b-b95e-4e95-8d8e-75be6a3ea769', 'RESERVED', NULL, NULL),
+	('59101b61-ee47-4b48-8b08-c7ad7ac639e7', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 24.560, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '85e05351-b076-4121-b7b1-e07863f69f31', 'RESERVED', NULL, NULL),
+	('553782cd-f0a1-4101-a8ec-9e5bceab1aef', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 21.810, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '5424c729-723a-4606-9d2d-b73f2ba27b31', 'RESERVED', NULL, NULL),
+	('2607c437-2e0a-4b51-a8b1-7e67a904e9df', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 26.460, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '6ade91c0-d616-4ae3-b7c1-7f7cb2686961', 'RESERVED', NULL, NULL),
+	('c4447949-5311-4280-be63-c03995e0c8be', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 27.240, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'f5bf1b94-6dc1-4be2-89a5-538cc18f919a', 'RESERVED', NULL, NULL),
+	('7fe8888e-10eb-4c9a-b3e8-c4022af6703f', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 28.290, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'afda74c6-be11-4edc-9c1e-e35a597508df', 'RESERVED', NULL, NULL),
+	('bfc1bfe5-9938-40d9-912a-2b3c9700a5f4', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 25.680, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '0aff5aa8-c79f-4367-bfa3-10aedde7f1fb', 'RESERVED', NULL, NULL),
+	('ce9608d4-db32-4f4e-8408-5a9acadac705', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 22.510, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '8bd92ab9-9765-4eb7-a01a-6574097530fb', 'RESERVED', NULL, NULL),
+	('b684b709-2ff0-452b-8b2c-6194da5d1a7c', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 25.820, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'fd916ab4-21c6-4da8-b35f-8205eab50337', 'RESERVED', NULL, NULL),
+	('9e67ef89-ca0d-498b-a57b-14598a5a3640', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 21.270, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'a116907e-a06e-46f7-8d8e-3c0ab2e830b5', 'RESERVED', NULL, NULL),
+	('5de13b2b-2ad9-4b33-8f6a-367e096e9261', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 29.680, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'd599be9b-e15a-44f8-8f1a-b2fe1acf79a0', 'RESERVED', NULL, NULL),
+	('2faac3fb-ea98-4761-b494-9b579ecebed5', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 21, 70.000, 13.966, 28.020, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '46642c3a-54bc-4c89-b02e-e970ea9a03c1', 'RESERVED', NULL, NULL),
+	('c477ae00-635a-4c8e-bc06-3e59fe1601ca', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 22, 70.000, 13.966, 18.860, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'd33cc5dc-ca2d-4621-a641-15ec8bd2b762', 'RESERVED', NULL, NULL),
+	('e989e03d-da08-4570-98a9-4c5927d5824a', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 23, 70.000, 13.966, 19.250, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'dfb83a01-311b-449f-a1ec-c44ee5c9a581', 'RESERVED', NULL, NULL),
+	('c5b7bbf9-945f-4bfe-b41d-b75522f67600', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 24, 70.000, 13.966, 24.140, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '944af82a-1903-4a6e-a557-c939a1b64336', 'RESERVED', NULL, NULL),
+	('cb1f9c6c-f736-4579-8c99-33ca5235bd47', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 25, 70.000, 13.966, 20.080, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '61ca1aac-1a39-4192-99aa-4d00e3ea0bf4', 'RESERVED', NULL, NULL),
+	('d6b45f75-2a72-41f1-b780-7b55e6ac6115', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 26, 70.000, 13.966, 23.340, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '6224eb5f-d4f9-4c65-874c-47422057f597', 'RESERVED', NULL, NULL),
+	('bd3d6f64-c286-44c5-9340-2648059ba281', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 27, 70.000, 13.966, 29.250, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'db06d53b-b72b-44d5-9450-2fe197b21a6e', 'RESERVED', NULL, NULL),
+	('61ec87c3-e432-405d-9b55-dd2d47fbf7b6', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 28, 70.000, 13.966, 25.520, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '45779010-d372-4e43-8c95-9fb536fed71a', 'RESERVED', NULL, NULL),
+	('fcc5061a-31f6-4a6b-9c1f-f75f4fdc25ad', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 29, 70.000, 13.966, 24.690, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '4bd640e4-7537-4322-8933-76ded3507e67', 'RESERVED', NULL, NULL),
+	('eb50b779-c205-4c0c-aba0-df17730f9846', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 30, 70.000, 13.966, 25.130, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '9c7d4932-5e79-4e22-a641-d5a814379b00', 'RESERVED', NULL, NULL),
+	('a3eb7cb4-6a4e-4ad0-baeb-8a3870b56d3d', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 31, 70.000, 13.966, 19.410, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'd200843a-fe67-4e5f-994f-63c45d65efd4', 'RESERVED', NULL, NULL),
+	('74d0f67c-9a62-4762-912c-065386cac6b0', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 32, 70.000, 13.966, 23.580, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '33d00826-3a41-40f2-8ae0-002686a8e3e8', 'RESERVED', NULL, NULL),
+	('4960e5b3-18ab-4829-9e5a-5e775fe96bdf', '379c7434-f412-4a79-ae2d-e4740c63b49a', '8eec3a7d-8482-4397-96b6-59a028210722', 2, 70.000, 17.066, 70.000, '2026-07-23 09:23:37.952+00', '2026-07-23 09:23:37.952+00', NULL, '0eaa23e0-287c-4f08-b867-fc4069756e15', 'RESERVED', NULL, NULL),
+	('78c13305-448e-4b87-b65c-fd99b9fbbd9e', '379c7434-f412-4a79-ae2d-e4740c63b49a', '8eec3a7d-8482-4397-96b6-59a028210722', 3, 70.000, 17.066, 70.000, '2026-07-23 09:23:37.952+00', '2026-07-23 09:23:37.952+00', NULL, '5f35aef5-9f2d-40d6-ad7c-6e5ff4fe3963', 'RESERVED', NULL, NULL),
+	('f717bff8-84ae-49e5-9297-d20a09ab77bc', '379c7434-f412-4a79-ae2d-e4740c63b49a', '8eec3a7d-8482-4397-96b6-59a028210722', 4, 70.000, 17.066, 70.000, '2026-07-23 09:23:37.952+00', '2026-07-23 09:23:37.952+00', NULL, '5b7b8423-d211-4538-96a8-8cf5cebe9974', 'RESERVED', NULL, NULL),
+	('2a56a252-1abe-4452-9b98-683433d97547', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 33, 70.000, 13.966, 20.880, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '8289cbc1-7dff-4288-a9a5-18a8929d8d2b', 'RESERVED', NULL, NULL),
+	('7f7bed5f-739d-4376-ab5a-dfc726f4125f', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 34, 70.000, 13.966, 27.600, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '0377dd35-bc94-4fea-9e02-9600e433e5ab', 'RESERVED', NULL, NULL),
+	('1d1cc736-ca00-49a4-a38a-ba9c4a5c7d5c', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 35, 70.000, 13.966, 26.670, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '501a9fd6-16bb-4bb8-8031-9b9bcb95ae08', 'RESERVED', NULL, NULL),
+	('e3cedb88-0441-48ad-99f6-b89d890ae083', '21799060-5741-4416-81b8-0dda9e325e80', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 45.000, '2026-07-20 06:40:00.499+00', '2026-07-20 06:40:00.499+00', NULL, 'b150fcda-ed35-4c2a-829e-6f5da2447b94', 'RESERVED', NULL, NULL),
+	('7d9c168a-4ad3-461a-b8ed-aacc730cbed6', '21799060-5741-4416-81b8-0dda9e325e80', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 28.000, '2026-07-20 06:40:00.499+00', '2026-07-20 06:40:00.499+00', NULL, '5daa57bd-10ee-4e5f-a73a-45357b43e0a8', 'RESERVED', NULL, NULL),
+	('00884609-6671-4f28-8ac6-60c793f3673c', '21799060-5741-4416-81b8-0dda9e325e80', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 28.000, '2026-07-20 06:40:00.499+00', '2026-07-20 06:40:00.499+00', NULL, 'b9e70323-4d3c-4d85-b37a-51408b20daef', 'RESERVED', NULL, NULL),
+	('54507d24-a390-49cd-b854-9f69a7fd50da', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'be750157-c923-4ac9-88b8-7c3e75644fcc', 'RESERVED', NULL, NULL),
+	('e06942f6-3d65-4d90-a57d-38cc47e6e5c3', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '700477c2-4c6c-4f81-8c5b-a7589c83704b', 'RESERVED', NULL, NULL),
+	('f34ca34e-ea5a-4f06-aa89-3c9c6d55e602', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '5cadc015-35dc-4f13-a1df-35bef3acd35f', 'RESERVED', NULL, NULL),
+	('604f9c70-9136-4c67-87e3-72960da0a6cc', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '27398588-df37-4408-bcec-69b408be2b4c', 'RESERVED', NULL, NULL),
+	('7857abfa-6374-4edc-a232-f06f7c711307', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '951904eb-60a6-44dd-aada-4be40146f2a0', 'RESERVED', NULL, NULL),
+	('205153be-fea5-4ad3-a524-a1c51de84502', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'f1197f64-5ed6-4ed7-8d5b-27ca631a3c56', 'RESERVED', NULL, NULL),
+	('e6c19331-8aba-4dee-9794-1af8bfe3eb93', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'cb4ec20c-14b5-49ae-b757-a213b5dd9fb5', 'RESERVED', NULL, NULL),
+	('7d586c5b-729c-4df6-872c-82aef5860f21', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'abb8d3c8-6456-4849-a046-abeed0d3892c', 'RESERVED', NULL, NULL),
+	('4f975f1a-a913-424d-9b21-d99473c94edd', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '40e42fd9-8f27-4ed8-b73b-57cb790907e9', 'RESERVED', NULL, NULL),
+	('cff19caf-044f-4b2e-8376-46084a7048a6', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '6b8f2e94-dc78-49c7-9c8b-b304a7946649', 'RESERVED', NULL, NULL),
+	('3a5c0a4e-cf01-4a8b-bd32-d8c6e181adab', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'b8dfa5f4-2e86-4e8c-a155-5d0f50809c1c', 'RESERVED', NULL, NULL),
+	('91fc5586-9de4-48ca-82a3-bdcedd06ce5d', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '0fd9c907-d37b-4538-99a7-819da34072c5', 'RESERVED', NULL, NULL),
+	('ee0f9ba7-02b4-486f-8f04-b63eec09dbb5', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 56.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '943ff7f7-7b0e-4488-86c0-b4426bf1abba', 'RESERVED', NULL, NULL),
+	('825eda47-1163-4eb2-99cb-27bd8ef3e39d', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 25.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'ea41d963-cd4e-4e62-b4c9-c4f0411f9131', 'RESERVED', NULL, NULL),
+	('d7316eda-b62b-452c-983e-cf82a4cbf99a', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '69df25fe-ef7e-452f-8439-92757bb98b7e', 'RESERVED', NULL, NULL),
+	('452c7bdd-d7cd-411c-b330-5dc939635662', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '875974ae-ee69-45ef-a951-b70a7ecda661', 'RESERVED', NULL, NULL),
+	('a0959f6e-53aa-4f7f-b798-350d2eccd95e', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '194b9a33-c4b6-4cec-a2ac-4c7dab9023df', 'RESERVED', NULL, NULL),
+	('9ce12be0-5e8f-4efb-96d9-7aaa125e95d2', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '77164c29-1535-421a-bb0f-e61295ec7966', 'RESERVED', NULL, NULL),
+	('92682bb2-7f2c-4a54-b4ff-5b932bd450ec', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 21, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'da9c8cca-10db-4aca-8cd3-c883a402f5c6', 'RESERVED', NULL, NULL),
+	('483c6959-8d5a-40ab-9b68-bf4d01f81e79', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 22, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'd84a87c7-285c-43b0-928f-f18adf312557', 'RESERVED', NULL, NULL),
+	('20f92263-cdf1-4157-b350-fee54708efbb', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 23, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '45e0a7d8-cf56-43a4-977b-869ab6a1d6a8', 'RESERVED', NULL, NULL),
+	('bb161cd5-4159-4f04-808b-e38f31a6fa33', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 24, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '1f9aa084-2778-4973-829d-68ca27665b3d', 'RESERVED', NULL, NULL),
+	('f81a7fd4-15db-47cc-a5bd-afc0b02605ac', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 25, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '9384462b-53ed-4db9-9267-87ba35af3454', 'RESERVED', NULL, NULL),
+	('defcf90e-e1a4-41ec-a50f-ea8ce54082e4', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 26, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '2b37d9aa-ca9f-4384-8b69-2bb9d71c2bb8', 'RESERVED', NULL, NULL),
+	('f6c82c8d-74c0-49b2-89d0-444fe4fde8d3', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 43, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '6418abb5-3057-45c3-ae8e-131dc5ca944b', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('aabafad2-8347-4da6-ad43-789dde9917b6', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 27, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '52278b48-c882-4a34-96a8-d937592a2cd8', 'RESERVED', NULL, NULL),
+	('6b1d7059-c491-4ad8-8eed-4c7df627fc4c', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 28, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '6f2ade5d-c8c0-4bba-9cf6-e813ecf5eb8e', 'RESERVED', NULL, NULL),
+	('0ead934f-bce9-4dca-a1b9-7a778021cb86', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 29, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'af828445-a3ab-4bae-8f8c-d23d1f88b247', 'RESERVED', NULL, NULL),
+	('5e5066d1-409e-413e-8673-c7d57d785f09', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 30, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '2d6b5c20-d9c0-435d-821b-56ac5e4de522', 'RESERVED', NULL, NULL),
+	('519b29ab-f170-476b-965d-7f9e1c6b0300', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 31, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'ed0fe2bf-e386-4dec-ba8e-d9f5d783df42', 'RESERVED', NULL, NULL),
+	('d06255b4-e9bc-4736-8c0d-3f189bbea666', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 32, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '0c63898a-3b42-48c2-a8fa-f777e2d6a28e', 'RESERVED', NULL, NULL),
+	('e6365226-c2c3-4d57-8853-dc27d7be8e45', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 33, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '33235c6c-5314-4adf-a369-0df725e50196', 'RESERVED', NULL, NULL),
+	('ae683d3c-4e32-4613-8399-e361ddaa4c17', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 34, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'c66f251f-9119-442c-a4d4-360ccf8c8c20', 'RESERVED', NULL, NULL),
+	('5225ebde-15e2-4fa4-a85d-66dc8ef427c0', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 35, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'fcef533e-028d-4f87-b236-6913a6e34343', 'RESERVED', NULL, NULL),
+	('8040d8b7-2cb1-4232-aee8-931b0e47adcd', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 36, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'daaaaf4a-6a25-4a5f-98f2-964d7b7baa73', 'RESERVED', NULL, NULL),
+	('dbbc2ce2-5486-432e-8aab-b20c94114bcd', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 37, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'd6baf04f-9f9d-4d0f-92d0-8e11c5e564ec', 'RESERVED', NULL, NULL),
+	('45efdbf9-78f4-410c-ad03-b13640c0e4b3', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 38, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '796c99be-a661-4116-a577-a0110841dc73', 'RESERVED', NULL, NULL),
+	('d90abf88-df7e-48ff-9198-01db740d739a', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 39, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '838e35b4-2942-4315-9d47-585784f18ba2', 'RESERVED', NULL, NULL),
+	('4eb4fe6c-4dde-4e24-886a-26e1a15c4f03', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 40, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'eddf627c-d875-4ffb-8a21-3f8998958b94', 'RESERVED', NULL, NULL),
+	('772f4c48-4067-45a0-9d5f-dc378f1d8dc0', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 41, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '13670cc8-ba75-4c2d-8061-c6c9d46ea4e9', 'RESERVED', NULL, NULL),
+	('59c2dbec-58e4-4f0c-a6a6-d60f3668c598', 'd7604bf1-29ee-40f3-b054-b48f35b5f16f', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 43.000, '2026-07-21 06:58:17.167+00', '2026-07-21 06:58:17.167+00', NULL, 'b150fcda-ed35-4c2a-829e-6f5da2447b94', 'RESERVED', NULL, NULL),
+	('2ac68acd-32b8-4d3e-ab72-5b8f1a7335bb', 'd7604bf1-29ee-40f3-b054-b48f35b5f16f', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 21.000, '2026-07-21 06:58:17.167+00', '2026-07-21 06:58:17.167+00', NULL, '5daa57bd-10ee-4e5f-a73a-45357b43e0a8', 'RESERVED', NULL, NULL),
+	('7654c1a4-4e43-4868-8137-05bcac31f6ae', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 42, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '51f43037-daaf-4478-b355-c23c17555dc3', 'RESERVED', NULL, NULL),
+	('a70cd5b0-8a0c-4827-97f0-1bacef8cef5a', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 43, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, 'ba1ba21f-f437-4626-bdad-a6466e5bd1a3', 'RESERVED', NULL, NULL),
+	('41d4d3bd-b866-4265-84d2-868ccc8e9d07', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 44, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '274df441-ac91-444a-a9e7-18c5332157a4', 'RESERVED', NULL, NULL),
+	('65b153d3-ba9f-4936-ac91-06525a7b8271', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 45, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '24404f54-03b6-45ec-9cbe-227447b92976', 'RESERVED', NULL, NULL),
+	('8ac0fe16-f7da-474f-9fc9-94545b37a138', '7b9d83fc-957d-4aed-85a2-7e9b5db111c3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 46, 70.000, 13.966, 28.000, '2026-07-21 12:26:30.644+00', '2026-07-21 12:26:30.644+00', NULL, '83cd6274-9dda-44fc-9324-c87c5e81b676', 'RESERVED', NULL, NULL),
+	('0dbec353-bb4d-4d6c-8677-670e7efaa894', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 36, 70.000, 13.966, 21.800, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'f73b25d9-6b6a-4d53-8033-0d36bd288f66', 'RESERVED', NULL, NULL),
+	('8bc0b394-22b6-4ac9-9fc5-096f2aeb35ac', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 37, 70.000, 13.966, 26.450, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '0dc6cc71-04e7-465e-a0f5-b227e6b0e3cc', 'RESERVED', NULL, NULL),
+	('79aa58c7-705e-495c-bb8f-7740e67d87c8', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 38, 70.000, 13.966, 28.080, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'cda2bb61-9145-488f-9525-ef4f751844d2', 'RESERVED', NULL, NULL),
+	('76ffeef0-b9fd-475a-8cf8-3c11fe53a258', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 39, 70.000, 13.966, 23.270, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '63d8f50e-43a0-4a6f-b0ce-93a5446fe747', 'RESERVED', NULL, NULL),
+	('0ca36721-e6f3-479a-8c14-536664de3f6b', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 40, 70.000, 13.966, 24.130, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '4d7aac68-33ef-40eb-be71-b82123419fa0', 'RESERVED', NULL, NULL),
+	('2233af2f-0341-49d1-ba1c-5d9691bafa97', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 41, 70.000, 13.966, 27.570, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '3ecc5c70-2441-476c-b0bb-2737d0f09ef3', 'RESERVED', NULL, NULL),
+	('d3fa560f-f726-4803-8376-ca16e2c1b164', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 42, 70.000, 13.966, 28.860, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'cc7cc87f-4bad-4d1a-9beb-a636663c128e', 'RESERVED', NULL, NULL),
+	('6e09952e-acf1-44ff-9268-4a8b67bdd8de', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 43, 70.000, 13.966, 24.870, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '711ccac0-5db6-4a40-87d8-fcd32a2b3acf', 'RESERVED', NULL, NULL),
+	('5d1d2840-c1eb-4599-802a-dd48ab0a8fd8', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 44, 70.000, 13.966, 27.600, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'af381508-3230-46fa-83ff-3f475f10f587', 'RESERVED', NULL, NULL),
+	('ae72c2ad-0770-4253-99bc-5ddee4ce3698', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 45, 70.000, 13.966, 19.960, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '48be7d38-c265-47d1-ba04-2a3bb6bc116f', 'RESERVED', NULL, NULL),
+	('60e6a0b7-05cc-4dd3-a161-398fc2f4dbad', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 46, 70.000, 13.966, 28.520, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '01908c99-7431-4e1d-811a-40826c16665d', 'RESERVED', NULL, NULL),
+	('5da7a396-f72c-4d87-90fc-dc299afe7a06', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 47, 70.000, 13.966, 23.350, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'e9ca94f1-c922-4ca7-bf4e-751020ffb45f', 'RESERVED', NULL, NULL),
+	('a1b6df3f-8449-4579-96ec-50cace0a87e5', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 48, 70.000, 13.966, 28.100, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, 'cda7dc57-2622-482d-84a4-df22f6063e3c', 'RESERVED', NULL, NULL),
+	('87c7f388-8331-4284-a85d-0449e1864155', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 49, 70.000, 13.966, 23.660, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '408b14c4-0660-4004-8beb-e0859debac28', 'RESERVED', NULL, NULL),
+	('36c2eca8-75bd-49d5-a911-cd5274e1e586', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 50, 70.000, 13.966, 21.340, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '6c5d7287-7744-4336-899d-de15ef5ee98e', 'RESERVED', NULL, NULL),
+	('5c292a88-8f8b-47b5-9733-f49afe4f80b3', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 1, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '5157d855-6ff4-4d76-93e8-3ed09005f07a', 'RESERVED', NULL, NULL),
+	('3523b2d1-397b-4f3c-97bf-53444c37dab1', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 2, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '0eaa23e0-287c-4f08-b867-fc4069756e15', 'RESERVED', NULL, NULL),
+	('b4012900-9b8f-40f4-8dc9-deb99ee3ea6c', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 3, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '5f35aef5-9f2d-40d6-ad7c-6e5ff4fe3963', 'RESERVED', NULL, NULL),
+	('a1d156fe-f36d-4637-827b-92e89f61167d', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 4, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '5b7b8423-d211-4538-96a8-8cf5cebe9974', 'RESERVED', NULL, NULL),
+	('0c01b6d8-bf6b-407c-8ac3-262e38042ba2', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 5, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '3e79907b-c2d3-41ab-80fc-e315abeae8af', 'RESERVED', NULL, NULL),
+	('387f1b63-d278-4029-bb5c-415518ed3d93', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 6, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'd40c1816-be56-4a13-8c52-a436ac20c8ab', 'RESERVED', NULL, NULL),
+	('cd2525e1-2751-4568-8880-3a03fe24096a', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 7, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '54ce9794-8949-424b-b2da-2ce1117f64d5', 'RESERVED', NULL, NULL),
+	('a32b3e64-107c-4c1e-b0e2-aebf6aa71678', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 8, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '41cef115-d5ce-4e37-a824-d356c9fe2a65', 'RESERVED', NULL, NULL),
+	('a98d57d4-5bdd-44e3-8b8e-c410441fa6d5', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 9, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '1ffe2c11-525c-4f4b-b510-986a976e4f66', 'RESERVED', NULL, NULL),
+	('3eaca077-1808-4654-8d6e-6c89ab82abdd', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 10, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'afc8372e-f69a-471e-b670-faf8ae208f9d', 'RESERVED', NULL, NULL),
+	('d48d0279-b24c-4c75-9396-3328b527c548', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 11, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '05801372-7f9e-4362-b55a-bae1f666eec2', 'RESERVED', NULL, NULL),
+	('4b8a87dd-c1c6-4a9f-a4ed-c06e686bcac9', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 12, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '5a8ef4df-c9e4-46e7-870b-8d991d92399c', 'RESERVED', NULL, NULL),
+	('9eafa736-e099-472e-b5ff-7a97d76c9a30', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 13, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'f7c19cb3-2ed8-4889-b528-2e2533502e1f', 'RESERVED', NULL, NULL),
+	('5bcedd28-d99d-4bdb-bc0a-41d68caeefa0', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 14, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'd040c962-0654-4728-9193-1130c88e4a62', 'RESERVED', NULL, NULL),
+	('576256e9-94de-4b81-bf19-9359e68bc437', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 15, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'b9d8a7f8-bc43-49aa-b3a6-0318b46e2910', 'RESERVED', NULL, NULL),
+	('668e573f-a4e4-4ff7-ba92-ed4c441c3845', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 16, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'f0848a37-c4d9-4d1f-bf4f-96cb5c9de452', 'RESERVED', NULL, NULL),
+	('62f62c24-b052-44d3-8afb-0f1a4339c663', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 17, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'c88396c0-3bed-4aff-a848-7f82f70b932f', 'RESERVED', NULL, NULL),
+	('f1b20293-6545-46c2-ba61-e4785cbc8ba6', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 18, 70.000, 17.066, 70.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, '1d3eada0-d635-4cce-8162-37ab335875d1', 'RESERVED', NULL, NULL),
+	('b5b5db51-642f-4bf8-bcfd-5c719e5465a6', 'f13ddc61-ec01-4991-bb1a-b8b525e2764e', '8eec3a7d-8482-4397-96b6-59a028210722', 19, 70.000, 17.066, 35.000, '2026-07-22 08:37:23.092+00', '2026-07-22 08:37:23.092+00', NULL, 'cf954164-7b60-4ec6-9b19-ffcd8349e73a', 'RESERVED', NULL, NULL),
+	('6353276f-e674-4c12-ade0-032cf6d86d83', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 51, 70.000, 13.966, 24.690, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '5c059ddf-a486-414a-81cf-aeb384ef7323', 'RESERVED', NULL, NULL),
+	('7a909384-8c37-4d19-8cb3-5884039621d1', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 52, 70.000, 13.966, 27.600, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '24125da0-7132-4b76-9bd5-cf6d7504bb8f', 'RESERVED', NULL, NULL),
+	('0627f1b2-0106-4d0e-b3f4-ad08dfad6870', 'd226d18d-1a48-427b-8e51-236178d65a49', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 53, 70.000, 13.966, 21.830, '2026-07-22 13:39:48.902+00', '2026-07-22 13:39:48.902+00', NULL, '4f2742fd-8f95-46d7-8b0b-cd6a451e4214', 'RESERVED', NULL, NULL),
+	('5008e2a1-3868-45b7-a35f-ffa44fea4272', '379c7434-f412-4a79-ae2d-e4740c63b49a', '8eec3a7d-8482-4397-96b6-59a028210722', 5, 70.000, 17.066, 70.000, '2026-07-23 09:23:37.952+00', '2026-07-23 09:23:37.952+00', NULL, '3e79907b-c2d3-41ab-80fc-e315abeae8af', 'RESERVED', NULL, NULL),
+	('d9842f8c-c31d-4de6-bb44-fc3280cdcdd3', '379c7434-f412-4a79-ae2d-e4740c63b49a', '8eec3a7d-8482-4397-96b6-59a028210722', 6, 70.000, 17.066, 70.000, '2026-07-23 09:23:37.952+00', '2026-07-23 09:23:37.952+00', NULL, 'd40c1816-be56-4a13-8c52-a436ac20c8ab', 'RESERVED', NULL, NULL),
+	('83cb0f00-efc1-4c20-97f1-659846a2971d', '379c7434-f412-4a79-ae2d-e4740c63b49a', '8eec3a7d-8482-4397-96b6-59a028210722', 7, 70.000, 17.066, 28.000, '2026-07-23 09:23:37.952+00', '2026-07-23 09:23:37.952+00', NULL, '54ce9794-8949-424b-b2da-2ce1117f64d5', 'RESERVED', NULL, NULL),
+	('01a3c551-107e-45be-a98b-6397bc42e9ab', '065de839-5edb-4a08-ae6e-d1142579fd99', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 24.000, '2026-07-23 14:02:20.291+00', '2026-07-23 14:02:20.291+00', NULL, '98407c31-ec00-4b57-a96d-637cec1ed273', 'RESERVED', NULL, NULL),
+	('d2cfd3b2-b405-421e-bcaa-95593b087afc', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 1, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '3ae733ed-b2ab-4b50-81ab-c7d67415c30f', 'RESERVED', NULL, NULL),
+	('b5c036cf-eb05-4a6e-8278-e661a0ce48b3', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 2, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'ea7c3b62-00a5-486f-b37b-5c876a8ef0be', 'RESERVED', NULL, NULL),
+	('81035b6a-68c9-49eb-8dc0-d90011c3fa6a', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 3, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '07e93df1-095c-442f-bda5-41bc74ad0ced', 'RESERVED', NULL, NULL),
+	('53240b26-fe61-4ad5-b025-55cf53542887', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 4, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '7a93e53e-861d-4e3a-bd4b-58bf39da6ee8', 'RESERVED', NULL, NULL),
+	('93d5a24e-cbeb-43a1-a96b-157eedac2b4d', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 5, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '7c2f5d1c-d9d5-44bd-b7ff-80f3e7bf52e5', 'RESERVED', NULL, NULL),
+	('1328cda4-082a-4365-9180-13e88f065134', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 6, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'ed72a1b9-d060-4699-b866-31a2c6bf2eb8', 'RESERVED', NULL, NULL),
+	('14a9c598-3b01-4bc6-8817-2fe4fbbc32a8', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 7, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '52c2faf6-80f1-40e8-97d1-d8ee82867198', 'RESERVED', NULL, NULL),
+	('82d38939-f038-4cd1-b5d5-1ca6eadd746c', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 40.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '5067bbde-7756-4ccd-b95f-654baba240c0', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('3ef9ab1c-86af-403c-a71c-88a2f6b12684', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '1c4f1919-2c79-497b-9c57-92bad167d443', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('8bfd98d2-2660-4fd4-87a0-1c956998049d', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'b0fd8345-e047-4869-ba3b-b5eee4d1509f', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('caa05bd0-4c14-46b8-9669-6ad9fe5b466b', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'd0ef971b-de9a-4444-8f9b-be65a73383a8', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('dd02d422-040b-47e3-b734-8b71ef36ca38', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'db81a283-27ef-470e-8697-bb99f2985e0c', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('25802de0-800b-4360-a570-8992e45b7ec5', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '367c3556-02c5-4734-993f-27b4ef8c894d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('137b3ef7-42cb-4cdc-830f-4b6e227a6bcb', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '6418abb5-3057-45c3-ae8e-131dc5ca944b', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('d7e54568-3d8a-41e0-91d9-ed38cbf879c6', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'b1848f29-5b8e-4af2-a633-e3979371881d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('b83f8dcd-bfb6-4350-adbf-2363b25f77c0', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'ac3442c2-05b9-4d13-a242-ee50caadeb9e', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('87ecd747-9fb6-462f-b68a-e9d0c245a45a', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '100fbb76-f62d-46a3-be30-ac79719f9ded', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('310b0e53-475f-4063-aaa1-38e9cc1ccc81', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '078db48b-a8ab-4acf-babc-0e5c8df538fa', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('d161a9ed-0637-4b35-9bd2-1764822b71d4', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'ebf5d985-02ee-4f64-a43c-c77c683e5479', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('5f112c5d-2092-4c5c-91c4-691c0001b609', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '9ad96e4c-285c-4b47-baec-ad9606680bff', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('24fc7968-b3a8-4ddc-abbe-799e1b9c2119', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '027c3412-c1ec-4f48-b65f-dc20b20db5c7', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('97b5ec8b-f4f5-470f-bb83-6023360a212c', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'a2c86830-5db4-4cd4-99e6-85cdbf9f6979', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('534611d9-bc55-4ef2-b876-f7fabb635a2c', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '8198f44f-fbf7-4c17-b4c4-b243a78b51c9', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('99f4396b-628e-4778-b9b3-ba424a3ce2b1', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '21ad7cf5-8720-48ab-b07c-457d659f10df', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('254e7a60-5349-488f-9048-6b2f49d862d1', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '343bd852-aaec-4858-a2ff-a3c126b0cb5b', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('8173a33d-c2c6-4988-9a25-207147af59b7', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '9db9bf3d-2a4c-43cd-976b-b6dafe140865', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('dc328856-2ce6-4907-96ec-08d3ce31a7c7', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 21, 70.000, 13.966, 20.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, 'e875642e-1a0c-4916-9c30-afedc2bf6058', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('31d65e9d-b63f-44c6-81f3-e85e75cc9893', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 8, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '46793bd2-c77b-43af-83f4-3cebca8f83fd', 'RESERVED', NULL, NULL),
+	('c0b64205-1932-4fc7-8c1f-d3dc57d6a893', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 9, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '10fa4f49-57d1-48e3-a7e3-46e2121f0ccc', 'RESERVED', NULL, NULL),
+	('846beb93-18af-47a7-a788-f053625fe5d6', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 10, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'df0824ca-b995-46a2-a153-ddbe7d2746ce', 'RESERVED', NULL, NULL),
+	('e05a7d7b-9eb7-432f-a099-9294f96352c8', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 11, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '36c7a12a-1bec-4600-b8d1-7d8b9e3bdaf2', 'RESERVED', NULL, NULL),
+	('6db8a1de-9618-4b6c-a849-a5b4ccf68bc7', 'f3af584a-51cb-4683-b9d0-f6ce3503894e', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 40.000, '2026-07-21 17:16:01.803+00', '2026-07-21 17:16:01.803+00', NULL, '4334b12e-103f-4499-8fe5-1ff8df234716', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('fd327cc5-cb58-4a97-b480-29c72eefa1f9', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 12, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'ab966ba3-0eb9-43b8-8a7b-c6a8bdc1b8b2', 'RESERVED', NULL, NULL),
+	('96898e73-b30a-435e-8840-5af053efaaee', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 13, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '873ccf9e-68f5-468a-ab6e-626a77511a26', 'RESERVED', NULL, NULL),
+	('756fa785-4530-4058-80e8-ffbf35c5a0da', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 14, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'da467171-ff66-4c8f-a8f0-da37dc7b7ea7', 'RESERVED', NULL, NULL),
+	('bc630d76-cf1b-4351-9fd3-62f3e8dc76cc', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 15, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '0ac8b72b-38a2-4fd8-ba6c-273edf69dd43', 'RESERVED', NULL, NULL),
+	('0df2be8d-34d0-4803-bbb5-55f96ea29d37', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 16, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'e83f2749-f195-4ecf-b158-d0f96a24493d', 'RESERVED', NULL, NULL),
+	('18ad406b-a46e-469c-b12a-a82e76afea87', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 17, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '0b652309-d605-4e20-84bd-974139462cc6', 'RESERVED', NULL, NULL),
+	('fc905cad-856b-4ff0-9ed1-a46de82b3e1d', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 18, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '7589b56c-a055-4592-a0ab-ac963c2e46df', 'RESERVED', NULL, NULL),
+	('14741d41-a1c4-40ee-8eea-8b7d635e891e', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 19, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'ba5376e4-bdab-4e4b-a3b0-c8ba6c2f2da9', 'RESERVED', NULL, NULL),
+	('0ee00b71-1e40-4b9c-bbee-2b3c5b91317c', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 20, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '4347bd49-f8c7-40a5-a963-c35f71e4551f', 'RESERVED', NULL, NULL),
+	('0ed7a9b6-2831-41b2-beb9-f15cc1ff90e5', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 21, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'ffef9238-7c91-499f-8d71-ac767d713615', 'RESERVED', NULL, NULL),
+	('a9f6a395-70c9-46af-ba33-b9c6a84c78dc', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 22, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '220877e0-fef1-42b6-90d9-48136749840f', 'RESERVED', NULL, NULL),
+	('18681340-edfc-4acb-9935-fc10c091eabc', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 23, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, 'd7be2a1f-521e-4548-97b2-dc19361a8c24', 'RESERVED', NULL, NULL),
+	('65028b9e-02e1-4cc0-86e1-9931f174d9f0', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 24, 70.000, 17.066, 70.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '7d90c6dc-a55c-4920-a5e2-3bc338263c77', 'RESERVED', NULL, NULL),
+	('562977f6-b1a1-4799-af4f-f892d166c7c8', '3b753131-834f-4763-892e-a8f4a8ca837c', '8eec3a7d-8482-4397-96b6-59a028210722', 25, 70.000, 17.066, 22.000, '2026-07-22 12:46:48.165+00', '2026-07-22 12:46:48.165+00', NULL, '2152baca-bdec-4f94-8e69-dbd0f5d14127', 'RESERVED', NULL, NULL),
+	('d68822fb-7665-4b87-9597-0704c855b379', '83a0229a-8975-4b9b-a97f-7b3004215aef', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 12.000, '2026-07-20 11:14:11.013+00', '2026-07-20 11:14:11.013+00', NULL, '4334b12e-103f-4499-8fe5-1ff8df234716', 'RESERVED', NULL, NULL),
+	('c1c40709-282f-4d7f-a4a2-d780e7546e42', '83a0229a-8975-4b9b-a97f-7b3004215aef', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 47.850, '2026-07-20 11:14:11.013+00', '2026-07-20 11:14:11.013+00', NULL, '5067bbde-7756-4ccd-b95f-654baba240c0', 'RESERVED', NULL, NULL),
+	('a7bdb1df-6cbf-4d8f-a633-b6b77c433ae8', '83a0229a-8975-4b9b-a97f-7b3004215aef', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 19.000, '2026-07-20 11:14:11.013+00', '2026-07-20 11:14:11.013+00', NULL, '1c4f1919-2c79-497b-9c57-92bad167d443', 'RESERVED', NULL, NULL),
+	('bd61afa6-3ff7-4b17-9b6d-f4323d9312d0', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '148b7a5b-c7e3-46a6-a621-61467233720c', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('ad46086e-cda6-447d-8e1d-cf9d853d8bf6', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '4334b12e-103f-4499-8fe5-1ff8df234716', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('3cb481e4-2202-4f23-bcc2-59d2b541c3d8', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '04feda04-6dcb-4d27-b6bf-458d9318e0c2', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('c0e7cbc9-d741-4ed8-a2e9-c2cbeef28637', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '4065b9e5-f6ce-4df5-b324-1081c0247d4c', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('7d5a0ed4-c3b1-4ec3-92e5-695969a23a84', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'd9f29503-3906-4d20-bff5-447ebe355b61', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('f8ad88b4-e2f3-4d23-a242-00d92aae80f5', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'aabc4d3e-ac83-42c3-b348-080db47539b7', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('ce4d1043-8155-4456-adf6-a0a87969de3f', '6d83b300-aa08-42bf-bcee-f0f1df37cde5', '8eec3a7d-8482-4397-96b6-59a028210722', 1, 70.000, 17.066, 70.000, '2026-07-23 12:57:09.86+00', '2026-07-23 12:57:09.86+00', NULL, '5157d855-6ff4-4d76-93e8-3ed09005f07a', 'RESERVED', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL),
+	('88acf021-ea7e-4418-b718-24572ff0f749', '6d83b300-aa08-42bf-bcee-f0f1df37cde5', '8eec3a7d-8482-4397-96b6-59a028210722', 2, 70.000, 17.066, 70.000, '2026-07-23 12:57:09.86+00', '2026-07-23 12:57:09.86+00', NULL, '0eaa23e0-287c-4f08-b867-fc4069756e15', 'RESERVED', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL),
+	('5badf08a-861a-4fb0-b3ec-24d768b6dc96', '6d83b300-aa08-42bf-bcee-f0f1df37cde5', '8eec3a7d-8482-4397-96b6-59a028210722', 3, 70.000, 17.066, 60.000, '2026-07-23 12:57:09.86+00', '2026-07-23 12:57:09.86+00', NULL, '5f35aef5-9f2d-40d6-ad7c-6e5ff4fe3963', 'RESERVED', '23fda607-6cc6-4923-b05b-56b7adb1626b', NULL),
+	('f343f000-9060-4837-a841-4a1268c0312f', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'e2bfa882-d653-4b30-aa33-e7b20698636d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('e2b5db87-43e5-4d02-be55-bbd36ab01e06', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'a83c2c28-b229-4275-aa45-7ba49e5e8042', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('bf5fa298-bb69-445f-810e-28f5b75ade86', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'de9ef3bd-712b-4f34-8f25-0d6a51833074', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('29e7b7cc-b183-433e-9081-9167255add77', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'b32de37c-e462-4a7b-aeb0-f7b73ddf68f0', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('d505e9b1-bef5-4e66-b7d1-166b2b81eb29', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '57c3f687-1c0d-4a29-9060-db38b3a533e6', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('51f778c9-f883-4342-a5d5-1f7ba038d4ac', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 21.640, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '5daa57bd-10ee-4e5f-a73a-45357b43e0a8', 'RESERVED', NULL, NULL),
+	('d80c4168-7a3e-4abc-896f-02fb2fdfab10', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 21.660, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'dcf8af0b-b95e-4e95-8d8e-75be6a3ea769', 'RESERVED', NULL, NULL),
+	('c9e66726-d1ea-4169-906a-f23ea252f1ba', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 21.050, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'e4f95edb-21b6-482b-9b51-1af97edc2341', 'RESERVED', NULL, NULL),
+	('d0fd8cf8-2ca5-433d-a621-b5f95662567f', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 25.320, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'a25bbcfd-a76c-47c4-80f4-5462f98eba3e', 'RESERVED', NULL, NULL),
+	('e3f5e663-f602-4006-8fb4-96fcb9c28c5a', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 26.490, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '5cadc015-35dc-4f13-a1df-35bef3acd35f', 'RESERVED', NULL, NULL),
+	('3817d0ff-97a5-4013-a08f-ad3cbe376acf', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 23.950, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '85e05351-b076-4121-b7b1-e07863f69f31', 'RESERVED', NULL, NULL),
+	('27f8c316-ecca-49b4-8768-ee16a9ac70a2', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 22.240, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '944cec65-290c-4adb-bf37-5bba91ecaab2', 'RESERVED', NULL, NULL),
+	('26c72cdb-6698-4a98-8d56-b0f59be8dc30', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 25.530, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '27398588-df37-4408-bcec-69b408be2b4c', 'RESERVED', NULL, NULL),
+	('477b3b91-a786-48e5-b746-10104d0f593f', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 21.540, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '5424c729-723a-4606-9d2d-b73f2ba27b31', 'RESERVED', NULL, NULL),
+	('4ba8ad09-d5eb-41cb-8811-433658c5b566', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 27.590, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '6ade91c0-d616-4ae3-b7c1-7f7cb2686961', 'RESERVED', NULL, NULL),
+	('c1cec7f7-c35f-4fed-a16f-ce5eac6e6d2b', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 24.550, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '5cac0077-63b0-4022-9b7e-228a0391c3f3', 'RESERVED', NULL, NULL),
+	('6410b452-8445-4d56-912a-928ab4df5b15', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 22, 70.000, 13.966, 24.410, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '76e92779-2705-43b5-8e28-52fc9ad42ddd', 'RESERVED', NULL, NULL),
+	('43a0b62c-7edf-4818-b7ad-9eb19ddb6307', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 23, 70.000, 13.966, 20.420, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '951904eb-60a6-44dd-aada-4be40146f2a0', 'RESERVED', NULL, NULL),
+	('cf9ff8a7-d8e2-4b65-b81a-27cc6d134e79', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 24, 70.000, 13.966, 21.720, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'b9e70323-4d3c-4d85-b37a-51408b20daef', 'RESERVED', NULL, NULL),
+	('cc33fa43-b64d-44fb-9c77-1305037d9b76', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 25.000, '2026-08-01 09:40:07.41296+00', '2026-08-01 09:40:07.41296+00', NULL, '8ecb831d-4d07-4c56-b46c-d8fb7aff20d2', 'RESERVED', NULL, NULL),
+	('0fa89aee-c550-422f-ab07-7a798ade7608', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 28.000, '2026-08-01 09:40:07.41296+00', '2026-08-01 09:40:07.41296+00', NULL, 'c00f78c4-e526-4272-953d-4d8c62c464ac', 'RESERVED', NULL, NULL),
+	('20474978-2ed1-4f00-88b5-b4019f15b4b6', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 24.000, '2026-08-01 09:40:07.41296+00', '2026-08-01 09:40:07.41296+00', NULL, 'f8e2efe7-8f72-4ced-9485-760f7e16b816', 'RESERVED', NULL, NULL),
+	('ec2f51cc-f70f-43fd-9427-4e727b5fe767', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 23.000, '2026-08-01 09:40:07.41296+00', '2026-08-01 09:40:07.41296+00', NULL, 'f6463fb1-5e59-4eab-a3e5-dfb2ba9f51e0', 'RESERVED', NULL, NULL),
+	('09df696e-2290-4f88-93c4-208106b2ac2e', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 21.000, '2026-08-01 09:40:07.41296+00', '2026-08-01 09:40:07.41296+00', NULL, 'ae484bb2-59f3-4be3-b73e-3615ed8239fc', 'RESERVED', NULL, NULL),
+	('65b594ca-a753-4f84-b29b-317b19667bf1', 'e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 37.000, '2026-08-01 09:40:07.41296+00', '2026-08-01 09:40:07.41296+00', NULL, '746dfb2c-9cc1-4475-b110-bd0d5efa31b8', 'RESERVED', NULL, NULL),
+	('7eca46c2-5b10-418d-a5d3-1332e2209dbb', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 25, 70.000, 13.966, 22.350, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'c6e5e49c-01fd-4469-a215-e4b2f5ee6ad3', 'RESERVED', NULL, NULL),
+	('029e7137-537a-4941-8ab3-c843a6e39dfa', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 26, 70.000, 13.966, 22.120, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '1ab8f840-69cc-4d95-9bcc-2c3be1e8c85e', 'RESERVED', NULL, NULL),
+	('598a99df-312e-42e8-848a-80bafc191e78', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 27, 70.000, 13.966, 26.290, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'f5bf1b94-6dc1-4be2-89a5-538cc18f919a', 'RESERVED', NULL, NULL),
+	('595dd9e3-97c3-4741-852f-d6f8c77f44c2', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 28, 70.000, 13.966, 22.690, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'd25abbef-a7f0-4b6c-98ed-6931e074168b', 'RESERVED', NULL, NULL),
+	('941cae90-7d03-4a21-ad56-0eebb7e53e15', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 29, 70.000, 13.966, 26.040, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '04219cc7-ef3f-4b30-9e31-cb5a207631ae', 'RESERVED', NULL, NULL),
+	('e2b0f8e1-f329-4dd6-956b-933f50ea32ab', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 30, 70.000, 13.966, 23.180, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'afda74c6-be11-4edc-9c1e-e35a597508df', 'RESERVED', NULL, NULL),
+	('565ec1be-db81-44d4-9bfe-264783854063', '43be694a-48fc-4c14-8b13-cded4791ec63', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 10.000, '2026-08-02 21:48:51.413136+00', '2026-08-02 21:48:51.413136+00', NULL, '5cac0077-63b0-4022-9b7e-228a0391c3f3', 'RESERVED', NULL, NULL),
+	('ba993ca5-8ade-4d05-a60c-8907e6dc6746', '43be694a-48fc-4c14-8b13-cded4791ec63', '4f65adc3-baf7-44de-88ad-0a4672fab669', 2, 70.000, 18.560, 10.000, '2026-08-02 21:48:51.413136+00', '2026-08-02 21:48:51.413136+00', NULL, 'c0eafaa7-85f4-4568-a3cb-09754f196592', 'RESERVED', NULL, NULL),
+	('540ea941-0dfc-4107-bd66-ab026b7f76be', '43be694a-48fc-4c14-8b13-cded4791ec63', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 10.000, '2026-08-02 21:48:51.413136+00', '2026-08-02 21:48:51.413136+00', NULL, '6ade91c0-d616-4ae3-b7c1-7f7cb2686961', 'RESERVED', NULL, NULL),
+	('7232008e-99b7-4c89-9032-ed30d3beceac', '43be694a-48fc-4c14-8b13-cded4791ec63', '4f65adc3-baf7-44de-88ad-0a4672fab669', 4, 70.000, 18.560, 10.000, '2026-08-02 21:48:51.413136+00', '2026-08-02 21:48:51.413136+00', NULL, '9511df0b-87ea-4f19-a770-4ea9a27004dd', 'RESERVED', NULL, NULL),
+	('f301247f-ffe1-44ce-93a6-abb78e677d6c', '43be694a-48fc-4c14-8b13-cded4791ec63', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 10.000, '2026-08-02 21:48:51.413136+00', '2026-08-02 21:48:51.413136+00', NULL, '5424c729-723a-4606-9d2d-b73f2ba27b31', 'RESERVED', NULL, NULL),
+	('773f9793-1ec7-41d8-baed-89de0521037d', '62a426ca-52e7-4359-8a43-a8ac038638db', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 21.000, '2026-08-07 11:05:27.931018+00', '2026-08-07 11:05:27.931018+00', NULL, '20e7c481-34ac-4603-bb38-357383c55a9b', 'RESERVED', NULL, NULL),
+	('9d8a812d-2af4-4ad6-8d88-58b67d3ab37f', '62a426ca-52e7-4359-8a43-a8ac038638db', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 22.000, '2026-08-07 11:05:27.931018+00', '2026-08-07 11:05:27.931018+00', NULL, 'e4f95edb-21b6-482b-9b51-1af97edc2341', 'RESERVED', NULL, NULL),
+	('dce5f183-5d74-41d1-95c1-851fbb962995', '62a426ca-52e7-4359-8a43-a8ac038638db', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 22.000, '2026-08-07 11:05:27.931018+00', '2026-08-07 11:05:27.931018+00', NULL, '5cac0077-63b0-4022-9b7e-228a0391c3f3', 'RESERVED', NULL, NULL),
+	('0ea2a8f4-d26b-444b-bb2c-4e524cfc834b', '62a426ca-52e7-4359-8a43-a8ac038638db', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 21.000, '2026-08-07 11:05:27.931018+00', '2026-08-07 11:05:27.931018+00', NULL, 'd25abbef-a7f0-4b6c-98ed-6931e074168b', 'RESERVED', NULL, NULL),
+	('b9c95055-d74c-4b9e-813d-ea8550a6d93c', '62a426ca-52e7-4359-8a43-a8ac038638db', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 36.000, '2026-08-07 11:05:27.931018+00', '2026-08-07 11:05:27.931018+00', NULL, 'f8e2efe7-8f72-4ced-9485-760f7e16b816', 'RESERVED', NULL, NULL),
+	('c04b5cd0-873a-49c4-bd93-1b206211f959', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 24.500, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, 'ee187bcb-a21d-49db-9102-96361dd65aa5', 'RESERVED', NULL, NULL),
+	('4b7eb647-a75d-486e-b9df-6686407c2222', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 20.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, '273d5cdf-193f-494e-927a-f30e2e800ee3', 'RESERVED', NULL, NULL),
+	('90b0373e-50f4-4ceb-8b77-f16327bec26b', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 20.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, 'd4138cab-df2f-4a7d-89ad-b57bf0e00c13', 'RESERVED', NULL, NULL),
+	('26800d8b-b8ba-44d7-81cc-1fc6e3b7471a', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 70.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, '20e7c481-34ac-4603-bb38-357383c55a9b', 'RESERVED', NULL, NULL),
+	('db2ff554-dc2c-4566-821c-2327ea1d6d7e', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 70.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, '5852d1d2-0ae9-4e9d-923d-6e94e0978a25', 'RESERVED', NULL, NULL),
+	('05737b73-fa89-446a-ad15-9ab37f31e88a', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 70.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, '8de9ad3b-fae0-499a-98ef-e5d5d2ee41d8', 'RESERVED', NULL, NULL),
+	('e15b30e7-ec60-4e7e-be3b-a24defd3a1a9', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 70.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, 'b034a5f5-8eff-4f31-bf89-945d920749fe', 'RESERVED', NULL, NULL),
+	('4d657e4e-ed17-4b4f-9fa9-15d7e8c23ab4', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 70.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, '898628d2-7195-49aa-aa05-7289781725ac', 'RESERVED', NULL, NULL),
+	('3c1ae892-5bf7-49c9-a0be-9cdeee8ad17c', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 70.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, 'd3779672-5f85-4a03-a437-7ef6ec2097b2', 'RESERVED', NULL, NULL),
+	('a0eed35d-cea0-4942-ba80-35a0c31a2890', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 70.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, '5daa57bd-10ee-4e5f-a73a-45357b43e0a8', 'RESERVED', NULL, NULL),
+	('f1fa9a07-5031-4673-bc86-b54e58e4d33a', '37a3cdde-377c-4cbf-ae1f-9571034024e2', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 10.000, '2026-08-06 04:29:06.859628+00', '2026-08-06 04:29:06.859628+00', NULL, 'dcf8af0b-b95e-4e95-8d8e-75be6a3ea769', 'RESERVED', NULL, NULL),
+	('03e46bbf-53d3-4895-9fe2-f30cc366cb3f', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 20.260, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'ee187bcb-a21d-49db-9102-96361dd65aa5', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('10677ed1-c96e-4840-841c-4437bc37e533', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 24.680, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '273d5cdf-193f-494e-927a-f30e2e800ee3', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('666ba4c0-3e81-4634-b6be-91930e9451ca', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 21.730, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'd4138cab-df2f-4a7d-89ad-b57bf0e00c13', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('f23f9907-7f4f-49a9-ba86-eb28032f2589', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 21.400, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '20e7c481-34ac-4603-bb38-357383c55a9b', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('dbb12e5e-dc8a-4579-bdcc-c9025a1424b6', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 21.580, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '5852d1d2-0ae9-4e9d-923d-6e94e0978a25', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('e3f3d0bf-485c-4e39-952c-64bd3edc2c25', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 21.880, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '8de9ad3b-fae0-499a-98ef-e5d5d2ee41d8', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('a219d3ae-af1d-458d-8a24-e353e946d626', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 21.910, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'b034a5f5-8eff-4f31-bf89-945d920749fe', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('ca477328-2ded-4993-926d-153da2b360fc', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 23.210, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '898628d2-7195-49aa-aa05-7289781725ac', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('aeccc934-d350-4a24-a1d0-6cca6bf6dea3', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 22.150, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'd3779672-5f85-4a03-a437-7ef6ec2097b2', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('4bbc20c0-a638-4e56-99dc-8a8396985f3d', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 20.300, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '5daa57bd-10ee-4e5f-a73a-45357b43e0a8', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('879bac12-b688-42e3-98e8-ae278df9be7b', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 26.930, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'dcf8af0b-b95e-4e95-8d8e-75be6a3ea769', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('1c775c81-8da2-49e2-8e9c-a028c703237c', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 21.680, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'e4f95edb-21b6-482b-9b51-1af97edc2341', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('b710ed75-8ec4-443a-8529-ffb09a3970a4', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 27.010, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'a25bbcfd-a76c-47c4-80f4-5462f98eba3e', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('60a5296b-cd62-4169-86da-c2642691cd0a', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 21.960, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '5cadc015-35dc-4f13-a1df-35bef3acd35f', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('95eaefe9-5fff-4430-a5ba-c99c02e7ad6c', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 20.850, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '85e05351-b076-4121-b7b1-e07863f69f31', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('83ed469f-15e3-4df7-ae1b-4fb58141cb45', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 26.100, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '944cec65-290c-4adb-bf37-5bba91ecaab2', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('cd6e29f8-0a11-42c2-8f9d-e9e43c184571', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 21.970, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '27398588-df37-4408-bcec-69b408be2b4c', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('db5d3470-b4d0-4ade-95cd-0e011728a829', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 21.310, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '5424c729-723a-4606-9d2d-b73f2ba27b31', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('1d4794ee-d81a-45f3-a390-f40a7a9201c4', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 21.990, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '6ade91c0-d616-4ae3-b7c1-7f7cb2686961', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('701e6216-611f-45ac-acb5-835ae7a8b63a', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 21.720, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '5cac0077-63b0-4022-9b7e-228a0391c3f3', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('98ca5072-2d7f-4708-ba76-0d16ba788ee5', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 22, 70.000, 13.966, 21.560, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '76e92779-2705-43b5-8e28-52fc9ad42ddd', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('8da677ae-5640-4834-9a60-14637f7aa3d4', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 23, 70.000, 13.966, 27.490, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '951904eb-60a6-44dd-aada-4be40146f2a0', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('80f9671e-e43d-4562-a932-e5d9cb654243', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 24, 70.000, 13.966, 24.930, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'b9e70323-4d3c-4d85-b37a-51408b20daef', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('e398ea74-d175-4577-8918-1669925cb34f', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 25, 70.000, 13.966, 25.400, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'c6e5e49c-01fd-4469-a215-e4b2f5ee6ad3', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('07980cd4-4761-4920-8b65-ed602a05f346', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 26, 70.000, 13.966, 27.510, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '1ab8f840-69cc-4d95-9bcc-2c3be1e8c85e', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('0eddb71f-c6e2-4014-81d3-b10cd44fb7a9', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 27, 70.000, 13.966, 27.200, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'f5bf1b94-6dc1-4be2-89a5-538cc18f919a', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('11ed9de7-1484-408d-a5e1-464aebfcedb1', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 28, 70.000, 13.966, 25.340, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'd25abbef-a7f0-4b6c-98ed-6931e074168b', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('c506844b-c6ce-44d1-baa9-d2a3e8659cb6', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 29, 70.000, 13.966, 26.410, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, '04219cc7-ef3f-4b30-9e31-cb5a207631ae', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('6551a5fb-9229-4aae-80d1-1386aa7f6e01', 'd6f6c9ac-194a-4bd6-844c-667f26b49fea', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 30, 70.000, 13.966, 26.650, '2026-08-05 11:26:40.845492+00', '2026-08-05 11:47:28.821867+00', NULL, 'afda74c6-be11-4edc-9c1e-e35a597508df', 'DEPARTED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('4fd457c4-3cff-463c-830c-c6c6e4ee87b9', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 24.680, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '20e7c481-34ac-4603-bb38-357383c55a9b', 'RESERVED', NULL, NULL),
+	('4560512e-2fb6-4c2e-b933-ba2aac61dbdd', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 21.730, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'e4f95edb-21b6-482b-9b51-1af97edc2341', 'RESERVED', NULL, NULL),
+	('daf7f3e0-da84-4e24-9c97-1d5b03e529a8', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 21.400, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '5cac0077-63b0-4022-9b7e-228a0391c3f3', 'RESERVED', NULL, NULL),
+	('e93f2a72-36a8-4100-acdf-9e0dbc2596c9', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 21.580, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'd25abbef-a7f0-4b6c-98ed-6931e074168b', 'RESERVED', NULL, NULL),
+	('c59f0faf-648d-498a-823d-9bd55657cd7b', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 21.880, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'f8e2efe7-8f72-4ced-9485-760f7e16b816', 'RESERVED', NULL, NULL),
+	('5f4f6224-833c-46c5-87b5-8112e14af593', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 21.910, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'f6463fb1-5e59-4eab-a3e5-dfb2ba9f51e0', 'RESERVED', NULL, NULL),
+	('b4029ab2-7e71-4933-80a4-680f5892c323', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 23.210, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'ae484bb2-59f3-4be3-b73e-3615ed8239fc', 'RESERVED', NULL, NULL),
+	('a012c15f-0bbe-40df-a5b5-30689b3c04ab', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 22.150, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '746dfb2c-9cc1-4475-b110-bd0d5efa31b8', 'RESERVED', NULL, NULL),
+	('27f6f0c5-49ac-4c64-b4e3-4b4b575ed981', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 20.300, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '24404f54-03b6-45ec-9cbe-227447b92976', 'RESERVED', NULL, NULL),
+	('be8c1ca3-102c-4245-90a2-f41a246e302f', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 26.930, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'c9f2906d-4e11-464f-922a-1b37bc95de15', 'RESERVED', NULL, NULL),
+	('218431ed-8489-4805-857b-4b18fda34046', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 21.680, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '98407c31-ec00-4b57-a96d-637cec1ed273', 'RESERVED', NULL, NULL),
+	('2bb3a365-20c1-49e1-bf66-77bd00d56f21', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 27.010, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '3712c6f2-e1f1-42fa-b16a-e3fb33c3622e', 'RESERVED', NULL, NULL),
+	('ebef5117-01ad-4a2c-90d6-12d4ffe759d2', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 21.960, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'a8b86f98-50ad-4258-88b5-3e700dbdcb21', 'RESERVED', NULL, NULL),
+	('2cf901fe-cbae-414f-bbcb-2231b9cf3f06', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 20.850, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '1f4f4542-f4b8-47ea-a868-281c04fca0f8', 'RESERVED', NULL, NULL),
+	('5befcf78-9f01-45e7-9f9a-dc7cca07cd7a', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 26.100, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'f5bf1b94-6dc1-4be2-89a5-538cc18f919a', 'RESERVED', NULL, NULL),
+	('d12e2beb-3a37-4f1a-81b8-4bb8a840d5d2', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 21.970, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '1ab8f840-69cc-4d95-9bcc-2c3be1e8c85e', 'RESERVED', NULL, NULL),
+	('c77a980a-4851-4878-a547-c20caf29ac6f', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 21.310, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'b9e70323-4d3c-4d85-b37a-51408b20daef', 'RESERVED', NULL, NULL),
+	('919272e8-c322-4fca-93fe-c5e19f955ec3', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 21.990, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'c6e5e49c-01fd-4469-a215-e4b2f5ee6ad3', 'RESERVED', NULL, NULL),
+	('659398d8-9ce7-4629-9f61-de65dcb8a894', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 21.720, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '04219cc7-ef3f-4b30-9e31-cb5a207631ae', 'RESERVED', NULL, NULL),
+	('eec85e05-28c0-46aa-91a7-0f18225f8a2d', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 21, 70.000, 13.966, 24.480, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'afda74c6-be11-4edc-9c1e-e35a597508df', 'RESERVED', NULL, NULL),
+	('d2e8f402-a322-4421-81f6-fe60fd155c63', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 22, 70.000, 13.966, 21.560, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '951904eb-60a6-44dd-aada-4be40146f2a0', 'RESERVED', NULL, NULL),
+	('671abb61-b204-4408-90f6-c4c284ef1ee9', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 23, 70.000, 13.966, 27.490, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '76e92779-2705-43b5-8e28-52fc9ad42ddd', 'RESERVED', NULL, NULL),
+	('5c09f678-4bef-484e-b381-ba1e8ab05b1a', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 24, 70.000, 13.966, 24.930, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '6ade91c0-d616-4ae3-b7c1-7f7cb2686961', 'RESERVED', NULL, NULL),
+	('c348957f-1b46-4a3a-8891-f4af2dcd6930', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 25, 70.000, 13.966, 25.400, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '5424c729-723a-4606-9d2d-b73f2ba27b31', 'RESERVED', NULL, NULL),
+	('67ab3271-330c-4f5c-9a5c-7c86b9a27f64', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 26, 70.000, 13.966, 27.510, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '27398588-df37-4408-bcec-69b408be2b4c', 'RESERVED', NULL, NULL),
+	('2e6ab4be-248a-478c-95fa-583b87adfdc6', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 27, 70.000, 13.966, 27.200, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '944cec65-290c-4adb-bf37-5bba91ecaab2', 'RESERVED', NULL, NULL),
+	('e5ea7384-e12a-450e-ac1e-951b6989d67c', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 28, 70.000, 13.966, 25.340, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '5cadc015-35dc-4f13-a1df-35bef3acd35f', 'RESERVED', NULL, NULL),
+	('ae84f134-d92c-4751-a4b1-3a4198f012f7', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 29, 70.000, 13.966, 26.410, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, '85e05351-b076-4121-b7b1-e07863f69f31', 'RESERVED', NULL, NULL),
+	('47121f3e-90e9-43b9-ac22-0a541f594d54', '2a90debe-87e5-4d7f-b03b-ad0dc22899f3', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 30, 70.000, 13.966, 26.650, '2026-08-07 06:08:41.811777+00', '2026-08-07 06:08:41.811777+00', NULL, 'a25bbcfd-a76c-47c4-80f4-5462f98eba3e', 'RESERVED', NULL, NULL),
+	('f7c6407f-4e7a-47ad-9951-602fe3b72c07', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '20e7c481-34ac-4603-bb38-357383c55a9b', 'RESERVED', NULL, NULL),
+	('ffb0f798-5dc2-4a55-95a1-f5c21ed39799', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'e4f95edb-21b6-482b-9b51-1af97edc2341', 'RESERVED', NULL, NULL),
+	('01c744b2-6905-411c-a3d3-21d3db9b5840', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '5cac0077-63b0-4022-9b7e-228a0391c3f3', 'RESERVED', NULL, NULL),
+	('131a76f7-cafa-438e-bbd1-db115a27ffee', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'd25abbef-a7f0-4b6c-98ed-6931e074168b', 'RESERVED', NULL, NULL),
+	('42219ecc-dcef-45b2-888c-07ed72acaf79', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 30.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'f8e2efe7-8f72-4ced-9485-760f7e16b816', 'RESERVED', NULL, NULL),
+	('80025c87-d7ff-4ffe-a00f-1de48e9640fb', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 40.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'f6463fb1-5e59-4eab-a3e5-dfb2ba9f51e0', 'RESERVED', NULL, NULL),
+	('e90928dc-7cce-4b18-8db4-f5f923c012ed', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'ae484bb2-59f3-4be3-b73e-3615ed8239fc', 'RESERVED', NULL, NULL),
+	('086418da-392b-4bbd-a467-7eff2c34782e', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 40.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '746dfb2c-9cc1-4475-b110-bd0d5efa31b8', 'RESERVED', NULL, NULL),
+	('bb3e7c8e-6bee-4fe9-9c66-9bbbfaa34206', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 10, 70.000, 13.966, 40.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '24404f54-03b6-45ec-9cbe-227447b92976', 'RESERVED', NULL, NULL),
+	('f094738f-7a6a-4f5c-b090-e8ca0a79416a', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 11, 70.000, 13.966, 30.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'c9f2906d-4e11-464f-922a-1b37bc95de15', 'RESERVED', NULL, NULL),
+	('f3b0573f-6afa-47ed-921c-37f7848869da', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 30.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '98407c31-ec00-4b57-a96d-637cec1ed273', 'RESERVED', NULL, NULL),
+	('d2da6ace-e4f7-494d-9a1d-b985de091af8', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '3712c6f2-e1f1-42fa-b16a-e3fb33c3622e', 'RESERVED', NULL, NULL),
+	('11cf57bc-2923-4e38-ba57-e0a5ba5e8bc5', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'a8b86f98-50ad-4258-88b5-3e700dbdcb21', 'RESERVED', NULL, NULL),
+	('6bcb24e7-2c7a-47f0-9272-1aa37e047db8', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '1f4f4542-f4b8-47ea-a868-281c04fca0f8', 'RESERVED', NULL, NULL),
+	('d80bab50-b9bd-46b5-8071-76f617939ba6', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 30.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'f5bf1b94-6dc1-4be2-89a5-538cc18f919a', 'RESERVED', NULL, NULL),
+	('290889b3-d27e-4a9b-988d-e580c9962e51', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 30.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '1ab8f840-69cc-4d95-9bcc-2c3be1e8c85e', 'RESERVED', NULL, NULL),
+	('d3249f4a-eb72-4872-a608-b0ef7ce277d7', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 30.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'b9e70323-4d3c-4d85-b37a-51408b20daef', 'RESERVED', NULL, NULL),
+	('f2a106c6-f489-4ba2-9ada-9ed120251bd8', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'c6e5e49c-01fd-4469-a215-e4b2f5ee6ad3', 'RESERVED', NULL, NULL),
+	('ed540fb0-0200-431f-9120-c4b70ccb3f0c', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, '04219cc7-ef3f-4b30-9e31-cb5a207631ae', 'RESERVED', NULL, NULL),
+	('62c4e6b1-226f-4279-9b0a-a62c580d2b2a', '7e076f85-0f80-4edc-9787-01129e2e46c4', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 21, 70.000, 13.966, 20.000, '2026-08-07 12:19:49.496601+00', '2026-08-07 12:19:49.496601+00', NULL, 'afda74c6-be11-4edc-9c1e-e35a597508df', 'RESERVED', NULL, NULL),
+	('9f848d33-4b1d-475e-88a6-9e0effd29653', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 7, 70.000, 13.966, 24.310, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'b034a5f5-8eff-4f31-bf89-945d920749fe', 'RESERVED', NULL, NULL),
+	('09e49321-516b-44db-a366-b1ca270a08b2', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 8, 70.000, 13.966, 21.490, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '898628d2-7195-49aa-aa05-7289781725ac', 'RESERVED', NULL, NULL),
+	('e8e3cec7-235f-4229-8204-cad678f98e87', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 9, 70.000, 13.966, 22.520, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'd3779672-5f85-4a03-a437-7ef6ec2097b2', 'RESERVED', NULL, NULL),
+	('9d5e540f-8744-4493-9e2e-ceb7f98e5061', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 1, 70.000, 13.966, 26.090, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'ee187bcb-a21d-49db-9102-96361dd65aa5', 'RESERVED', NULL, NULL),
+	('beae985d-f915-42a8-868f-3255d240d457', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 2, 70.000, 13.966, 20.920, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '273d5cdf-193f-494e-927a-f30e2e800ee3', 'RESERVED', NULL, NULL),
+	('8c8b5486-f776-4ffb-8960-a2351f81f55f', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 3, 70.000, 13.966, 20.850, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, 'd4138cab-df2f-4a7d-89ad-b57bf0e00c13', 'RESERVED', NULL, NULL),
+	('477af531-649e-4da0-a923-396c084d4ef9', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 4, 70.000, 13.966, 25.170, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '20e7c481-34ac-4603-bb38-357383c55a9b', 'RESERVED', NULL, NULL),
+	('a20d2ebb-75b2-4e97-9f75-d872dd78ff97', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 5, 70.000, 13.966, 20.320, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '5852d1d2-0ae9-4e9d-923d-6e94e0978a25', 'RESERVED', NULL, NULL),
+	('75f06c3b-930d-426b-a7e7-cda472bde0da', 'ba774692-e3be-4107-a1e6-6a497950d371', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 6, 70.000, 13.966, 28.750, '2026-08-04 12:27:17.75889+00', '2026-08-05 11:07:50.488901+00', NULL, '8de9ad3b-fae0-499a-98ef-e5d5d2ee41d8', 'RESERVED', NULL, NULL),
+	('fcb93f4c-a2a6-41b4-b6ba-123efc9cd2c4', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 44, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '367c3556-02c5-4734-993f-27b4ef8c894d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('2641a9ba-514c-4a2c-ab66-9e4d5365f753', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 45, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'db81a283-27ef-470e-8697-bb99f2985e0c', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('7659e1b6-c7e9-4d34-8de8-0ff8b3e13b80', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 46, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'd0ef971b-de9a-4444-8f9b-be65a73383a8', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('c419c97e-da33-4e7b-afcb-5c43a29032ca', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 47, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'b0fd8345-e047-4869-ba3b-b5eee4d1509f', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('889c9aab-acac-44e0-87c4-396d11511d7a', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 48, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '1c4f1919-2c79-497b-9c57-92bad167d443', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('654037d2-90fa-47c0-a15d-2f81b533c4f9', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 49, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '5067bbde-7756-4ccd-b95f-654baba240c0', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('50942783-c256-4388-819d-264924073872', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 50, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '806727f8-afe7-4bcd-8764-d0b8a336fc1d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('e898c34f-a689-4a3a-b784-0d1cfd5e9c9f', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 12, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '5315a1c0-352f-4529-b88f-137077263a1d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('54d6d694-30c3-428a-bcb6-6a61fbebf792', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 13, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '8b068c04-b5d1-4f63-b404-168fb57305af', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('fca25b69-ff6f-4696-9322-b6bd27557d56', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 14, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '2f1348ee-a228-4fdb-a791-d8827bab8fd8', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('d7b71ff8-ddb8-45de-8412-0e5da4c45310', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 15, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '15541cca-4457-4f16-9291-3032d008faa4', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('23b97d96-218b-4b9f-a537-eefb35fd59d0', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 16, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'e875642e-1a0c-4916-9c30-afedc2bf6058', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('ed643919-ca72-40e1-a0f9-d88340c05265', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 17, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '9db9bf3d-2a4c-43cd-976b-b6dafe140865', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('4a380d25-1380-4e4a-91ff-cd4b56732a9e', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 18, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '343bd852-aaec-4858-a2ff-a3c126b0cb5b', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('716fe838-c0b7-40d0-888d-15b34dc097f9', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 19, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '21ad7cf5-8720-48ab-b07c-457d659f10df', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('ca92c11b-6456-4b99-8336-65082eb7556f', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 20, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '8198f44f-fbf7-4c17-b4c4-b243a78b51c9', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('628cd73e-46e7-4b98-b220-515bd2f34114', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 21, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'a2c86830-5db4-4cd4-99e6-85cdbf9f6979', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('e04e9511-1247-485e-ab75-26b0050d14a6', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 22, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '027c3412-c1ec-4f48-b65f-dc20b20db5c7', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('1ec8ea50-2e20-4a29-8d00-dbe5f8e22c49', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 23, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '9ad96e4c-285c-4b47-baec-ad9606680bff', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('ff189a77-8a02-401f-81f7-70fab67701f3', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 24, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'ebf5d985-02ee-4f64-a43c-c77c683e5479', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('740684e1-0c12-4b69-bbb5-19bd8ca854bb', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 25, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '7b88bd46-2870-4176-b292-ee2fce6fcb44', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('bbdc26b2-d6b1-4ea9-916b-1e4a99e461cb', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 26, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '20e7c481-34ac-4603-bb38-357383c55a9b', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('078dc0d6-46bd-4700-97a6-a2553bcc44e0', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 27, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'e4f95edb-21b6-482b-9b51-1af97edc2341', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('af894629-7c8a-4cae-8520-5d55c83de0f7', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 28, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '5cac0077-63b0-4022-9b7e-228a0391c3f3', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('1ccd1677-5afb-43c7-a2a8-94e241b4b6ae', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 29, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'd25abbef-a7f0-4b6c-98ed-6931e074168b', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('32cd9b7f-43c0-4c97-9d8e-0ddeb7a6dd01', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 30, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'a9e82d5a-4f14-413d-b226-f83f44900f8e', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('253edbb0-bc70-4478-8096-fbe5ed5c3239', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 31, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'c6d96337-5426-494e-a621-1603b0355c6c', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('97093045-54bc-427c-90a2-17f01c1ebbe2', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 32, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '00c04e2a-05e3-4d3f-8da3-fff944605273', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('2333ed74-af01-4721-be04-fbda17af8c9f', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 33, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '57ae3cba-d8dd-4507-a028-c89ea4702f3f', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('e04194a9-c55f-4b51-8823-2ace858d952d', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 34, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '49ec0541-df20-41b4-804c-bbd5f5f96e2f', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('2ce82955-698f-4f69-9f02-a5ae80163438', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 35, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '9ca2928c-add3-4acb-9354-6407fd5c7cd4', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('1d70301e-e17a-47e2-af94-3374c3d9bc05', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 36, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'a8292022-9346-4ea1-837a-8b3d7354a62c', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('fdfb4954-ca92-4e20-9218-bc173b4836ae', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 37, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '8d08acbc-aa83-4a0f-a59f-dece78afd2f1', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('c95577ec-cd06-4a9d-87b1-88c3ba0e0768', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 38, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'a512fb55-b960-4781-8a63-131bdab1184d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('78525fe4-c5f2-4c6f-951a-548e2f1dbf29', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 39, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '078db48b-a8ab-4acf-babc-0e5c8df538fa', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('3adef761-d42b-4641-904a-8aaa9641b1a6', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 40, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, '100fbb76-f62d-46a3-be30-ac79719f9ded', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('b541cc8c-8cd7-4fdb-b1d2-c120c80807e4', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 41, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'ac3442c2-05b9-4d13-a242-ee50caadeb9e', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a'),
+	('74654d38-10ae-4707-b5e1-be5b43cfcbd6', '8476735c-01cc-44b7-9c43-d59370f26f69', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 42, 70.000, 13.966, 20.000, '2026-07-18 16:54:51.24+00', '2026-07-18 16:54:51.24+00', NULL, 'b1848f29-5b8e-4af2-a633-e3979371881d', 'RESERVED', NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a');
+
+
+--
+-- Data for Name: train_sets; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.train_sets VALUES
+	('45cd3f95-b00c-42a8-812a-2c945271c44c', 'b67b7043-d216-4392-8313-7b43452e612d', 1035.200, 642.460, 46, 'DRAFT', '2026-08-07 07:54:42.670851+00', '2026-08-07 08:38:55.927275+00', NULL, '56eec969-55ec-4bc5-aad6-f4b7b6d17292'),
+	('62a426ca-52e7-4359-8a43-a8ac038638db', 'd6907984-bcfb-4408-b823-0fecc284f393', 146.000, 83.796, 6, 'ASSIGNED', '2026-08-07 08:02:18.250869+00', '2026-08-07 11:05:27.931018+00', NULL, '76671a28-3517-4f04-a903-32162959d615'),
+	('7e076f85-0f80-4edc-9787-01129e2e46c4', 'd6907984-bcfb-4408-b823-0fecc284f393', 540.000, 293.286, 21, 'ASSIGNED', '2026-08-06 07:09:19.925174+00', '2026-08-07 12:19:49.496601+00', NULL, '76671a28-3517-4f04-a903-32162959d615'),
+	('6d83b300-aa08-42bf-bcee-f0f1df37cde5', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 200.000, 51.198, 3, 'DISPATCHED', '2026-07-23 12:20:25.037+00', '2026-07-23 12:57:29.218+00', NULL, NULL),
+	('379c7434-f412-4a79-ae2d-e4740c63b49a', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 448.000, 119.462, 7, 'COMPLETED', '2026-07-23 07:53:11.819+00', '2026-07-23 09:28:22.689+00', NULL, NULL),
+	('e877c44e-9292-453d-bb28-616075071bb3', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 21.000, 13.966, 1, 'COMPLETED', '2026-07-23 07:51:41.716+00', '2026-07-23 09:13:52.451+00', NULL, NULL),
+	('f13ddc61-ec01-4991-bb1a-b8b525e2764e', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 1295.000, 324.254, 19, 'ASSIGNED', '2026-07-22 06:29:45.056+00', '2026-07-22 08:37:23.092+00', NULL, NULL),
+	('7b9d83fc-957d-4aed-85a2-7e9b5db111c3', 'dd55e3cc-6acf-4f5d-b85e-2c27d3132db9', 840.000, 642.436, 46, 'COMPLETED', '2026-07-21 08:44:06.202+00', '2026-07-21 13:21:00.98+00', NULL, NULL),
+	('d7604bf1-29ee-40f3-b054-b48f35b5f16f', '2dd03327-d9d5-4a08-af02-e59916ccea97', 0.000, 27.932, 2, 'ASSIGNED', '2026-07-20 11:11:12.51+00', '2026-07-21 06:58:17.167+00', NULL, NULL),
+	('21799060-5741-4416-81b8-0dda9e325e80', '2dd03327-d9d5-4a08-af02-e59916ccea97', 0.000, 41.898, 3, 'COMPLETED', '2026-07-18 06:52:10.897+00', '2026-07-20 06:40:37.847+00', NULL, NULL),
+	('88857e3d-8002-43c2-ba69-6ef2f96f6de7', 'ca503969-35b6-40d4-8787-690fd8715dda', 0.000, 0.000, 0, 'DRAFT', '2026-07-22 11:09:57.907+00', '2026-07-22 11:09:57.907+00', NULL, NULL),
+	('d226d18d-1a48-427b-8e51-236178d65a49', 'ca503969-35b6-40d4-8787-690fd8715dda', 0.000, 740.198, 53, 'COMPLETED', '2026-07-22 13:22:17.957+00', '2026-07-22 13:41:42.795+00', NULL, NULL),
+	('f9fdfe34-cad5-45c0-9d19-91bc0c89ebce', 'ca503969-35b6-40d4-8787-690fd8715dda', 0.000, 27.932, 2, 'COMPLETED', '2026-07-20 12:56:46.918+00', '2026-07-22 11:25:04.125+00', NULL, NULL),
+	('86f76fa6-bfc6-4c03-801c-c37e645c3010', 'ca503969-35b6-40d4-8787-690fd8715dda', 0.000, 0.000, 0, 'DRAFT', '2026-07-21 13:25:30.605+00', '2026-07-22 06:03:06.877+00', NULL, NULL),
+	('065de839-5edb-4a08-ae6e-d1142579fd99', '5eeb26b1-0631-4870-ab4f-352ac49cf8d1', 24.000, 13.966, 1, 'ASSIGNED', '2026-07-21 05:57:50.914+00', '2026-07-23 14:02:20.291+00', NULL, NULL),
+	('fa0d99de-c596-44e0-a137-551cef7399b5', '0b48c5d6-0360-49b1-b4c9-433eb1cd1a87', 0.000, 0.000, 0, 'DRAFT', '2026-07-20 11:37:38.394+00', '2026-07-20 11:37:38.394+00', NULL, NULL),
+	('7ae66722-c16f-43a2-aa0c-1c28c1c81898', 'd6907984-bcfb-4408-b823-0fecc284f393', 0.000, 0.000, 0, 'DRAFT', '2026-08-07 08:01:31.382496+00', '2026-08-07 08:01:31.382496+00', NULL, '76671a28-3517-4f04-a903-32162959d615'),
+	('b8827cf5-99d5-4ecf-8939-1e7ad7e660d0', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0.000, 0.000, 0, 'DRAFT', '2026-07-19 18:49:42.372+00', '2026-07-19 18:49:42.372+00', NULL, NULL),
+	('8476735c-01cc-44b7-9c43-d59370f26f69', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 220.000, 698.300, 50, 'COMPLETED', '2026-07-17 21:34:19.872+00', '2026-07-18 16:58:50.735+00', NULL, NULL),
+	('dfb01a05-181d-4105-87be-d3e7d14bf31c', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0.000, 0.000, 0, 'DRAFT', '2026-07-22 11:01:10.338+00', '2026-07-22 11:01:10.338+00', NULL, NULL),
+	('83a0229a-8975-4b9b-a97f-7b3004215aef', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0.000, 41.898, 3, 'CANCELLED', '2026-07-20 06:58:42.624+00', '2026-07-20 11:16:16.322+00', NULL, NULL),
+	('f3af584a-51cb-4683-b9d0-f6ce3503894e', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0.000, 293.286, 21, 'ASSIGNED', '2026-07-18 17:16:00.198+00', '2026-07-21 17:16:01.803+00', NULL, NULL),
+	('f3e40915-ff4c-4db3-9a45-ca4b2b56fce5', 'a882b4bd-ef9c-4d0b-bba9-3a3197b1fe4b', 0.000, 0.000, 0, 'DRAFT', '2026-07-23 14:51:39.728+00', '2026-07-23 14:51:39.728+00', NULL, NULL),
+	('892ed0d9-60d8-4508-a33c-6e053cf7ddc2', 'b34a62e0-a4a9-4563-83d6-9e2206b74b10', 0.000, 13.966, 1, 'COMPLETED', '2026-07-18 06:22:56.277+00', '2026-07-18 06:44:29.418+00', NULL, NULL),
+	('e505ad7b-7d27-4d6b-bac6-c1ec7d3ca44d', '2dd03327-d9d5-4a08-af02-e59916ccea97', 158.000, 83.796, 6, 'ASSIGNED', '2026-08-01 07:46:34.634417+00', '2026-08-01 09:40:07.41296+00', NULL, NULL),
+	('2a90debe-87e5-4d7f-b03b-ad0dc22899f3', 'd6907984-bcfb-4408-b823-0fecc284f393', 707.580, 418.980, 30, 'ASSIGNED', '2026-08-06 07:07:10.980795+00', '2026-08-07 06:08:41.811777+00', NULL, '76671a28-3517-4f04-a903-32162959d615'),
+	('3b753131-834f-4763-892e-a8f4a8ca837c', 'dc23c9a3-5004-4145-807e-6240b415595e', 448.000, 279.320, 20, 'ASSIGNED', '2026-07-22 07:50:00.012+00', '2026-08-01 08:10:45.555755+00', NULL, NULL),
+	('0c11098b-3d44-44f6-b90a-574e9fabfb40', 'ca503969-35b6-40d4-8787-690fd8715dda', 0.000, 0.000, 0, 'DRAFT', '2026-08-01 08:12:08.843992+00', '2026-08-01 08:12:08.843992+00', NULL, NULL),
+	('6b113c6c-9f5c-4052-a61f-346a7746f641', 'ca503969-35b6-40d4-8787-690fd8715dda', 0.000, 0.000, 0, 'DRAFT', '2026-08-01 13:03:45.741808+00', '2026-08-01 13:03:45.741808+00', NULL, NULL),
+	('13a077a6-56e8-4fc1-997c-342787f814bd', 'ca503969-35b6-40d4-8787-690fd8715dda', 1195.900, 753.980, 53, 'DRAFT', '2026-08-04 06:58:42.499476+00', '2026-08-04 07:11:21.955621+00', NULL, NULL),
+	('43be694a-48fc-4c14-8b13-cded4791ec63', 'ca503969-35b6-40d4-8787-690fd8715dda', 50.000, 79.018, 5, 'ASSIGNED', '2026-08-02 11:57:57.394811+00', '2026-08-02 21:48:51.413136+00', NULL, NULL),
+	('d6f6c9ac-194a-4bd6-844c-667f26b49fea', 'ca503969-35b6-40d4-8787-690fd8715dda', 707.580, 418.980, 30, 'COMPLETED', '2026-08-05 11:18:48.962975+00', '2026-08-05 11:47:31.805259+00', NULL, NULL),
+	('ba774692-e3be-4107-a1e6-6a497950d371', 'ca503969-35b6-40d4-8787-690fd8715dda', 709.500, 418.980, 30, 'CANCELLED', '2026-08-04 11:28:19.986023+00', '2026-08-06 05:33:35.463539+00', NULL, NULL),
+	('37a3cdde-377c-4cbf-ae1f-9571034024e2', 'ca503969-35b6-40d4-8787-690fd8715dda', 564.500, 153.626, 11, 'CANCELLED', '2026-08-04 12:12:58.232085+00', '2026-08-06 05:33:38.619926+00', NULL, NULL),
+	('6838d0a3-66da-434e-8ba1-3597e3948006', '87662a07-2c7b-45c5-a4ff-c89fb9bc105c', 0.000, 0.000, 0, 'DRAFT', '2026-08-07 07:59:41.542479+00', '2026-08-07 07:59:41.542479+00', NULL, '0da257e0-c825-4104-822b-82f27aa2c710'),
+	('bd5ba4e0-ab2b-48d3-acd4-79dc73336793', 'd6907984-bcfb-4408-b823-0fecc284f393', 0.000, 0.000, 0, 'DRAFT', '2026-08-07 08:01:06.455736+00', '2026-08-07 08:01:06.455736+00', NULL, '76671a28-3517-4f04-a903-32162959d615');
+
+
+--
+-- Data for Name: trains; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.trains VALUES
+	('6de97a77-dbf1-4099-92ea-295416ab0d97', 'TR-00004', 3500.00, 'AVAILABLE', NULL, '2026-08-07 08:41:48.883013+00', '2026-08-07 08:41:48.883013+00', NULL, NULL, '498M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9002', '9001'),
+	('7217d519-4204-43ca-aef1-3e86f3ec240b', 'TR-00005', 3500.00, 'AVAILABLE', NULL, '2026-08-07 10:45:57.982977+00', '2026-08-07 10:45:57.982977+00', NULL, NULL, '507M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8202', '8201'),
+	('1064cee0-359d-4fa6-9157-975be624f378', 'TR-00006', 3500.00, 'AVAILABLE', NULL, '2026-08-07 11:20:58.845314+00', '2026-08-07 11:20:58.845314+00', NULL, NULL, '517M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8302', '8301'),
+	('0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 'TR-00007', 3500.00, 'AVAILABLE', NULL, '2026-08-07 12:33:42.219594+00', '2026-08-07 12:33:42.219594+00', NULL, NULL, '509M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8502', '8501'),
+	('2012fe72-e966-404d-a5c4-f43ac0e5a767', 'TR-00008', 3500.00, 'AVAILABLE', NULL, '2026-08-07 13:01:06.938962+00', '2026-08-07 13:01:06.938962+00', NULL, NULL, '496M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8602', '8601'),
+	('91c02bb9-0f91-46ee-9272-9eecf28734d9', 'TR-00009', 3500.00, 'AVAILABLE', NULL, '2026-08-07 13:38:21.83353+00', '2026-08-07 13:38:21.83353+00', NULL, NULL, 'V506M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8702', '8701'),
+	('56eec969-55ec-4bc5-aad6-f4b7b6d17292', 'TR-00002', 3500.00, 'AVAILABLE', NULL, '2026-08-07 07:18:16.026107+00', '2026-08-07 07:54:42.670851+00', NULL, NULL, '497M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8102', '8101'),
+	('0da257e0-c825-4104-822b-82f27aa2c710', 'TR-00003', 3500.00, 'AVAILABLE', NULL, '2026-08-07 07:57:18.217074+00', '2026-08-07 07:59:41.542479+00', NULL, NULL, '0099', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '8402', '8401'),
+	('76671a28-3517-4f04-a903-32162959d615', 'TR-00001', 3500.00, 'AVAILABLE', NULL, '2026-08-06 06:53:26.770184+00', '2026-08-07 08:02:18.250869+00', NULL, NULL, '8001', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8002', '8001'),
+	('de4eac6f-3138-4cd7-a3a3-471fc8807fac', 'TR-00010', 3500.00, 'AVAILABLE', NULL, '2026-08-07 13:59:31.242735+00', '2026-08-07 19:54:54.21487+00', NULL, NULL, 'V531M', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8802', '8801');
+
+
+--
+-- Data for Name: transit_agents; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.transit_agents VALUES
+	('22183a4c-599d-4fcd-a6cc-4b2cbf6ed6de', 'Oriental Transit', '2026-08-06', '2026-12-31', true, '2026-08-06 16:16:11.954564+00', '2026-08-06 16:16:11.954564+00', NULL),
+	('bf658707-6480-4c47-addd-c7cb4e229f0c', 'Universal Cargo', '2026-08-06', '2026-12-31', true, '2026-08-06 16:16:33.630205+00', '2026-08-06 16:16:33.630205+00', NULL),
+	('f9ade730-3f12-412f-87fa-88fc3b6e2d65', 'Melidien Star', '2026-08-06', '2026-12-31', true, '2026-08-06 16:16:58.97166+00', '2026-08-06 16:16:58.97166+00', NULL),
+	('d20f5c7a-d985-4e75-a71a-9d9b2bd4a118', 'Go Transit', '2026-08-06', '2026-12-31', true, '2026-08-06 16:17:18.935579+00', '2026-08-06 16:17:18.935579+00', NULL),
+	('06f9cbb1-e7eb-45fa-8bd7-ad8500988e0f', 'Garani Transit', '2026-08-06', '2026-12-31', true, '2026-08-06 16:17:41.906199+00', '2026-08-06 16:17:41.906199+00', NULL),
+	('58622e22-3c82-442d-9859-1ed692c74c18', 'Houda Transit', '2026-08-06', '2026-12-31', true, '2026-08-06 16:18:02.86518+00', '2026-08-06 16:18:02.86518+00', NULL),
+	('1746df49-ebeb-4060-bed3-7ca8b2bac4c5', 'Djib Transit', '2026-08-06', '2026-12-31', true, '2026-08-06 16:18:27.227506+00', '2026-08-06 16:18:27.227506+00', NULL),
+	('ade2c660-df4f-4832-8fd7-f58e007ff391', 'Roukia Trasnit', '2026-08-06', '2026-12-31', true, '2026-08-06 16:18:44.920704+00', '2026-08-06 16:18:44.920704+00', NULL);
+
+
+--
+-- Data for Name: truck_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.truck_types VALUES
+	('222fa042-636e-4d72-8fe0-17f9ff850857', 'BUS', 'Bus', NULL, false, NULL, true, '2026-07-27 11:32:03.969479+00', '2026-08-04 08:24:14.32059+00', '2026-08-04 08:24:14.32059+00'),
+	('675bbcea-12e5-474e-b256-f2f914fbb885', 'CAR', 'Car', NULL, false, NULL, true, '2026-07-27 11:32:03.969479+00', '2026-08-04 08:24:18.956021+00', '2026-08-04 08:24:18.956021+00'),
+	('118c3347-e94f-4b72-95b8-d084419419fd', 'CASONI', 'Casoni (rigid, no trailer)', NULL, false, NULL, true, '2026-07-27 11:32:03.969479+00', '2026-08-04 08:24:27.95239+00', '2026-08-04 08:24:27.95239+00'),
+	('5ab50abe-c574-4a28-9c2a-4df2b42c736d', 'VAN', 'Van', NULL, false, NULL, true, '2026-07-27 11:32:03.969479+00', '2026-08-04 08:24:35.713145+00', '2026-08-04 08:24:35.713145+00'),
+	('77e54cee-d496-4ae6-8df5-1f320d27176b', 'FLATBED', 'Flatbed', NULL, true, NULL, true, '2026-07-27 11:32:03.969479+00', '2026-08-04 08:24:43.952177+00', '2026-08-04 08:24:43.952177+00'),
+	('04bf40e6-4a13-4e40-9f08-3c6a7c152ea8', 'TANKER', 'Tanker', NULL, true, NULL, true, '2026-07-27 11:32:03.969479+00', '2026-08-04 08:24:49.551548+00', '2026-08-04 08:24:49.551548+00'),
+	('1df6f451-aadf-4164-978c-8575305625bd', 'DOUBLE TRAILER TRUCK', 'Double Trailer Truck', NULL, true, 'It has extra trailer', true, '2026-07-27 11:32:03.969479+00', '2026-08-05 12:41:59.49181+00', '2026-08-05 12:41:59.49181+00'),
+	('6dec4dd6-49cd-4cad-b637-631296dd58dd', 'TRAILER TRUCK', 'Trailer Truck', NULL, false, 'A single trailer truck', true, '2026-07-27 11:32:03.969479+00', '2026-08-05 12:42:03.155022+00', '2026-08-05 12:42:03.155022+00'),
+	('826a6d51-379d-43d5-951a-8b2447f701c6', 'HEAVY', 'Heavy Truck', 50.000, true, NULL, true, '2026-08-05 12:43:56.050373+00', '2026-08-05 14:38:42.855394+00', NULL),
+	('c350f58b-d6a2-4c08-be11-ffa07c72de7c', 'HIGHBED', 'Highbed', 40.000, false, NULL, true, '2026-08-07 19:40:26.647308+00', '2026-08-07 19:42:20.571018+00', '2026-08-07 19:42:20.571018+00');
+
+
+--
+-- Data for Name: user_trade_access; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: vehicles; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.vehicles VALUES
+	('294bc25c-95ca-4675-bee6-e872fdf8b4fb', 'AA-45866', 'REG-HEAVY-1785940245891', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 14:30:45.891293', '2026-08-05 17:42:45.9581', NULL, NULL, NULL, '03-ET', NULL, 'AA-43470', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('92513375-9583-4744-81e6-e1e68ea7082d', 'AA-45853', 'REG-HEAVY-1785940417882', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 14:33:37.882901', '2026-08-05 17:43:09.646499', NULL, NULL, NULL, '03-ET', NULL, 'AA-43508', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('95e19092-3412-4458-a28b-c0572e0c2c42', 'AA-45842', 'REG-HEAVY-1785945951782', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:05:51.782353', '2026-08-05 16:05:51.782353', NULL, NULL, NULL, '03-ET', NULL, 'AA-43478', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('84ca7af7-b994-469a-b521-4db3f1963ba4', 'AA-45833', 'REG-HEAVY-1785947559192', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:32:39.192822', '2026-08-05 16:32:39.192822', NULL, NULL, NULL, '03-ET', NULL, 'AA-43466', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('c905c143-315f-4e2c-b6e8-cdb56f9b3088', 'AA-45858', 'REG-HEAVY-1785947735958', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:35:35.958595', '2026-08-05 16:35:35.958595', NULL, NULL, NULL, '03-ET', NULL, 'AA-43496', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('91bb9f54-77a8-47a5-b432-cb60440ba4ba', 'AA-45819', 'REG-HEAVY-1785947809032', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:36:49.032955', '2026-08-05 16:36:49.032955', NULL, NULL, NULL, '03-ET', NULL, 'AA-43474', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('7a33a5de-9da3-4d54-834b-6be2fc99b3a8', 'AA-45834', 'REG-HEAVY-1785947887849', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:38:07.849179', '2026-08-05 16:38:07.849179', NULL, NULL, NULL, '03-ET', NULL, 'AA-43502', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('ac8f6961-d6cf-46aa-b4d1-de0b87374f96', 'AA-45868', 'REG-HEAVY-1785947977832', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:39:37.832321', '2026-08-05 16:39:37.832321', NULL, NULL, NULL, '03-ET', NULL, 'AA-43469', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('33f63787-6f30-4dcd-a112-1cc544599c20', 'AA-45831', 'REG-HEAVY-1785948104873', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:41:44.874099', '2026-08-05 16:41:44.874099', NULL, NULL, NULL, '03-ET', NULL, 'AA-43488', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('c113c9b1-25ab-445a-b4bd-9c72bd22cfb2', 'AA-45828', 'REG-HEAVY-1785948218792', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:43:38.793298', '2026-08-05 16:43:38.793298', NULL, NULL, NULL, '03-ET', NULL, 'AA-43479', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('93df8793-a138-4c21-a807-34907ae051a5', 'AA-45850', 'REG-HEAVY-1785948296254', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:44:56.254752', '2026-08-05 16:44:56.254752', NULL, NULL, NULL, '03-ET', NULL, 'AA-43505', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('87b9e7e5-bc57-45a4-a934-c4f55224fbdc', 'AA-45823', 'REG-HEAVY-1785948343225', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:45:43.225759', '2026-08-05 16:45:43.225759', NULL, NULL, NULL, '03-ET', NULL, 'AA-43480', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('cb5e81f6-2211-4336-8431-6f37e37c0da4', 'AA-45838', 'REG-HEAVY-1785948388778', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:46:28.778481', '2026-08-05 16:46:28.778481', NULL, NULL, NULL, '03-ET', NULL, 'AA-43472', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('aaaa9f71-dcd8-452a-b911-44f18aa234c6', 'AA-45854', 'REG-HEAVY-1785948437778', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:47:17.778816', '2026-08-05 16:47:17.778816', NULL, NULL, NULL, '03-ET', NULL, 'AA-43500', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('5224eb6d-54e5-4c36-8505-ffbd074f3cbf', 'AA-45839', 'REG-HEAVY-1785948504740', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:48:24.741209', '2026-08-05 16:48:24.741209', NULL, NULL, NULL, '03-ET', NULL, 'AA-43486', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('4966dadd-bc41-4b15-a2e0-a31e9bd3c2d8', 'AA-45861', 'REG-HEAVY-1785948776746', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:52:56.746696', '2026-08-05 16:52:56.746696', NULL, NULL, NULL, '03-ET', NULL, 'AA-43513', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('d949060c-fea5-4961-959b-b3a2ac42087c', 'AA-45830', 'REG-HEAVY-1785948846938', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:54:06.938701', '2026-08-05 16:54:06.938701', NULL, NULL, NULL, '03-ET', NULL, 'AA-43501', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('8ca7c3ef-7fae-4b4c-a194-2f20bdd16130', 'AA-45826', 'REG-HEAVY-1785948896138', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:54:56.13877', '2026-08-05 16:54:56.13877', NULL, NULL, NULL, '03-ET', NULL, 'AA-43498', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('c571c4cc-2f86-4c08-8f69-dddf15ae945b', 'AA-45836', 'REG-HEAVY-1785949178249', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:59:38.249653', '2026-08-05 16:59:38.249653', NULL, NULL, NULL, '03-ET', NULL, 'AA-43467', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('a6278d2b-7cb7-4b6a-9983-c38702ded81d', 'AA-45822', 'REG-HEAVY-1785949414993', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:03:34.99402', '2026-08-05 17:03:34.99402', NULL, NULL, NULL, '03-ET', NULL, 'AA-43512', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('bc65640b-400e-4102-9847-93fe19dfda5f', 'AA-45821', 'REG-HEAVY-1785949471076', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:04:31.076688', '2026-08-05 17:04:31.076688', NULL, NULL, NULL, '03-ET', NULL, 'AA-43210', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('f3da22a3-b16a-4915-a5d6-81d8df259673', 'AA-45837', 'REG-HEAVY-1785949543305', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:05:43.306141', '2026-08-05 17:05:43.306141', NULL, NULL, NULL, '03-ET', NULL, 'AA-43475', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('7e64a16b-2ff1-4fef-b667-719f2a5006a6', 'AA-45860', 'REG-HEAVY-1785949604177', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:06:44.1779', '2026-08-05 17:06:44.1779', NULL, NULL, NULL, '03-ET', NULL, 'AA-43497', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('cffd972a-daed-4305-9c40-3fb5b917022d', 'AA-45863', 'REG-HEAVY-1785949681245', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:08:01.246008', '2026-08-05 17:08:01.246008', NULL, NULL, NULL, '03-ET', NULL, 'AA-43477', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('11341e3a-1002-45f3-9e18-f4ebfca88e7e', 'AA-45825', 'REG-HEAVY-1785949735443', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:08:55.443161', '2026-08-05 17:08:55.443161', NULL, NULL, NULL, '03-ET', NULL, 'AA-43483', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('913599ef-7e19-4b9a-92cd-36ec2f657bf5', 'AA-45829', 'REG-HEAVY-1785949786016', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:09:46.016391', '2026-08-05 17:09:46.016391', NULL, NULL, NULL, '03-ET', NULL, 'AA-43473', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('5a6b8e20-12b8-44ec-ada6-0ee1eea1cd8e', 'AA-45824', 'REG-HEAVY-1785949909688', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:11:49.68894', '2026-08-05 17:11:49.68894', NULL, NULL, NULL, '03-ET', NULL, 'AA-43491', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('49122e35-3c86-4dd1-893e-830372239adb', 'AA-45849', 'REG-HEAVY-1785941012270', 'HEAVY', 'Volvo Group', 'Volvo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 14:43:32.270726', '2026-08-05 17:44:12.176468', NULL, NULL, NULL, '03-ET', NULL, 'AA-43414', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('49f3a4f2-b177-4123-a7a9-871781ff663b', 'AA-45845', 'REG-HEAVY-1785945627614', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:00:27.615063', '2026-08-05 17:44:34.219249', NULL, NULL, NULL, '03-ET', NULL, 'AA-43492', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('ab8cc367-eb4a-4de8-8be3-7a2ca6df340a', 'AA-45820', 'REG-HEAVY-1785945856499', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:04:16.499977', '2026-08-05 17:44:56.314949', NULL, NULL, NULL, '03-ET', NULL, 'AA-43487', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('97491a2f-f511-48a9-a150-1d5e498ea89e', 'AA-45855', 'REG-HEAVY-1785947341353', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:29:01.35408', '2026-08-05 17:45:28.960114', NULL, NULL, NULL, '03-ET', NULL, 'AA-43485', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('a0733ec0-c636-49d5-a903-bda3ef3a2371', 'AA-45865', 'REG-HEAVY-1785946970131', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:22:50.131595', '2026-08-05 17:45:42.680673', NULL, NULL, NULL, '03-ET', NULL, 'AA-43490', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('06828fba-de91-4ec1-9664-037e5e9b3fd5', 'AA-45856', 'REG-HEAVY-1785946754244', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:19:14.244671', '2026-08-05 17:45:55.804217', NULL, NULL, NULL, '03-ET', NULL, 'AA-43510', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('04a31aab-2ad8-4b77-b1ec-8c5da70bdbe6', 'AA-45832', 'REG-HEAVY-1785946581009', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:16:21.01016', '2026-08-05 17:46:21.217077', NULL, NULL, NULL, '03-ET', NULL, 'AA-43504', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('fa416fbd-441d-4348-803f-b197527dad83', 'AA-45841', 'REG-HEAVY-1785946483432', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:14:43.432561', '2026-08-05 17:46:42.009675', NULL, NULL, NULL, '03-ET', NULL, 'AA-43515', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('d15a78d0-dead-4ccc-9e9b-3a32ed0926e3', 'AA-45840', 'REG-HEAVY-1785947406180', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:30:06.180913', '2026-08-05 17:47:15.727452', NULL, NULL, NULL, '03-ET', NULL, 'AA-43499', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('c2662107-ce84-4de1-b142-3fef6aea370a', 'AA-45867', 'REG-HEAVY-1785947474272', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 16:31:14.273117', '2026-08-05 17:47:35.236709', NULL, NULL, NULL, '03-ET', NULL, 'AA-43493', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('6ef488d3-4f44-47ad-b49d-3d9d851ff892', 'AA-45827', 'REG-HEAVY-1785950061004', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:14:21.004228', '2026-08-05 17:14:21.004228', NULL, NULL, NULL, '03-ET', NULL, 'AA-43468', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('5af07fa9-32b2-43e8-b30e-a2f90826f1b0', 'AA-45847', 'REG-HEAVY-1785950279277', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:17:59.278068', '2026-08-05 17:17:59.278068', NULL, NULL, NULL, '03-ET', NULL, 'AA-43511', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('42c60171-8b07-4019-a30a-9b4c48a6ba75', 'AA-45852', 'REG-HEAVY-1785950337333', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:18:57.333665', '2026-08-05 17:18:57.333665', NULL, NULL, NULL, '03-ET', NULL, 'AA-43484', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('39c84f4a-b615-420d-a0d1-8a4f33259864', 'AA-45835', 'REG-HEAVY-1785950434197', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:20:34.197992', '2026-08-05 17:20:34.197992', NULL, NULL, NULL, '03-ET', NULL, 'AA-43482', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('36ce4dc0-3d15-41e2-a4c9-a82262bb9cbe', 'AA-45864', 'REG-HEAVY-1785950509196', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:21:49.196196', '2026-08-05 17:21:49.196196', NULL, NULL, NULL, '03-ET', NULL, 'AA-43503', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('20ecc5a2-6c14-47b6-92ea-c12b15b636f0', 'AA-45862', 'REG-HEAVY-1785950652993', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:24:12.993877', '2026-08-05 17:24:12.993877', NULL, NULL, NULL, '03-ET', NULL, 'AA-43465', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('5264b2f3-447e-4406-9c4d-907f2034318e', 'AA-39097', 'REG-HEAVY-1785950970773', 'HEAVY', 'Volvo Group', 'Vovlo FH440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:29:30.773227', '2026-08-05 17:29:30.773227', NULL, NULL, NULL, '03-ET', NULL, 'AA-41226', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('2e9b8489-1196-4a42-a32f-e49348da5b49', 'AA-39104', 'REG-HEAVY-1785951021890', 'HEAVY', 'Volvo Group', 'Vovlo FH440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:30:21.89106', '2026-08-05 17:30:21.89106', NULL, NULL, NULL, '03-ET', NULL, 'AA-41225', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('83c05b69-2248-4a54-b3d1-eec4e1a42008', 'AA-39103', 'REG-HEAVY-1785951063602', 'HEAVY', 'Volvo Group', 'Vovlo FH440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:31:03.602472', '2026-08-05 17:31:03.602472', NULL, NULL, NULL, '03-ET', NULL, 'AA-41223', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('e36d1b03-048f-4d4d-810c-da79e9a4d054', 'AA-39106', 'REG-HEAVY-1785951110010', 'HEAVY', 'Volvo Group ', 'Vovlo FH440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:31:50.010618', '2026-08-05 17:31:50.010618', NULL, NULL, NULL, '03-ET', NULL, 'AA-41221', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('76bc369c-b36e-479b-b72c-35f0bb127c7f', 'AA-39107', 'REG-HEAVY-1785951166931', 'HEAVY', 'Volvo Group', 'Vovlo FH440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:32:46.932109', '2026-08-05 17:32:46.932109', NULL, NULL, NULL, '03-ET', NULL, 'AA-41215', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('5e400431-1829-4cf6-bdfa-9db95fec4244', 'AA-39094', 'REG-HEAVY-1785951215832', 'HEAVY', 'Volvo Group', 'Vovlo FH440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:33:35.832423', '2026-08-05 17:33:35.832423', NULL, NULL, NULL, '03-ET', NULL, 'AA-41222', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('9e02e13c-5b92-46e1-a749-38531079078c', 'AA-39099', 'REG-HEAVY-1785951298883', 'HEAVY', 'Volvo Group', 'Vovlo FH410', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:34:58.883876', '2026-08-05 17:34:58.883876', NULL, NULL, NULL, '03-ET', NULL, 'AA-41216', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('dad2ffc9-9bab-4e55-a761-e850bbe5f371', 'AA-39092', 'REG-HEAVY-1785951426439', 'HEAVY', 'Volvo Group', 'Vovlo FH410', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:37:06.439354', '2026-08-05 17:37:06.439354', NULL, NULL, NULL, '03-ET', NULL, 'AA-41224', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('f9e21b8a-fdce-4242-944c-e518f21fc0f9', 'AA-31801', 'REG-HEAVY-1785951502365', 'HEAVY', 'Volvo Group', 'Vovlo FH410', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:38:22.365604', '2026-08-05 17:38:22.365604', NULL, NULL, NULL, '03-ET', NULL, 'AA-41214', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('2c03bce2-6508-485c-b843-50b4fe2220d0', 'AA-39098', 'REG-HEAVY-1785950761306', 'HEAVY', 'Volvo Group', 'Vovlo FH400', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:26:01.306401', '2026-08-05 17:39:59.263282', NULL, NULL, NULL, '03-ET', NULL, 'AA-41220', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('8162f80b-70c1-4564-9e14-19b3354e1b32', 'AA-39105', 'REG-HEAVY-1785950715202', 'HEAVY', 'Volvo Group', 'Vovlo FH400', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:25:15.202682', '2026-08-05 17:40:40.607501', NULL, NULL, NULL, '03-ET', NULL, 'AA-41218', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('c6e0343a-56a0-432b-aa8f-b3b85626d81c', 'AA-45843', 'REG-HEAVY-1785940178746', 'HEAVY', 'Volvo Group', 'Vovol FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 14:29:38.746433', '2026-08-05 17:42:08.985513', NULL, NULL, NULL, '03-ET', NULL, 'AA-43495', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('d90a158b-09b0-43c6-ace4-beb337505d97', 'AA-45857', 'REG-HEAVY-1785949959720', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:12:39.720333', '2026-08-05 17:48:02.848168', NULL, NULL, NULL, '03-ET', NULL, 'AA-43481', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('14302866-dcf2-435a-8f9b-523559bfd88e', 'AA-45851', 'REG-HEAVY-1785950006234', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:13:26.234976', '2026-08-05 17:48:16.462785', NULL, NULL, NULL, '03-ET', NULL, 'AA-43509', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('dcf2910c-be05-4841-9b41-065d0179409e', 'AA-45844', 'REG-HEAVY-1785950379084', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:19:39.084165', '2026-08-05 17:49:18.334067', NULL, NULL, NULL, '03-ET', NULL, 'AA-43476', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('6ebd1d6b-6328-4534-9aca-f5b8bf9c6a60', 'AA-45848', 'REG-HEAVY-1785950601085', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:23:21.0854', '2026-08-05 17:49:32.328326', NULL, NULL, NULL, '03-ET', NULL, 'AA-43494', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('5a229b50-b651-40fc-a61a-cc461e2284c4', 'AA-29900', 'REG-HEAVY-1785950865626', 'HEAVY', 'Volvo Group', 'Vovlo FH440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:27:45.626988', '2026-08-05 18:05:11.063405', NULL, NULL, NULL, '03-ET', NULL, 'AA-41865', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('8b12b9c5-456d-47dd-aba8-f4e867a25053', 'AA-45846', 'REG-HEAVY-1785950233138', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:17:13.139035', '2026-08-05 18:05:46.668638', NULL, NULL, NULL, '03-ET', NULL, 'AA-43471', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6'),
+	('4da7a933-b753-4998-a2ea-811850568248', 'AA-45859', 'REG-HEAVY-1785950134405', 'HEAVY', 'Volvo Group', 'Vovlo FMX440', 2026, 'DIESEL', 50, 'ACTIVE', NULL, '2026-08-05 17:15:34.405988', '2026-08-05 18:06:21.42113', NULL, NULL, NULL, '03-ET', NULL, 'AA-43887', NULL, NULL, NULL, 'FREE', NULL, 'OWNED', NULL, NULL, NULL, 0.00, 'ETB', '826a6d51-379d-43d5-951a-8b2447f701c6');
+
+
+--
+-- Data for Name: vendors; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: wagon_allocation_bulk_loads; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: wagon_allocation_container_items; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: wagon_booking_allocations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: wagon_movements; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: wagon_status_logs; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: wagon_transfer_requests; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: wagon_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.wagon_types VALUES
+	('f4ba54be-002f-46cb-af7c-ff55ed84dcdd', 'NW7', 'Double deck sedan wagon', 22.000, 26.066, '{vehicles,sedan}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, NULL, 37.100, false, NULL),
+	('8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'NW5', 'Flat wagon', 70.000, 13.966, '{container,steel,machinery}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, 1.300, 22.400, true, 30.480),
+	('8eec3a7d-8482-4397-96b6-59a028210722', 'PW2', 'Box wagon', 70.000, 17.066, '{"general cargo","break bulk"}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, 1.600, 25.200, false, NULL),
+	('07c38e9a-7627-4be9-af41-7651957aca3d', 'GW2', 'Tank wagon', 70.000, 12.228, '{liquid,fuel}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, NULL, 23.000, false, NULL),
+	('efed186d-7062-4b0f-b3fe-6e793accc364', 'CW3', 'Gondola open wagon', 70.000, 13.976, '{"open bulk cargo"}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, 1.300, 23.400, false, NULL),
+	('df1708d4-35dd-4ce2-aa73-f5061e534df7', 'KW2', 'Hopper covered wagon', 69.000, 16.466, '{"bulk grains"}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, 1.500, 25.200, false, NULL),
+	('32b8a35f-5792-4c46-aa4f-ca22187faf18', 'KW3', 'Hopper wagon open', 70.000, 14.400, '{coal,"bulk cargo"}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, NULL, 24.000, false, NULL),
+	('4f65adc3-baf7-44de-88ad-0a4672fab669', 'NW6', 'Flat wagon (long)', 70.000, 18.560, '{"long cargo"}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, NULL, 25.300, false, NULL),
+	('c900bae3-cc3d-449b-9e8d-e66944ee74b0', 'BW1', 'Refrigerated wagon', 38.000, 21.996, '{"refrigerated cargo"}', true, '2026-07-27 11:31:59.903847+00', '2026-07-27 11:32:00.801951+00', NULL, NULL, 32.100, false, NULL),
+	('bcfcc533-01be-4e82-952c-26e20e7ecdfc', 'CW4', 'Gondola covered wagon', 70.000, 13.976, '{"covered bulk cargo"}', true, '2026-07-27 11:31:59.903847+00', '2026-08-05 12:59:33.82813+00', NULL, 1.300, 24.800, false, NULL);
+
+
+--
+-- Data for Name: wagons; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.wagons VALUES
+	('7589b56c-a055-4592-a0ab-ac963c2e46df', 'ER0064', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:32:54.850734+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('83cd6274-9dda-44fc-9324-c87c5e81b676', 'ER0399', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 54, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 07:00:11.969232+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '9001', '9002'),
+	('f1df3f40-9a47-4302-93af-417d3d4f941c', 'ER0812', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('9b64ee0a-adfc-4d82-a7c5-41166bce1ae2', 'ER0776', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('8ecb831d-4d07-4c56-b46c-d8fb7aff20d2', 'ER0391', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0da257e0-c825-4104-822b-82f27aa2c710', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:59:08.183485+00', NULL, NULL, NULL, NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '8401', '8402'),
+	('c00f78c4-e526-4272-953d-4d8c62c464ac', 'ER0392', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0da257e0-c825-4104-822b-82f27aa2c710', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:59:08.183485+00', NULL, NULL, NULL, NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '8401', '8402'),
+	('c78aa6de-de54-49ca-923f-ee70c4ed82d0', 'ER1061', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('76e2c47d-a2a2-4266-af1a-cd7f4ed1c568', 'ER0698', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('984a5545-0135-4220-9d78-c3f64809edb6', 'ER0662', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('17c88efc-8411-4bd1-8417-8cb00dff43a4', 'ER0888', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('2521705d-6dae-4515-8b38-0f2b3c53ee27', 'ER0918', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('aaf0da7f-0c43-44a6-bd9e-9f0f05f69674', 'ER0684', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('4ee289d0-aa53-45e8-bcfa-4523d27ae5e2', 'ER0907', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('be750157-c923-4ac9-88b8-7c3e75644fcc', 'ER0397', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:07:20.92502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8401', '8402'),
+	('74946adf-0358-44d7-bc36-3e48e770293d', 'ER0839', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('c2049a62-06d5-4c21-aa26-45a0740cae52', 'ER0799', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('5cac0077-63b0-4022-9b7e-228a0391c3f3', 'ER0440', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:53:42.28848+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8001', '8002'),
+	('08337459-21c8-4fe3-97df-f956ec302a08', 'ER0833', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('e67c23fe-6a8f-4139-b67c-8114da07942e', 'ER0733', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('149369d2-4934-401e-92a8-fafc960ce908', 'ER0822', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('2c2c8388-1235-419f-ab5c-4ef78864f593', 'ER0845', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('6fa0b8bb-391d-4efe-a8db-1f78588aee7c', 'ER0771', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('e0c19bcb-2307-4d41-bedc-30a5365e6f00', 'ER0642', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('48f7254e-cc18-441f-8dc1-27dc40f08274', 'ER0794', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('64674c81-6883-4bcb-95cf-4f4ff511d66b', 'ER0906', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('64a5464f-e4c3-4da7-a430-4dd6fa511821', 'ER0933', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 44, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('a969568a-28f1-4739-8a5d-7eca54191f37', 'ER0560', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:44:50.129217+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('e32c1be3-1cf3-442d-9815-bcccb2bc950c', 'ER0665', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:49:30.893536+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('87dfa041-d705-49f2-a638-0ff6095416f1', 'ER0285', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '6de97a77-dbf1-4099-92ea-295416ab0d97', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('f8e2efe7-8f72-4ced-9485-760f7e16b816', 'ER0393', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8401', '8402'),
+	('f6463fb1-5e59-4eab-a3e5-dfb2ba9f51e0', 'ER0394', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8701', '8702'),
+	('ae484bb2-59f3-4be3-b73e-3615ed8239fc', 'ER0395', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8501', '8502'),
+	('746dfb2c-9cc1-4475-b110-bd0d5efa31b8', 'ER0396', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8301', '8302'),
+	('f5bf1b94-6dc1-4be2-89a5-538cc18f919a', 'ER0446', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '9001', '9002'),
+	('26d88847-dc9b-4576-89ef-e40310e4945c', 'ER0298', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:56:11.67273+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('6a921f17-1659-4d8e-aa57-ecde72fa7a19', 'ER0398', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:37:04.758507+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('4270c552-247e-4db9-9238-10373eeafa12', 'ER0327', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:56:19.162876+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('0e09350d-9391-4c3c-8eb8-ae3d716acdcf', 'ER0337', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:56:20.845136+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('f2811697-8e8c-4a73-88aa-8794bc5fc2af', 'ER0259', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:56:00.383354+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('db06d53b-b72b-44d5-9450-2fe197b21a6e', 'ER0477', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:44.395814+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('7a9c1b32-476c-467d-9eba-effe7ace37fe', 'ER0270', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:56:01.985976+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('380475a8-bf43-4006-b5fb-46e33f91c1e8', 'ER1063', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:22.160926+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('d136d19c-2117-4981-8bb4-1491c7ebaa10', 'ER1071', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:27.451347+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('d92aa144-c48b-4f30-a7f3-524ce5b75ea2', 'ER1068', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:26.242867+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('b56b499d-0cde-4828-adb7-fb7bafe11927', 'ER1072', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:27.917251+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('48d741b2-c640-4956-83c8-2a7467bde43b', 'ER1066', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:25.044419+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('d1a2bde8-f7f6-44ed-a65c-10dd3ec843fa', 'ER1069', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:26.629759+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('15251738-b62d-406f-923e-b04c99b014d8', 'ER1064', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:22.965156+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('eabf854d-ea57-4564-947f-f34de60d8d96', 'ER1062', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:21.468745+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('7b58ef62-2f65-4568-aef4-a0a425833c7d', 'ER1070', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:27.075756+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('3e12631f-2d97-446e-8cb1-7255a1a2cc32', 'ER1067', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:25.704768+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('1105c370-3244-48cd-a994-5f2e9bfbc33e', 'ER1065', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:23.860881+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('5daa57bd-10ee-4e5f-a73a-45357b43e0a8', 'ER0430', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8201', '8202'),
+	('d3779672-5f85-4a03-a437-7ef6ec2097b2', 'ER0429', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8701', '8702'),
+	('c4283259-924e-45ea-9813-988b49b6b408', 'ER0420', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:40.372294+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8301', '8302'),
+	('f2f814f2-18ab-4ece-9ab2-2184c919b948', 'ER0418', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:40.372294+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8501', '8502'),
+	('a9501326-1a51-4791-a61d-01ae3deefec9', 'ER0417', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:40.372294+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8501', '8502'),
+	('ed6cddbf-950c-42b9-892c-d109951f09bc', 'ER0416', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 44, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:40.372294+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('271fef46-5a35-48ce-bdae-65608f4a66b2', 'ER0349', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:10:45.858773+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('1a29c026-8a2d-4fb2-ad6b-92d8a3058618', 'ER0747', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('590d477b-9751-4aba-838c-2a1a9dced6b8', 'ER0654', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('8ffd20fe-81a8-4de6-84bf-59b8070f5ce8', 'ER0752', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('23281ae2-8dee-4d45-a6d4-5f350d249185', 'ER0725', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('f076aed6-2aa5-4efc-b98b-e5d8a06fe959', 'ER0537', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('501a9fd6-16bb-4bb8-8031-9b9bcb95ae08', 'ER0490', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:51.504982+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('d4812df8-4b4c-4da5-8b89-51914bebe2fa', 'ER0570', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:54.83142+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('06b1543e-22cf-49f1-9f68-3d4dceed5942', 'ER0917', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('a48b2a69-327e-42d1-ba31-72c1040e3889', 'ER0766', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('fe1f224e-4bfe-4e6f-a14b-3593781b2048', 'ER0651', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:02.616217+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('9867529a-f3f6-4b4e-8d4c-58a989504488', 'ER0703', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:38:50.856073+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('5285d2f5-f84a-42b1-b5bc-0a82460c55a3', 'ER0728', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('da06f333-4919-4d50-97da-234b1e7c0819', 'ER0830', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('d6a107c7-3ab3-44de-b164-940495e0363c', 'ER0804', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('20fd7be1-d93f-4f3e-ab06-b35b7b3299e2', 'ER0935', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('9c8f2591-8800-4af1-8f0c-7782497fc08e', 'ER0898', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('b1bf9a27-65b1-4eed-ad32-75c461ad72f7', 'ER0577', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('6359bcab-6f2c-4709-b534-456e771d34ff', 'ER0762', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('5c059ddf-a486-414a-81cf-aeb384ef7323', 'ER0531', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 49, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:52:17.689086+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('fc05a483-69b4-4383-bfd2-c4a355a4476a', 'ER1077', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:30.227601+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('44b5f9b4-7cad-4395-af0c-4f47c136f117', 'ER1078', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:30.89219+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('ad3bb5de-2442-4c23-8bdd-afbcd897fb3f', 'ER0620', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:00.066443+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('2dc260e0-b0db-487e-8d14-f4657f43a38e', 'ER0668', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:03.734582+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('cd2b2696-b906-4ab1-89dc-308c1e82d8e8', 'ER0592', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:58.343161+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('7eaf1869-b77a-4f92-88ce-b41efcb2c692', 'ER0746', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('d3970a5c-2cf9-4fe6-98e9-9c3d97d4c349', 'ER0676', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('bba47e68-5078-4779-914c-bbea0bbf235b', 'ER0697', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('9511df0b-87ea-4f19-a770-4ea9a27004dd', 'ER1079', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('993f8b96-0ea7-4ff3-9f9b-c343fe193215', 'ER0723', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('0e3bd177-a865-4492-ae58-ade734cccf33', 'ER0574', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:56.416705+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('408b14c4-0660-4004-8beb-e0859debac28', 'ER0529', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:52.961017+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('0377dd35-bc94-4fea-9e02-9600e433e5ab', 'ER0489', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:49.753326+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('535c5201-6d10-4142-9e1e-c249b1f9d53f', 'ER0623', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:01.005029+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('9de95d0d-4a79-4afe-96f6-501ac942bf97', 'ER0631', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:01.782724+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('067ee0e2-a4d4-4e07-b621-624b163ad849', 'ER0617', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:59.274847+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('ce40f507-8d26-4ad3-bd59-c7e093910ecd', 'ER0576', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:01:57.402048+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('7b88bd46-2870-4176-b292-ee2fce6fcb44', 'ER0419', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('5067bbde-7756-4ccd-b95f-654baba240c0', 'ER0635', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('04feda04-6dcb-4d27-b6bf-458d9318e0c2', 'ER0650', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('4065b9e5-f6ce-4df5-b324-1081c0247d4c', 'ER0656', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('d9f29503-3906-4d20-bff5-447ebe355b61', 'ER0660', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('aabc4d3e-ac83-42c3-b348-080db47539b7', 'ER0663', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('e2bfa882-d653-4b30-aa33-e7b20698636d', 'ER0666', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('85e05351-b076-4121-b7b1-e07863f69f31', 'ER0435', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8101', '8102'),
+	('8b068c04-b5d1-4f63-b404-168fb57305af', 'ER0724', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('acf1bac1-9c4e-429e-999f-7c8e596dee6b', 'ER1073', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:28.392365+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('f910cc5c-33b3-4fd3-ae85-0f7bb6742ce0', 'ER0846', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('18f0bc2d-1ce6-4e4b-be1e-a5542b86afcf', 'ER0863', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('5e0d1098-804d-4f4a-a040-c1a4988a53e5', 'ER0925', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('0e7da7e1-2123-4391-9668-afc3f68b538e', 'ER1075', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:29.330576+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('72d8722d-a743-466a-b1c2-d6d8f976aa9d', 'ER0821', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('c09332f5-dc76-4778-8394-0fd37d5afbb1', 'ER0914', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('5f7b60b5-1680-466c-b4fd-fc32074d6e3d', 'ER1076', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:29.745184+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('357af64c-a831-4cc3-bb63-47debd125e1c', 'ER0768', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('06cdef17-d0e8-4588-b712-9eafd9a9ac02', 'ER0923', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('f0a0d86a-da0b-45d0-83ef-19b3fbaf0187', 'ER0800', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('e0e2003a-25d7-4a05-bd56-2e24ca1bf0ed', 'ER0844', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('a1194639-cfc0-472f-9b54-123eae6dee0c', 'ER0838', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('1aaeadd7-2f1a-4987-a552-477e84e3a239', 'ER0920', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('59397547-608d-4555-8e01-40be03e6abe9', 'ER0843', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('f87b1411-b079-4052-ab70-0ed1821393be', 'ER0760', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 46, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('86a04901-3c50-44ef-97f4-a97227741801', 'ER0517', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 44, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:45:00.720875+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('57c3f687-1c0d-4a29-9060-db38b3a533e6', 'ER0695', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:39:19.160283+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('c0eafaa7-85f4-4568-a3cb-09754f196592', 'ER1080', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('be722b60-e4b0-43e6-ab22-dea46593421e', 'ER0852', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:38:53.34555+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('c21f9988-2ec4-479a-9206-35d344580453', 'ER0880', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:38:55.927275+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('bf38dfda-c3b1-479b-b448-12b4a7755554', 'ER0536', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('a83c2c28-b229-4275-aa45-7ba49e5e8042', 'ER0674', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('de9ef3bd-712b-4f34-8f25-0d6a51833074', 'ER0692', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('b32de37c-e462-4a7b-aeb0-f7b73ddf68f0', 'ER0694', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('5315a1c0-352f-4529-b88f-137077263a1d', 'ER0712', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('2f1348ee-a228-4fdb-a791-d8827bab8fd8', 'ER0734', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('8d08acbc-aa83-4a0f-a59f-dece78afd2f1', 'ER0744', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('a512fb55-b960-4781-8a63-131bdab1184d', 'ER0764', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('15541cca-4457-4f16-9291-3032d008faa4', 'ER0782', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('e875642e-1a0c-4916-9c30-afedc2bf6058', 'ER0784', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('9db9bf3d-2a4c-43cd-976b-b6dafe140865', 'ER0786', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('343bd852-aaec-4858-a2ff-a3c126b0cb5b', 'ER0790', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('21ad7cf5-8720-48ab-b07c-457d659f10df', 'ER0791', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('7bf39d66-2919-4743-a70d-4a4ee0719c65', 'ER0937', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('414afe7b-789e-4690-8a04-470ec2f9704b', 'ER0939', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('dfb83a01-311b-449f-a1ec-c44ee5c9a581', 'ER0469', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:29:43.008495+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('6f4da6a8-4176-4c43-9aac-32607123f8bb', 'ER0331', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:06:36.090484+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0311af6a-aa38-4808-8b74-73cf20c1a1c2', 'ER0332', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:06:52.603571+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('40b43a95-8215-47b3-8346-afdf88acbc33', 'ER0226', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:32:47.584825+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('afb12540-474d-4ae0-8e0e-39ad24f0b628', 'ER0228', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:33:15.377355+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d1ede525-5022-4b2c-bf71-1a3fd2b2edf0', 'ER0230', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:33:41.357887+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b434f473-a43b-4a52-934e-308c464c37c7', 'ER0235', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:34:47.905852+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('32d6def4-b0ff-4c20-b1fa-a3074baa2cd0', 'ER0237', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:35:17.471978+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('70928e7a-b165-43fc-9744-b57b1929c92e', 'ER0238', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:35:27.963004+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('e00588af-e652-456c-a8bd-85a58185f3ef', 'ER0239', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:35:40.104463+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('26457809-3c21-4c11-9848-03c6e268f733', 'ER0240', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:35:50.380368+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1b8b0a50-cc15-4679-8701-253edbaf4cb3', 'ER0242', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:36:05.419894+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ce2e48df-c783-4273-886e-dbfc9ec199d0', 'ER0476', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('b19b617b-93f1-4ecd-b49d-3107857545d2', 'ER0245', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:36:38.841294+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('da5dafe5-2df8-463e-bf3e-b53eea7583f7', 'ER0246', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:37:47.953274+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('e2fd82cb-f1e2-4b2d-8125-3e85c618bcd5', 'ER0248', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:38:28.297052+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('2bfa1179-2c7a-43c6-93d6-6734a9e1cd21', 'ER0249', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:38:39.219371+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('50737f50-721a-4f0d-a56f-0ee636a9f99c', 'ER0252', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:40:17.432279+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('32e594f7-f4fe-4626-9d44-fd3c76eff104', 'ER0253', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:40:28.809741+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('a0f32cd3-2b0b-4644-8ac4-51a0fd361a15', 'ER0255', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:41:45.525796+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3ea530ac-397d-4f2b-8ed8-a95b2a838082', 'ER0464', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('72640cee-b20e-4398-9086-35f9ac5eb34f', 'ER0452', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('c512fda1-f529-4998-98d7-721754fb9caa', 'ER0456', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 45, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('1f7ad1ca-f9f7-4387-b6d5-9337253b7ce5', 'ER0151', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('fcfd3862-fbc7-431b-bae7-c7d27c6c3ac6', 'ER0244', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 45, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:45:08.93092+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('8deb34c6-801d-4253-9b78-81c899e446fe', 'ER0241', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 46, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:45:13.25235+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('071a6cca-e29a-4093-b43d-58829ea58076', 'ER0465', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('6df25284-ce09-46c1-8355-b8ee1207197c', 'ER0256', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:41:55.398338+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('372e8517-429e-46d9-93e4-24dc31d532ba', 'ER0258', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:42:30.704016+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5b3712e5-90a6-4952-856b-66eb501d6e9f', 'ER0260', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:43:27.340953+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ea06cf24-447b-499a-b057-e01b511789ff', 'ER0265', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:44:18.161212+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3f0c0b14-3198-4037-a83f-43c84b43d582', 'ER0267', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:44:52.296469+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('39e98b37-4872-4c76-9804-745aad49d250', 'ER0269', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:45:11.491099+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('bfb7f820-e01c-4fcc-82c6-b64ee59ba584', 'ER0272', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:45:39.744001+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('9f87a7b5-8acf-43ff-bb5e-8a3619323031', 'ER0273', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:45:50.871004+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d33cc5dc-ca2d-4621-a641-15ec8bd2b762', 'ER0467', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:42:39.527544+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('4cb174c0-5808-494c-a3ab-36b117860505', 'ER0334', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:07:16.49306+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('6b9a7379-58a4-4527-892e-52bed1d97bdc', 'ER0335', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:07:28.492556+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b06426a7-829b-41d4-8644-d23c926af494', 'ER0336', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:07:46.570327+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1ea1a183-9a35-4611-858f-95b9f4e9493f', 'ER0338', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:08:11.722827+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('f985b0bb-e90a-4dff-b752-e43201dc7cef', 'ER0339', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:08:24.508105+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('519daf25-9bd9-4fc8-a49b-4b9513cb1514', 'ER0340', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:08:40.140275+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('730d8ad8-5580-4466-ac3e-797f9df3c2ef', 'ER0341', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:09:01.939097+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('37afc3f0-4143-4028-98eb-0428d2645158', 'ER0342', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:09:18.798003+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ba17ec6b-7953-4b93-88bd-5ed907052b86', 'ER0343', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:09:30.448499+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('08252d50-4e96-4923-b2e2-e82e3f2acfe9', 'ER0344', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:09:41.91299+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('c6874c8e-53f8-460a-b88d-fab58227cabf', 'ER0345', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:09:55.047605+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('bb84eafc-011f-454d-a31d-937e9766e3c4', 'ER0346', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:10:07.238251+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('9a23ff89-921e-48ec-9e98-dbc03c17f2a2', 'ER0347', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:10:19.488175+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('bf133d9a-4593-4e4a-897c-febdd452c356', 'ER0350', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:11:02.878536+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0242f1f9-591c-42d0-856b-76069ee74af6', 'ER0247', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0aff5aa8-c79f-4367-bfa3-10aedde7f1fb', 'ER0450', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '9001', '9002'),
+	('46642c3a-54bc-4c89-b02e-e970ea9a03c1', 'ER0466', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '8701', '8702'),
+	('27398588-df37-4408-bcec-69b408be2b4c', 'ER0437', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8401', '8402'),
+	('dcf8af0b-b95e-4e95-8d8e-75be6a3ea769', 'ER0431', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8101', '8102'),
+	('273d5cdf-193f-494e-927a-f30e2e800ee3', 'ER0422', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:37.064126+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8101', '8102'),
+	('0a809e95-cf09-4d8d-aa47-df508291508e', 'ER0309', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 47, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:45:21.752275+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b0fd8345-e047-4869-ba3b-b5eee4d1509f', 'ER0926', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:41:04.83575+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('4a20556e-5849-446a-be84-72c023c26945', 'ER0301', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:59:46.454156+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5f86c40c-4106-417a-aad4-918b566feda6', 'ER0302', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:59:56.781782+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ec6bd572-fe5d-499f-ab67-f474f2fbe149', 'ER0303', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:00:11.64283+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('c9255e88-15da-4ac1-bebf-333fc12a8322', 'ER0304', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:00:21.142133+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('cfafa532-458f-4aad-a0a6-ce1ad61a2fd9', 'ER0305', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:00:31.12246+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('32fd1dcd-43b4-447f-9263-05730ef73988', 'ER0308', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:01:01.180237+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('8a8fa3e0-20d8-42c4-a63b-7f859b86f3cc', 'ER0312', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:01:30.250814+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('e87cb8e2-aca2-4c4e-b4bf-9df5edf96651', 'ER0317', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:02:23.729453+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('930806a0-a2b3-4dc7-90d0-e9fc63f58ec2', 'ER0318', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:02:34.854129+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b0f774dc-8ba3-4116-b948-db6c079337c8', 'ER0319', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:02:44.929872+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d64d4a49-d283-4ed6-8ccd-7f4c29c1a7f7', 'ER0716', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('6418abb5-3057-45c3-ae8e-131dc5ca944b', 'ER0885', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('367c3556-02c5-4734-993f-27b4ef8c894d', 'ER0901', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('db81a283-27ef-470e-8697-bb99f2985e0c', 'ER0905', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('d0ef971b-de9a-4444-8f9b-be65a73383a8', 'ER0915', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('806727f8-afe7-4bcd-8764-d0b8a336fc1d', 'ER0410', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('4334b12e-103f-4499-8fe5-1ff8df234716', 'ER0825', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('24404f54-03b6-45ec-9cbe-227447b92976', 'ER0401', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('c9f2906d-4e11-464f-922a-1b37bc95de15', 'ER0402', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8401', '8402'),
+	('98407c31-ec00-4b57-a96d-637cec1ed273', 'ER0403', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('3712c6f2-e1f1-42fa-b16a-e3fb33c3622e', 'ER0404', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8801', '8802'),
+	('a8b86f98-50ad-4258-88b5-3e700dbdcb21', 'ER0405', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8501', '8502'),
+	('1f4f4542-f4b8-47ea-a868-281c04fca0f8', 'ER0406', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('700477c2-4c6c-4f81-8c5b-a7589c83704b', 'ER0415', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 45, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:44.085785+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8401', '8402'),
+	('027c3412-c1ec-4f48-b65f-dc20b20db5c7', 'ER0826', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('9ad96e4c-285c-4b47-baec-ad9606680bff', 'ER0835', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('ebf5d985-02ee-4f64-a43c-c77c683e5479', 'ER0840', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('078db48b-a8ab-4acf-babc-0e5c8df538fa', 'ER0850', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('100fbb76-f62d-46a3-be30-ac79719f9ded', 'ER0858', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('ac3442c2-05b9-4d13-a242-ee50caadeb9e', 'ER0868', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('b1848f29-5b8e-4af2-a633-e3979371881d', 'ER0879', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('dc805571-e020-42c6-9368-4a42a9e03cda', 'ER0414', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 46, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:44.085785+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('4e0c4c24-0158-437e-92c5-f8672d4bdcb0', 'ER0413', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 47, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:44.085785+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('49bfa4cc-5644-4ef3-b121-27ccea8d80b1', 'ER0412', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 48, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:44.085785+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8101', '8102'),
+	('b150fcda-ed35-4c2a-829e-6f5da2447b94', 'ER0411', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 49, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:55.822629+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8201', '8202'),
+	('3ea454cf-85b9-4820-baab-839a2e8d8ff0', 'ER0409', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 50, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:55.822629+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8701', '8702'),
+	('6ade91c0-d616-4ae3-b7c1-7f7cb2686961', 'ER0439', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('5424c729-723a-4606-9d2d-b73f2ba27b31', 'ER0438', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('a3117101-e97f-44d1-9415-7cdbb2b05003', 'ER0408', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 51, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:55.822629+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8501', '8502'),
+	('72122c32-6b76-4881-aa5d-d9cdf2b787e1', 'ER0407', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 52, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:55.822629+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8101', '8102'),
+	('b034a5f5-8eff-4f31-bf89-945d920749fe', 'ER0427', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('8de9ad3b-fae0-499a-98ef-e5d5d2ee41d8', 'ER0426', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', NULL, NULL),
+	('ba1a953c-e8e3-4b83-9737-1209a985f56a', 'ER0400', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 53, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:55.822629+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8301', '8302'),
+	('cda2bb61-9145-488f-9525-ef4f751844d2', 'ER0495', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:27:00.849828+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3ecc5c70-2441-476c-b0bb-2737d0f09ef3', 'ER0509', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:50:56.108352+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d4138cab-df2f-4a7d-89ad-b57bf0e00c13', 'ER0423', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:37.064126+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8701', '8702'),
+	('46e2cf00-eb19-408a-8e3e-ba25f3b386c9', 'ER0613', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('cc7cc87f-4bad-4d1a-9beb-a636663c128e', 'ER0510', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:30:15.428704+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('a2c86830-5db4-4cd4-99e6-85cdbf9f6979', 'ER0820', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('01908c99-7431-4e1d-811a-40826c16665d', 'ER0523', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('fd916ab4-21c6-4da8-b35f-8205eab50337', 'ER0457', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('f73b25d9-6b6a-4d53-8033-0d36bd288f66', 'ER0493', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('9c7d4932-5e79-4e22-a641-d5a814379b00', 'ER0482', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:11:05.592043+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('8198f44f-fbf7-4c17-b4c4-b243a78b51c9', 'ER0816', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:41:14.661189+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('a9ffa28e-1937-46f8-934c-226622a799ad', 'ER0645', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('ff1f3cda-45ce-45db-a404-0f52bcbc862c', 'ER0593', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('eb2c0142-6e43-4bc7-83f1-89e2cff5d5e9', 'ER0525', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('89e30286-3d71-423e-b6d2-8f0bc588796a', 'ER0634', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('1b3ea2ee-ec63-4282-9fb2-c54fe222e74f', 'ER0919', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 45, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('c3d10861-d0f8-4a5c-9f61-9f793f800f2d', 'ER0647', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 46, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('06f877c2-6d82-408d-8d91-584bebe4a5f7', 'ER0823', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 47, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('6224eb5f-d4f9-4c65-874c-47422057f597', 'ER0472', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('9a082ab4-ac24-494f-a11c-37683750b1da', 'ER0549', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:24:10.058725+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('54c516bf-848c-4d66-b8af-a93a0bfc7f5b', 'ER0534', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:53:34.457919+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b7f20435-2ec7-40f3-bef2-6c02984ecdf3', 'ER0586', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:03:18.059415+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('7d3c4ee9-6a27-4876-ad68-0eddd0732a6e', 'ER0581', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:03:59.604852+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5852d1d2-0ae9-4e9d-923d-6e94e0978a25', 'ER0425', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:37.064126+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8301', '8302'),
+	('13a74e04-28ef-4549-9a1d-b5bd3a4761a4', 'ER0595', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:22.432586+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('24125da0-7132-4b76-9bd5-cf6d7504bb8f', 'ER0532', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:05:26.626871+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('21f7b10c-ff34-475d-88e9-da3e0e158000', 'ER0579', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:10:46.259085+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('cb781c9b-94e2-4ec3-a997-f0220b04db8f', 'ER0473', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('98eff0a7-234c-4be4-b70c-7ddfbeb25f2b', 'ER0543', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('93ce0ad8-13a9-483b-850e-769042a399c0', 'ER0535', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1eb3b6e9-7898-4478-a5ee-45b414003682', 'ER0652', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('e76864dc-ba37-4778-975d-371d048f3ac7', 'ER0546', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('b7d60af1-f9b3-47e4-abf6-a5fe2d802e88', 'ER0501', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('f199afb2-1f19-452e-bda6-de0d175fa0ba', 'ER0460', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('1b9d2f4c-ff5a-4c45-b235-86455ebec463', 'ER0717', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('9aa5180c-6dab-47cf-bf0d-75e13f975380', 'ER0601', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('44c02fcc-b95d-4fa7-a9cc-a23c41388b5a', 'ER0504', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('d89b0878-06d5-451b-876c-677e4419caad', 'ER0749', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('5b86e28f-8a4f-4e04-b440-918427b3f31b', 'ER0591', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('a8c27418-05a6-43a7-99f9-03852c7ed901', 'ER0552', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('243c08e7-86e5-43bf-82a1-7d512f0f7be1', 'ER0463', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('e94721f1-38fe-4be4-984c-eb9f090f52e9', 'ER0632', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:34:29.687487+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('cf00f718-f395-4aa2-9ad7-f94e60e7c797', 'ER0611', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:37:34.073101+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('84a0792c-fb56-4115-bbae-1dacb8527154', 'ER0609', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:37:45.556668+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('146e0875-21d3-4ef9-9a2b-558e051afb56', 'ER0604', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:38:17.291058+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('4d6e2806-1f3b-4f70-85cd-d3793fc15d17', 'ER0657', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d2f2606d-ec2f-41ee-b4d1-d59c55c674c8', 'ER0639', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 44, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('338f6114-89c1-42e2-b6ea-0c62eb0bb385', 'ER0687', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:45:18.744543+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('24db4944-0d2e-4a33-b0d3-43f6a2691977', 'ER0688', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:46:12.082074+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('2d0f17d2-e552-4ea2-880d-69241c03f8b2', 'ER0696', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('089ca45b-eb24-46b9-b282-1dd6ed413c0f', 'ER0731', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:50:48.691476+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1b8c2cf4-b615-49d1-9d5d-c8367174fc46', 'ER0750', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('76992a46-b6a4-4142-9e5d-b9f0af8ad10b', 'ER0709', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:29.669349+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1db5c735-7c5c-4f95-ab27-3bdd3c67ff73', 'ER0722', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:10:05.839539+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('61688155-a97f-485d-bcb6-64f3d72ac3ca', 'ER0708', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0f880599-748c-4420-9f24-1cc4f5029119', 'ER0745', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:10:56.412112+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('9697cde1-c943-4f96-b64d-35eac1dfd05f', 'ER0721', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:33.416499+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d743d6cc-e001-4ef8-99ab-c1a99e25be2b', 'ER0742', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1df08415-63fc-441b-b4b1-452b1a7d24b3', 'ER0727', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b777f7f6-5eae-4ac0-a49f-03848602f584', 'ER0710', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3c43662d-5492-4b95-a472-478ccffd638f', 'ER0690', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:30:21.076621+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('41f9499e-b398-44bd-a05b-d37a9e5517d7', 'ER0701', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:36:36.532418+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('79006d79-2f8a-48d3-8fa9-5339ee90f683', 'ER0719', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('4648d1bb-d0c5-4663-9f24-4b5538501472', 'ER0757', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:09:51.350881+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1e84127f-a21d-4bfb-ba4d-830e47fcb85e', 'ER0817', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:18:14.326592+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('36659634-60d8-420d-9fc7-a651a6443ab8', 'ER0792', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:19:13.074354+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('fd403042-a234-4ba4-bfc9-e4c3cfe5d47a', 'ER0779', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:46:45.263452+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('bafc7ab6-e71f-43c3-b207-a561a3803256', 'ER0783', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:47:46.148195+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1081fa15-b7c3-4277-9448-dd429b053a69', 'ER0793', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b25def76-601a-435d-ba70-21657d5e32ba', 'ER0813', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'DETAINED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:05:51.192063+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('3b353bd0-82da-4433-8bd6-60bab8db1cd5', 'ER0773', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:11:32.813591+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('45d23537-2f55-4833-8840-016223d5f99f', 'ER0892', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:33:40.250418+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5d6cb90a-9757-4390-8175-a87406c7f761', 'ER0862', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:38:04.110589+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('fdbcc005-28a9-44db-add2-ddd4f9b9a515', 'ER0860', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:38:24.325087+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('33edc37b-a7e7-4c73-9133-35a78518bb4f', 'ER0856', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:39:18.416234+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('555d31cf-f342-4ed8-9ceb-7a907f9e3622', 'ER0867', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'OUT_OF_SERVICE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:05:12.100586+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('c8506335-47a9-4641-abcc-d8214f03607d', 'ER0848', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:09.435013+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('063ae7d7-9113-4d63-b188-277e1ff7b9ec', 'ER0829', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:14.786644+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d42f1ab4-5e42-4044-bf78-390c802e9eaf', 'ER0869', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:02:20.819091+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('62b0a832-e016-4bf1-adcf-1b4bf0524366', 'ER0875', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:09:51.191223+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b0bbe619-93a2-49d1-84a5-4e323f86ea83', 'ER0871', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5fcbda7e-ddf8-449d-a83e-aa68a1aabd65', 'ER0834', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('bf6dea2b-5728-4d5e-960b-58612d0e54f9', 'ER0828', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:30:08.186969+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('099895c3-7158-42ce-9f03-0a421e331208', 'ER0932', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:48.096798+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('68060321-5de4-4921-8671-d70ac37d4087', 'ER0931', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:53.99454+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('6f269766-2d29-4e94-948c-54500471ef07', 'ER0938', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('61984e51-cecb-43e9-8b2e-6c5bba5e51a7', 'ER0774', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:05:41.438499+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('d7898180-e9ed-49a9-8e0b-89559c9d14d2', 'ER0841', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:07:14.196015+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('eaa53c72-7b64-474f-b8ac-d994589b1f1b', 'ER0778', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:07:24.261501+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('ded1f6e9-8498-44b7-8d2d-ec56febc4b90', 'ER0795', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:08:38.010757+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('df78b27e-67f6-4ab1-aba6-95e89818ed96', 'ER0808', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:20:01.764042+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('66481bd8-b34b-44c5-8764-4f15eebd5194', 'ER0785', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:20:16.133985+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('94f139e5-d95a-4e3c-b91e-c75570fa97ad', 'ER0705', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:44:23.26191+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('45753811-3d54-4b48-8e62-c4dca5a2e373', 'ER0700', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:19.316711+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('6bc26dad-03ae-44d1-b15b-5e7a9d5e7438', 'ER0706', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:40.364011+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('2c207a6b-0052-4aa7-bc6e-ece5f577cc8b', 'ER0718', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('ab532b9f-d42c-4b28-b478-1417c6311ab4', 'ER0693', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('afc8372e-f69a-471e-b670-faf8ae208f9d', 'ER0016', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:25:52.966705+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('e833d05b-04b7-4f9a-a244-94a47df31bd3', 'ER0002', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:17:32.659478+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('51b83da8-9fee-4296-9851-c4e31a36406f', 'ER0003', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:17:47.104892+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('05801372-7f9e-4362-b55a-bae1f666eec2', 'ER0017', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:26:15.908575+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5a8ef4df-c9e4-46e7-870b-8d991d92399c', 'ER0018', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:26:25.503842+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('f7c19cb3-2ed8-4889-b528-2e2533502e1f', 'ER0019', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:26:41.114722+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3c6a816f-1238-4114-85e7-3f50cc8b0728', 'ER0030', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:27:05.064276+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('efc28cde-d1be-48f0-a50d-ece5d89c87ab', 'ER0031', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:27:16.638005+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('68d6cfb7-550c-4817-81a7-3fd12accd9c7', 'ER0032', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:27:30.005926+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('9a785fbf-4743-4e10-807b-4d2a7b0f285b', 'ER0033', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:27:43.489413+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('a82021b6-697b-429b-aaa5-ea29acc14e4e', 'ER0034', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:01.105762+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('f3a2eb29-6fe8-45d5-8548-c65d3cb9f3bb', 'ER0035', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:11.181659+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1cd1ed87-7ee3-417b-9c08-11ba3da73687', 'ER0036', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:20.790553+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('c0fc858d-d15f-471e-b404-48602aa7567e', 'ER0037', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:30.908719+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3e145144-dddf-44fc-98a6-9daa53a915a9', 'ER0038', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:40.913341+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0eaa23e0-287c-4f08-b867-fc4069756e15', 'ER0039', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:28:50.951957+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5f35aef5-9f2d-40d6-ad7c-6e5ff4fe3963', 'ER0040', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:29:04.883646+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5b7b8423-d211-4538-96a8-8cf5cebe9974', 'ER0041', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:29:16.888708+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('873ccf9e-68f5-468a-ab6e-626a77511a26', 'ER0059', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:29:54.745697+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ab966ba3-0eb9-43b8-8a7b-c6a8bdc1b8b2', 'ER0058', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:30:04.376634+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ae0ba279-db43-4cc9-87d0-d8005c491ef9', 'ER0941', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('36c7a12a-1bec-4600-b8d1-7d8b9e3bdaf2', 'ER0057', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:30:26.019315+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('df0824ca-b995-46a2-a153-ddbe7d2746ce', 'ER0056', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:31:31.396945+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('2f598bc1-356b-40e6-8d34-542cbcc2716c', 'ER0042', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:29:27.297438+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1f58d505-caa1-42d1-b1fe-f36737093e06', 'ER0043', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:29:36.601867+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('09d74a8c-04b1-4514-aabe-dc1d93b414f4', 'ER0044', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:29:47.117104+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('9f8dda93-dfbc-49a6-afe5-2ec25d52027c', 'ER0045', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:29:57.446043+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('94eb0618-a98e-4dcb-af81-148f2826569e', 'ER0046', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:30:07.228775+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3ae733ed-b2ab-4b50-81ab-c7d67415c30f', 'ER0047', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:30:16.952384+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ea7c3b62-00a5-486f-b37b-5c876a8ef0be', 'ER0048', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:30:26.811653+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('07e93df1-095c-442f-bda5-41bc74ad0ced', 'ER0049', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:30:37.600127+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5f5c71bc-a7e9-4d14-96fe-be402c391006', 'ER0029', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:49:08.412411+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('10fa4f49-57d1-48e3-a7e3-46e2121f0ccc', 'ER0055', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:31:37.390809+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('46793bd2-c77b-43af-83f4-3cebca8f83fd', 'ER0054', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:31:44.801801+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('52c2faf6-80f1-40e8-97d1-d8ee82867198', 'ER0053', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:31:52.824676+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ed72a1b9-d060-4699-b866-31a2c6bf2eb8', 'ER0052', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:31:59.845094+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('7a93e53e-861d-4e3a-bd4b-58bf39da6ee8', 'ER0050', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:32:08.4062+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('7c2f5d1c-d9d5-44bd-b7ff-80f3e7bf52e5', 'ER0051', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:32:14.605069+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('da467171-ff66-4c8f-a8f0-da37dc7b7ea7', 'ER0060', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:32:25.322664+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0ac8b72b-38a2-4fd8-ba6c-273edf69dd43', 'ER0061', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:32:38.014884+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('e83f2749-f195-4ecf-b158-d0f96a24493d', 'ER0062', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:32:46.755861+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('cf4adeb3-39b8-471c-9c16-ef34d6b9bd93', 'ER0001', '8eec3a7d-8482-4397-96b6-59a028210722', '0da257e0-c825-4104-822b-82f27aa2c710', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:59:08.183485+00', NULL, NULL, NULL, NULL, 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', NULL, NULL),
+	('cd011374-5d21-46d1-bfa8-5f6cce8a3ca4', 'ER0004', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:17:54.900575+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ee37e8fc-a8a4-4405-bd7b-1c0312555d0b', 'ER0005', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:18:04.380484+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('6b960b60-1e24-4046-bbbb-61a392cae073', 'ER0006', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:18:11.505253+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ecd99a46-4a5e-4615-b715-9960046dc8ca', 'ER0007', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:18:18.309735+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d40c1816-be56-4a13-8c52-a436ac20c8ab', 'ER0009', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:18:37.241472+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('3e79907b-c2d3-41ab-80fc-e315abeae8af', 'ER0008', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:18:45.15842+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d040c962-0654-4728-9193-1130c88e4a62', 'ER0020', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:19:31.640213+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b9d8a7f8-bc43-49aa-b3a6-0318b46e2910', 'ER0021', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:19:37.647825+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('f0848a37-c4d9-4d1f-bf4f-96cb5c9de452', 'ER0022', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:19:42.700697+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('c88396c0-3bed-4aff-a848-7f82f70b932f', 'ER0023', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:19:47.548749+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1d3eada0-d635-4cce-8162-37ab335875d1', 'ER0024', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:19:52.751435+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('cf954164-7b60-4ec6-9b19-ffcd8349e73a', 'ER0025', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:20:00.749912+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('23e0fda5-84a0-4d63-8d0b-5d3b84d7c64f', 'ER0026', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:20:05.832161+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('b15f6950-4fcd-478e-8d68-c1bf4fc3a333', 'ER0027', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:20:10.840034+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('79bdd006-31ca-427e-ac98-1bcd21e8d64c', 'ER0028', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:20:19.587276+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('adc1a56d-2d97-4293-80b0-054487d23ed1', 'ER0010', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:24:15.716013+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('58a75962-bb5e-4494-9eb6-92236284f7f8', 'ER0011', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:24:34.013481+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('54ce9794-8949-424b-b2da-2ce1117f64d5', 'ER0012', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:24:44.873919+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5157d855-6ff4-4d76-93e8-3ed09005f07a', 'ER0013', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:24:55.50671+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('41cef115-d5ce-4e37-a824-d356c9fe2a65', 'ER0014', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:25:06.115573+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1ffe2c11-525c-4f4b-b510-986a976e4f66', 'ER0015', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:25:35.741993+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0b652309-d605-4e20-84bd-974139462cc6', 'ER0063', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:33:03.285171+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ffef9238-7c91-499f-8d71-ac767d713615', 'ER0067', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:33:10.841698+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('4347bd49-f8c7-40a5-a963-c35f71e4551f', 'ER0066', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:33:21.531298+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('220877e0-fef1-42b6-90d9-48136749840f', 'ER0068', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:33:28.528003+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d7be2a1f-521e-4548-97b2-dc19361a8c24', 'ER0069', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:33:37.157909+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ba5376e4-bdab-4e4b-a3b0-c8ba6c2f2da9', 'ER0065', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:33:44.162446+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('da15e58e-3682-4261-a511-011ad1305ff9', 'ER0093', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3bee58cf-6c38-41ee-9a95-4f7c9c36c122', 'ER0155', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('91e8f209-a152-4c93-a14f-141027574fbe', 'ER0277', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:53:22.941657+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ee8671d7-497d-4d64-9a0d-9eab03878351', 'ER0278', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:53:32.939516+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('6d250421-7ae2-4978-acb2-fcb83a72e56f', 'ER0222', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:31:27.060219+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('da63a5d9-1ff7-4d84-96e5-d2aba5e4015e', 'ER0223', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:31:40.950191+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('48bf735a-65f5-4cc5-9ca2-b3f6fe32e301', 'ER0279', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:53:43.488857+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('e931b7aa-3442-4354-8f97-fe6ac2465446', 'ER0280', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:53:52.799411+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('5527fa86-4fed-4f40-9af3-a44f5113de6f', 'ER0283', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:54:25.712688+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('c1a42770-9c6a-451b-ba5a-65aabb9b359a', 'ER0284', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:54:35.938274+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1608dcc6-d250-45f6-896c-696f6388f1df', 'ER0286', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:54:56.161229+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('e167a7a9-2506-4e5a-9a4d-b598a542ba60', 'ER0288', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:55:20.400958+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d91fd059-f818-48e5-a577-977fc7911eb7', 'ER0290', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:55:43.425414+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1a14dac0-e5cd-48fb-ad90-924e2c4383cb', 'ER0295', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:56:31.974699+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('cf6aee8e-5f74-4174-9006-5f0123746de2', 'ER0296', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:56:41.02224+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('c9519e32-cdee-44db-a984-4d548a6d57d3', 'ER0297', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:56:50.870987+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('d13b2762-fed2-490f-9db0-af899cdec183', 'ER0299', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 06:57:10.117305+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('eb82e348-5a63-41ad-b863-42844dfabbd1', 'ER0320', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:03:01.643809+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('a84d3444-6d11-45c1-915d-981bfdc513a6', 'ER0323', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:03:25.879989+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('7f30c794-1511-4a22-84d3-4b508face952', 'ER0324', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:03:36.823479+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('ec331058-8f95-46ea-b58f-0553ac649d06', 'ER0325', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:03:47.278915+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('cc434d4b-9560-41e1-a2dc-2edf4e2072c0', 'ER0326', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:03:57.466165+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('623581de-ab08-4a00-9cd3-4a3f56a72f02', 'ER0328', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:04:20.318156+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('0258f83a-e405-41da-b596-9e286a5cb400', 'ER0329', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:04:30.026895+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('1eb8adc4-322e-4bec-bb62-50e32f942959', 'ER0330', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:04:40.276037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', NULL, NULL),
+	('335c4ddf-db1d-4d5b-8c94-e4c05ada00da', 'ER0220', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d1f64476-c09e-480f-8cb2-2e6cf792d604', 'ER0983', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6fd18d2e-e59b-4f76-9698-6800a178b728', 'ER0287', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:41:40.389022+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('9ca2928c-add3-4acb-9354-6407fd5c7cd4', 'ER0541', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:47:04.250703+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('1bcc716b-dcb3-4bf9-9e1a-4039bb8db9d9', 'ER0221', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:31:15.659738+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('69ba9d8c-7bbd-4ded-b924-4271490f382c', 'ER0271', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:00:20.046013+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('04219cc7-ef3f-4b30-9e31-cb5a207631ae', 'ER0448', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('76e92779-2705-43b5-8e28-52fc9ad42ddd', 'ER0441', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('898628d2-7195-49aa-aa05-7289781725ac', 'ER0428', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8901', '8902'),
+	('20e7c481-34ac-4603-bb38-357383c55a9b', 'ER0424', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:53:42.28848+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8001', '8002'),
+	('537f8f55-78f0-46a6-94b1-512b6903f021', 'ER0511', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('e4f95edb-21b6-482b-9b51-1af97edc2341', 'ER0432', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:53:42.28848+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8001', '8002'),
+	('c6d96337-5426-494e-a621-1603b0355c6c', 'ER0474', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('7f9635a8-22d5-46e9-9844-83807b18a310', 'ER0506', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('00c04e2a-05e3-4d3f-8da3-fff944605273', 'ER0479', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('78f56cbf-f56d-4f0c-b1ce-8f2224023016', 'ER0497', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('c0417d20-34f4-436c-9a82-4b2adc51b5aa', 'ER0468', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('ab39ae7b-1f29-4658-b98c-d458002e0884', 'ER0936', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:32:11.420342+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('57ae3cba-d8dd-4507-a028-c89ea4702f3f', 'ER0519', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('49ec0541-df20-41b4-804c-bbd5f5f96e2f', 'ER0539', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('5c16b8ef-e9aa-4ab7-97b5-f685b379395e', 'ER0453', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:34:00.704309+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('b836b7e4-7975-4120-9628-ada891845f41', 'ER0507', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:34:06.475823+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('a9e82d5a-4f14-413d-b226-f83f44900f8e', 'ER0462', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '8001', '8002'),
+	('d25abbef-a7f0-4b6c-98ed-6931e074168b', 'ER0447', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:53:42.28848+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8001', '8002'),
+	('f91d4f62-2185-4ca5-84d6-2ea9fd1e293d', 'ER0478', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('b2c9360b-7c3f-441f-9aa2-d4ff2ce35999', 'ER0310', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '6de97a77-dbf1-4099-92ea-295416ab0d97', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:30:31.542141+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('32f979ed-d94d-4ed5-8e83-e68d9d159aec', 'ER0227', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '6de97a77-dbf1-4099-92ea-295416ab0d97', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:35:19.110185+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('1b764fc2-151b-4e5a-915e-585e5e61a233', 'ER1074', '4f65adc3-baf7-44de-88ad-0a4672fab669', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-04 06:59:28.97998+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', NULL, NULL),
+	('148b7a5b-c7e3-46a6-a621-61467233720c', 'ER0544', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('a8292022-9346-4ea1-837a-8b3d7354a62c', 'ER0547', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('1c4f1919-2c79-497b-9c57-92bad167d443', 'ER0557', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:32:47.643593+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8001', '8002'),
+	('a116907e-a06e-46f7-8d8e-3c0ab2e830b5', 'ER0458', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('0175eb07-2012-44eb-ac4f-550d1aa83c60', 'ER0600', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('48be7d38-c265-47d1-ba04-2a3bb6bc116f', 'ER0521', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('76300a20-b249-4c27-ba73-4cba7a110ca7', 'ER0559', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('d599be9b-e15a-44f8-8f1a-b2fe1acf79a0', 'ER0459', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('944af82a-1903-4a6e-a557-c939a1b64336', 'ER0470', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('236d1cbc-4dee-4aca-a5b6-b563591676cb', 'ER0254', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('7040bd13-13bc-4f4b-8322-af03cea5c4c4', 'ER0555', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('cda7dc57-2622-482d-84a4-df22f6063e3c', 'ER0527', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('22821225-2949-4956-b445-69af2f523c69', 'ER0590', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('45779010-d372-4e43-8c95-9fb536fed71a', 'ER0480', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('5cb348c0-cb32-4bc8-921e-5a5060e3ab20', 'ER0316', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('30255c31-66eb-4b6c-bb3f-9b10b377406b', 'ER0567', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('af381508-3230-46fa-83ff-3f475f10f587', 'ER0520', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('711ccac0-5db6-4a40-87d8-fcd32a2b3acf', 'ER0515', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 45, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('1ab8f840-69cc-4d95-9bcc-2c3be1e8c85e', 'ER0445', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8201', '8202'),
+	('b9e70323-4d3c-4d85-b37a-51408b20daef', 'ER0443', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8201', '8202'),
+	('8bed3ece-ab52-4c39-a568-292173c6fcd9', 'ER0524', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:52:24.810458+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('c4c2be3c-90d1-47cb-bc60-06c4e8cd013b', 'ER0648', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('b0f91568-e627-43a3-801c-9bd48d76acee', 'ER0633', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('8d6dbb50-bc02-42ea-b710-7a9010660b10', 'ER0646', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 44, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8101', '8102'),
+	('43264a6d-d466-44db-9318-79cc3fcb6e07', 'ER0322', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '7217d519-4204-43ca-aef1-3e86f3ec240b', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('bfa1959d-1a81-42dc-ada3-fc1d37ed62fd', 'ER0314', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '7217d519-4204-43ca-aef1-3e86f3ec240b', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('4ae8c229-95a4-4809-88de-3fe8dfb1638c', 'ER0274', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '7217d519-4204-43ca-aef1-3e86f3ec240b', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('b4cecb8b-02ef-456f-a459-522869acba78', 'ER0514', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('a8220b03-c9f7-43cd-9953-7b5d364a795e', 'ER0505', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('5ee12fa9-460f-49c8-85be-79d61c4a9502', 'ER0618', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('8ee20396-4242-4470-8ca3-f8fafdac4ce4', 'ER0625', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('9a8a3239-b73c-4be4-b650-dbfd3fdb413a', 'ER0568', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('2472cae8-c8b3-473b-abd1-0354945713de', 'ER0596', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('5697d4e4-eb91-42e7-8167-336b385b150f', 'ER0231', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '7217d519-4204-43ca-aef1-3e86f3ec240b', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('c9278415-c9f5-42cd-8670-883380efeb80', 'ER0491', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('068179db-562b-4a91-89ba-07a160ecb7e3', 'ER0571', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('665e77d9-73da-4fe8-94a0-e46773e01a12', 'ER0606', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('ed5768ff-f773-4f63-8eaa-1ebd28d44df7', 'ER0542', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('f3d4405a-96ce-4045-a920-66666d35386f', 'ER0588', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('5b95f172-6175-4683-aea9-fce7d826d2c4', 'ER0585', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202');
+INSERT INTO freight.wagons VALUES
+	('f746652b-a4e5-4586-8c3f-3a4f3f302cad', 'ER0624', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('1fc8cbde-7e96-45fd-b246-2c26ea787dd2', 'ER0538', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('a0dd5f4e-0721-4d5d-ad96-1d8b59aba127', 'ER0564', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('47c05a8c-b148-45be-b2d7-6c603487b789', 'ER0348', 'efed186d-7062-4b0f-b3fe-6e793accc364', '7217d519-4204-43ca-aef1-3e86f3ec240b', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('4fd338a4-65d3-49d5-b796-2a8bc18902b4', 'ER0236', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '7217d519-4204-43ca-aef1-3e86f3ec240b', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('ee187bcb-a21d-49db-9102-96361dd65aa5', 'ER0421', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:37.064126+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8301', '8302'),
+	('db77b4cf-cfe4-47dc-8513-941f6adb7127', 'ER0558', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:23:39.468205+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('6724c97b-38a8-4bc4-b9bf-70d1255b8921', 'ER0612', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:23:49.408277+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('b23efaa0-1aa4-4b68-8e91-9c9aaf710a0d', 'ER0855', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:23:55.395619+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('341fd519-0318-4c86-abda-89a2698ab2c0', 'ER0566', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:24:00.291962+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('98d238f2-eb50-4390-b019-629c7eec9c4d', 'ER0528', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:24:17.344718+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('d0310dd3-e096-492a-968a-e9421cf6015c', 'ER0292', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '1064cee0-359d-4fa6-9157-975be624f378', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:24:21.60468+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('0837a255-cf38-44b3-9975-902e4bbd28d4', 'ER0484', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:47:36.414656+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('be83d3b4-37d4-4a07-869b-06f0950109a1', 'ER0761', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:14:40.397988+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('2a935be0-4315-48cc-a5cb-eb048a853f40', 'ER0578', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('0aba0d67-baf5-4abb-bed8-74bc27beacad', 'ER0232', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '1064cee0-359d-4fa6-9157-975be624f378', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('c61b4aca-0e57-4d54-a1d7-964283a3296f', 'ER0673', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('f2d12cb0-bb14-425b-a2cb-9d80ba39601f', 'ER0575', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('49d0aad7-b2c2-4e59-95bb-31ac7912b52e', 'ER0250', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '1064cee0-359d-4fa6-9157-975be624f378', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('cf7ca5ce-7bdc-43c7-8c69-413a62254f2a', 'ER0599', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('904ef6a7-8c02-434a-8474-8af1f3f9d37a', 'ER0622', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('ab7f1ba5-e9e2-4677-a885-106a79828b76', 'ER0801', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('a18c96c0-62a3-4f10-b608-7868d251eb8a', 'ER0806', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('2c0b0adc-e42c-4f7a-8a46-9fc03a6700cb', 'ER0594', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('935091f1-7ae6-423b-aad5-3a1b538b423e', 'ER0264', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '1064cee0-359d-4fa6-9157-975be624f378', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('d902aaed-658b-45d0-bcea-da86bf4788e5', 'ER0691', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('1d1d13ee-69f2-4fa1-a12c-5f6cbd87a184', 'ER0562', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('1c8317e0-96ec-41b5-8fd9-632be5c598eb', 'ER0686', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('af761acc-af3c-4c66-9eb4-af1841c14854', 'ER0475', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('0ca7d0b4-1ab5-48c8-b796-513b93cd5f09', 'ER0630', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'MAINTENANCE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:49:50.377355+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '8301', '8302'),
+	('d200843a-fe67-4e5f-994f-63c45d65efd4', 'ER0485', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:39:28.065038+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('397cd1c9-8d31-4f5d-bb2e-d4d7e76e52e0', 'ER0513', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:39:27.805901+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('d558caf1-772c-4c8b-98ad-fba00ca137f0', 'ER0780', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:39:35.783647+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('9c7dfc26-5845-4090-8e0d-9981ca0b5760', 'ER0928', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:41:23.1368+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8201', '8202'),
+	('13670cc8-ba75-4c2d-8061-c6c9d46ea4e9', 'ER0798', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:19:38.877828+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('796c99be-a661-4116-a577-a0110841dc73', 'ER0772', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:47:13.775781+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('40e42fd9-8f27-4ed8-b73b-57cb790907e9', 'ER0522', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:52:13.944854+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('6c5d7287-7744-4336-899d-de15ef5ee98e', 'ER0530', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:53:11.988373+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('6b8f2e94-dc78-49c7-9c8b-b304a7946649', 'ER0540', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:54:58.176862+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('fb9796da-c506-4fa7-b31f-b9e8e33d7e8f', 'ER0550', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:55:07.361004+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('45e0a7d8-cf56-43a4-977b-869ab6a1d6a8', 'ER0649', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:32:36.356068+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('d84a87c7-285c-43b0-928f-f18adf312557', 'ER0641', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:33:32.147243+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('ba1ba21f-f437-4626-bdad-a6466e5bd1a3', 'ER0884', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:34:42.526156+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('68effe36-ac54-4fa3-8d27-45694822afb6', 'ER0451', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('da9c8cca-10db-4aca-8cd3-c883a402f5c6', 'ER0636', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:34:08.888765+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('77164c29-1535-421a-bb0f-e61295ec7966', 'ER0616', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:37:01.468039+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('abb8d3c8-6456-4849-a046-abeed0d3892c', 'ER0502', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:50:14.851716+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('194b9a33-c4b6-4cec-a2ac-4c7dab9023df', 'ER0615', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:37:07.940214+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('875974ae-ee69-45ef-a951-b70a7ecda661', 'ER0614', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:37:15.475288+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('69509819-a586-49be-94b2-52a3efa4bde4', 'ER0876', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:24:12.751373+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('f1197f64-5ed6-4ed7-8d5b-27ca631a3c56', 'ER0454', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 05:34:08.177366+00', NULL, NULL, NULL, NULL, '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '8401', '8402'),
+	('951904eb-60a6-44dd-aada-4be40146f2a0', 'ER0442', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8401', '8402'),
+	('5cadc015-35dc-4f13-a1df-35bef3acd35f', 'ER0434', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8401', '8402'),
+	('af828445-a3ab-4bae-8f8c-d23d1f88b247', 'ER0704', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:30:17.244448+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('71dab233-6875-4c9e-b6fc-c247c4036441', 'ER0849', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('b8a0540a-b9a2-40f6-ba5f-9de2e615c351', 'ER0870', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('231fd9fc-bd75-4c1b-ad81-116056fbdabf', 'ER0881', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('24be854c-67aa-49eb-ae29-ca992f96a891', 'ER0818', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('b8dfa5f4-2e86-4e8c-a155-5d0f50809c1c', 'ER0561', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:01.675925+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('cb4ec20c-14b5-49ae-b757-a213b5dd9fb5', 'ER0500', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:51:51.833626+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('69df25fe-ef7e-452f-8439-92757bb98b7e', 'ER0602', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:38:29.002392+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('9384462b-53ed-4db9-9267-87ba35af3454', 'ER0658', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:39:40.631309+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('52278b48-c882-4a34-96a8-d937592a2cd8', 'ER0678', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:42:45.869319+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('2b37d9aa-ca9f-4384-8b69-2bb9d71c2bb8', 'ER0664', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:45:41.459175+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('1f9aa084-2778-4973-829d-68ca27665b3d', 'ER0653', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:46:05.353527+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('c66f251f-9119-442c-a4d4-360ccf8c8c20', 'ER0739', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:50:24.134884+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('fcef533e-028d-4f87-b236-6913a6e34343', 'ER0740', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:50:29.652466+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('33235c6c-5314-4adf-a369-0df725e50196', 'ER0730', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:50:42.615435+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('0c63898a-3b42-48c2-a8fa-f777e2d6a28e', 'ER0729', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:51:15.490944+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('ed0fe2bf-e386-4dec-ba8e-d9f5d783df42', 'ER0720', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:52:20.433652+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('2d6b5c20-d9c0-435d-821b-56ac5e4de522', 'ER0715', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:53:24.953084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('ea41d963-cd4e-4e62-b4c9-c4f0411f9131', 'ER0573', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:02:07.935889+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('943ff7f7-7b0e-4488-86c0-b4426bf1abba', 'ER0565', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:02:40.116559+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('0fd9c907-d37b-4538-99a7-819da34072c5', 'ER0563', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:02:55.860491+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('6f2ade5d-c8c0-4bba-9cf6-e813ecf5eb8e', 'ER0682', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:07:37.989164+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('daaaaf4a-6a25-4a5f-98f2-964d7b7baa73', 'ER0755', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:09:31.885127+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('d6baf04f-9f9d-4d0f-92d0-8e11c5e564ec', 'ER0758', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:09:38.257549+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('eddf627c-d875-4ffb-8a21-3f8998958b94', 'ER0789', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:11:32.475749+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('838e35b4-2942-4315-9d47-585784f18ba2', 'ER0787', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:12:29.485236+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('236c1399-a540-414a-8ac1-020d06fc7b9f', 'ER0831', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:16:14.123611+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8301', '8302'),
+	('51f43037-daaf-4478-b355-c23c17555dc3', 'ER0819', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:18:00.37579+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('4c047115-c327-434d-932d-63ce141357bd', 'ER0508', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('d84a08e9-1289-40fc-b6b0-9224a478acba', 'ER0857', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:55:00.23204+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('60777341-9656-4766-9d37-ca61bc740e94', 'ER0756', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('274df441-ac91-444a-a9e7-18c5332157a4', 'ER0940', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:27:52.397379+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8401', '8402'),
+	('e851adea-3e95-48cb-98e4-91f2c374dbfd', 'ER0781', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:47:58.261716+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('a25bbcfd-a76c-47c4-80f4-5462f98eba3e', 'ER0433', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8501', '8502'),
+	('d13956c5-0131-497d-aa06-d6ca974dd3dc', 'ER0486', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:34:04.735171+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('8888ac2f-6479-460b-adb8-f1ed88f7d465', 'ER0637', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:34:19.946024+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('2b763bbc-9c3f-43da-a5ed-62321792c433', 'ER0736', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:34:19.946024+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('68bfa962-345b-47e2-9730-f3d470042ebb', 'ER0859', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:35:34.919204+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('919b8239-6111-4a55-a04d-2833511cd237', 'ER0483', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:35:45.615394+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('16afed54-73b4-4f63-8d0e-6924296e2714', 'ER0824', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:35:51.205636+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('0c058c2f-f848-4168-8496-eb94a2460307', 'ER0640', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:35:58.355879+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('1f858172-f7a7-4775-99f2-de4c8f1599b2', 'ER0714', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:36:13.414293+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('7dbfcca5-e448-4447-b9d2-80650e252d4e', 'ER0807', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:36:19.65968+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('2dd50754-60fd-47cc-8c6d-9c9c40e5de44', 'ER0289', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:36:29.022924+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('080e52a8-631d-437b-b850-35163d78b2f4', 'ER0587', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:36:41.955353+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('f3d658c3-8843-4095-89c0-a64ebf56b26b', 'ER0902', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:36:53.873848+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('1ed8cf1c-379a-432c-a394-4e38389ebc4b', 'ER0877', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:37:07.300235+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('e2a7ebf1-e9c0-4313-9dd8-e6a9ff138b46', 'ER0748', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:37:18.065988+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('c42e8dcc-a434-4baa-8cc9-741118d06e3c', 'ER0837', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:37:23.822968+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('a36ccca8-465f-4735-a0e8-ec628966bb24', 'ER0307', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:38:12.663759+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('e57a15ce-0c7c-4370-9ed6-9f3d882e21ac', 'ER0707', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:54:30.557466+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('b4a3ef3b-370e-49ec-8c8b-826d3a6f7bd6', 'ER0572', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:02:13.5618+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('e1290c54-fb43-4f12-9c5b-a459bc2aab0c', 'ER0759', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:38:24.55966+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('42f686cf-eb1c-4ca6-b6e1-b6f6d1f19a97', 'ER0847', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:38:32.258877+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('21f7faf3-b36e-4556-9ab2-69f26aeb3d54', 'ER0498', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:39:18.6391+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('3b5a2e8f-7e8d-4a41-807d-ee4d84551d44', 'ER0492', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:39:23.442894+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('316b3d47-e0be-4bc5-b3ba-b0f09d4ae5eb', 'ER0516', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:39:33.969516+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('f92dd7dc-4816-4dbc-b011-10651ae4a7a2', 'ER0735', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:39:40.007965+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('75d2efef-58ef-4d41-b9a7-e4fcba2d4c53', 'ER0503', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:39:58.484825+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('97459b0e-74d6-4153-bc33-620f9e87c39e', 'ER0461', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:40:41.275711+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('a81af5b7-6405-4ee5-9cc9-f38822ab097f', 'ER0243', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:40:54.260382+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('5a52c9f7-7a52-448c-9f7d-ead0f174ee68', 'ER0583', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:41:02.993141+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('0464fba2-8401-4165-b857-d6fbc52c7bb5', 'ER0924', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:41:33.024774+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('6fb151a0-8245-4ac2-bf86-35ae8d7f1a19', 'ER0796', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:34.646553+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('73e010e5-7795-436d-834e-d7bc88e62d24', 'ER0929', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:40.878226+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('8dccb45f-0998-43cf-bcc5-fab443892756', 'ER0713', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:47.99121+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('e3027d75-3682-4b20-9547-6aef2f9fa3d3', 'ER0603', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:42:54.894531+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('673deadd-2682-4dcf-899f-69da0173a09d', 'ER0814', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:43:03.727986+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('cce7dba1-7a8e-451e-a7c3-3e2b0717c400', 'ER0853', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:43:10.689745+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('e5f21090-74ee-489e-905e-d36884fb51aa', 'ER0276', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:43:16.501313+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('0762c3c6-c4e8-481c-8dba-d4e70fe55965', 'ER0262', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:04:40.637988+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('1af2ea11-fe1f-449f-ac06-576e760ee4da', 'ER0234', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:06:26.629054+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('9e2ed2fc-d1e6-474d-8f4d-36e42385af95', 'ER0268', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:08:47.603123+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('866d118c-615e-42cc-a1dc-4fe1a67d0fc0', 'ER0266', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:08:57.082023+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('57234ac6-fb81-43ad-84dd-cf06a50545d8', 'ER0702', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:09:11.073758+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8501', '8502'),
+	('40744a86-23b6-4218-ab1a-5da598f97c5e', 'ER0257', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:09:29.771656+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('f9943ab4-a93c-4bb5-abf1-191392be87ba', 'ER0293', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:19:28.396777+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('4bd640e4-7537-4322-8933-76ded3507e67', 'ER0481', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 41, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:49:54.38912+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('61ca1aac-1a39-4192-99aa-4d00e3ea0bf4', 'ER0471', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:50:09.452803+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('2e2347fe-96fd-48f2-80bf-a30b71f40fba', 'ER0582', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 44, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:50:19.269219+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('487faf82-6984-4066-b957-170283eb2502', 'ER0518', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:51:51.812467+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('0dc6cc71-04e7-465e-a0f5-b227e6b0e3cc', 'ER0494', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:27:14.105152+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('8bd92ab9-9765-4eb7-a01a-6574097530fb', 'ER0455', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('b3947e13-5d65-41d1-9797-a3c09dfab4d3', 'ER0553', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:41:56.061927+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('63d8f50e-43a0-4a6f-b0ce-93a5446fe747', 'ER0496', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:02:39.639982+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('c6e5e49c-01fd-4469-a215-e4b2f5ee6ad3', 'ER0444', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 19, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8701', '8702'),
+	('afda74c6-be11-4edc-9c1e-e35a597508df', 'ER0449', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8701', '8702'),
+	('47d7a9f2-aaab-4f69-ba41-5f0c6f49d8e3', 'ER0315', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('48c1be5a-be6d-4200-96b4-6491120d8d00', 'ER0679', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:02:53.561654+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('7302edf1-5fb5-4d3c-9449-a83c3e725157', 'ER0874', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:03:09.155138+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('e7401b73-d18b-4e9a-aa10-8cf873d151c2', 'ER0921', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:03:26.220424+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('efb8c983-9189-42b9-b430-a9379639f2b9', 'ER0910', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 6, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:04:02.537606+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('f31ed177-1e64-4359-9003-ecf58931a661', 'ER0233', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:34:20.19072+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('10f198d2-3b54-43d7-8aa5-9430de9082f0', 'ER0621', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:04:13.936244+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('ff23f5b1-5a1f-474a-98e5-f48dcd8b4b19', 'ER0667', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 8, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:04:24.304456+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('8289cbc1-7dff-4288-a9a5-18a8929d8d2b', 'ER0488', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:06:00.75268+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('68dee723-1260-4471-af9e-b6b375c73be4', 'ER0300', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:06:12.506659+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('bbba1c52-0ddb-41f1-baa4-4805e0f438bc', 'ER0711', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:06:37.566558+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('16f60693-f726-4742-8b47-04b01499fbcb', 'ER0605', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:06:53.014223+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('05bbeb6c-cc82-4ce0-a152-d2d23b7f9eb6', 'ER0897', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:07:04.024124+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('efbdce95-085f-425d-a01b-cbeb73373205', 'ER0769', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:07:32.958024+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('33d00826-3a41-40f2-8ae0-002686a8e3e8', 'ER0487', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:07:45.847164+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('4cadbf93-7b8e-48cf-a640-f4bdf4c37ad6', 'ER0556', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 22, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:08:01.479691+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('6ab7d4b4-cd6a-4987-a489-587e58e108cb', 'ER0580', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:03:04.9069+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('e9ca94f1-c922-4ca7-bf4e-751020ffb45f', 'ER0526', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:08:19.976195+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('4d7aac68-33ef-40eb-be71-b82123419fa0', 'ER0499', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:10:18.368598+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('b35d6dab-15fc-49dd-8add-e5f1f6e45070', 'ER0930', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:16:10.031795+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('0146d917-2f13-4db1-88e9-b93e0299ab92', 'ER0294', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:19:36.816269+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('2795f18c-5a8d-427c-a25b-8c9802755e4e', 'ER0677', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:19:44.681648+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('33084f87-8242-47b4-b631-2aeac1187971', 'ER0628', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:20:27.788097+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('665545ce-656e-4a18-9bda-ccbd5ff9059c', 'ER0545', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 43, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:20:59.4352+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('3616f4ae-7724-4c96-92a8-44b71c3b09a8', 'ER0551', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 44, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:21:08.935341+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('fea5a1ff-d8fa-43f7-9869-d5da233b4c51', 'ER0644', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 45, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:21:18.10289+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('8a6a494b-8f17-46f0-9f5d-78c6b2a5bfbd', 'ER0922', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 46, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:21:26.161242+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('75a63053-84cd-44f7-b4e9-957b3ef2b6df', 'ER0670', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 47, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:21:46.947497+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('5cb86fbe-971a-4223-a7fd-20020ff9a2df', 'ER0864', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 48, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:21:59.448511+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('a1401309-49bf-4f0e-96c3-8eab117d0ee5', 'ER0629', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 49, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:22:07.180165+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('055f3e4d-de1e-434d-8b87-805ac497a2ae', 'ER0306', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '2012fe72-e966-404d-a5c4-f43ac0e5a767', 50, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:22:17.52151+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8601', '8602'),
+	('ed7d89a6-13f0-406d-8ee9-507a04c82165', 'ER0554', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:42:56.529649+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('89471125-c938-4278-8096-e3ee051caf9c', 'ER0291', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:43:51.137056+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('6f49edbe-affb-40f2-84d9-fcf77fb036d7', 'ER0313', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:43:58.083961+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('663ee624-6a13-43e6-9eb8-32fbce075e48', 'ER0548', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:44:32.013962+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('75f73e7c-2319-48d2-97ab-c0a619e37738', 'ER0224', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:11.700878+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('4f2742fd-8f95-46d7-8b0b-cd6a451e4214', 'ER0533', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:49.097014+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('8b4d661a-71f6-434e-ab85-1bc1d5a3b0c3', 'ER0263', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:47:29.025325+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('b0b7e1be-b194-4995-885c-6e2958d843bf', 'ER0282', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:47:46.435863+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('80778777-179f-4e84-b1dd-cd5f675b6fae', 'ER0598', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 39, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:49:38.857637+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('18df0e60-b705-4d39-a33a-d0ec7e291f1a', 'ER0909', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:49:45.95559+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('98ff6466-85e7-46e5-85c0-89a69f1e825c', 'ER0854', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 42, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:50:02.041557+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('37b285b3-ae96-4df6-abfe-882592449063', 'ER0890', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 2, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('944cec65-290c-4adb-bf37-5bba91ecaab2', 'ER0436', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '76671a28-3517-4f04-a903-32162959d615', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-06 06:59:31.020502+00', NULL, NULL, NULL, NULL, '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '8801', '8802'),
+	('3e574d77-a75c-43b5-9a5d-e7eebf00c774', 'ER0333', 'efed186d-7062-4b0f-b3fe-6e793accc364', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 07:07:04.410174+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('99c4f48f-5003-4082-a6f2-3fe3ed15fad7', 'ER0878', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '7217d519-4204-43ca-aef1-3e86f3ec240b', 46, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:00:08.066076+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('bd35eec6-c5fb-4c38-baea-fe7ba50962cd', 'ER0569', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('f3216718-a77c-4c42-a99f-9eb514da7396', 'ER0275', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', '6de97a77-dbf1-4099-92ea-295416ab0d97', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('afceec67-89d1-42d2-be9e-5fef516a3fcf', 'ER0788', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '1064cee0-359d-4fa6-9157-975be624f378', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 11:36:07.857037+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('f222881e-7c5b-40bc-b1f3-114a5e4358e5', 'ER0671', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 45, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:50:27.469174+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('57c8ab2a-8d1e-490b-89bd-3f96e974a4e4', 'ER0669', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 5, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:39:52.567764+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('6209ad6b-b6d9-4f9a-a8a2-17da74c3176d', 'ER0608', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:41:30.812272+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('e64fa847-4ec0-4e79-83b9-fa5afbae5418', 'ER0934', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 46, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:51:47.058931+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('58b1bd12-5ccc-4644-891f-5ef55932eaf7', 'ER0683', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 47, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:51:55.175489+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('9375c901-f6fb-4d35-b5bd-0c001edfeb1b', 'ER0610', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:37:39.818756+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('10dc8303-de89-4f10-a538-5ee0e981c14b', 'ER0680', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 48, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:52:04.17187+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('4f8451a0-677b-44c9-89c3-53d83eb73fa7', 'ER0900', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:41:39.251796+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('a0fa7cb0-4dea-4c21-8b51-ecc1a40ff744', 'ER0887', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 11:34:23.215532+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('f2957027-6d40-45a0-85b6-547b167298d6', 'ER0607', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 12, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:42:49.026152+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('48812caa-078b-40c5-963b-4c58582a8ffa', 'ER0726', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:43:05.079718+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('1d6a2e84-b74e-49b0-9155-33fb96861e21', 'ER0619', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:44:05.703767+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('1b3951e1-869c-4893-a8ec-ba19eab75283', 'ER0775', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 18, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:44:15.633835+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('c3b6e112-0737-412e-b629-d9cafe653f15', 'ER0891', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 21, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:44:40.44475+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('14002155-e706-4faa-9e6c-692b356ee8f4', 'ER0904', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:44:57.443494+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('fb79cf42-fc44-410f-b9e9-588e960cf3c8', 'ER0655', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:04.242304+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('e3f59448-8875-439e-ab9d-78c4e55e1848', 'ER0797', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 27, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:26.698979+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('fe723b64-d5e6-45fa-a9fa-45a66b820a5a', 'ER0861', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:46:56.711422+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('b9a5d4c2-a033-4381-b430-d4cd88a97646', 'ER0911', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 33, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:47:12.394628+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('9c9a36b0-ab41-4f71-b201-c0ca06f133f9', 'ER0626', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:47:20.825248+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('21268614-a312-4937-879c-f7e9a9bdd8fc', 'ER0661', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:47:38.289207+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('86bc5f24-7671-44df-baaf-b713a8244039', 'ER0675', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:42:21.29407+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('378faa3e-203e-49e4-90cd-b80bf95d14a5', 'ER0689', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 12:46:42.236405+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8701', '8702'),
+	('3cabfb38-988a-4605-997e-130040b93d0e', 'ER0643', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '56eec969-55ec-4bc5-aad6-f4b7b6d17292', 1, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:34:26.563317+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('55836859-9675-4f86-856a-c80073de52b5', 'ER0889', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '91c02bb9-0f91-46ee-9272-9eecf28734d9', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 13:39:43.569482+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('326d2a65-bf33-4d1e-a76c-0810d2036adc', 'ER0225', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:55:55.688698+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('7fb32462-53f7-4a3c-856d-4253590662f0', 'ER0229', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 08:55:58.611697+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('dd188b68-f0b7-43ff-8363-5cfe1f4055bd', 'ER0893', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 37, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:35:01.249615+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('f2c036bb-7c42-4686-b89a-5d8f906d610c', 'ER0811', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 7, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('291cf4eb-ad94-4652-a992-4b034263390a', 'ER0886', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('fa2538ea-43c4-4d8b-8bff-a3ea8c03a9bf', 'ER0832', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('7ab051e3-2b55-4d68-8921-36decea9b9b5', 'ER0894', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 14, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('9537076b-8a9a-437f-bdef-889a7b5de2b6', 'ER0805', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 16, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('4ff67d14-400d-43cc-b4b8-7660f68f8ae9', 'ER0777', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 20, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('2d271a42-77db-42d0-bd6b-5b45e8a77082', 'ER0827', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 23, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('74d2c682-2e7c-4958-bd96-d0d94952b964', 'ER0896', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 24, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('dbca54d0-c441-4158-a799-c2e841acb304', 'ER0903', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 25, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('e222ec86-744f-41cc-bfeb-37c928e90471', 'ER0895', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('61890424-b2de-41d9-9548-4f9761a1aecd', 'ER0627', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 38, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:35:10.666957+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('4aa20b5a-1b6a-4714-b7a2-beca1643b225', 'ER0908', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 40, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:36:17.486582+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('41b9ccf6-ba71-4e7a-a2b0-9c7ddd82585e', 'ER0809', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('9e05c236-b001-48d1-ac12-ef03b133d2a8', 'ER0659', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 3, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('b8ce6b80-a092-44cd-a0d1-10818fc0735a', 'ER0765', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 4, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('8d7987f2-f39f-4e0b-a6b7-6535e373a7a9', 'ER0743', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 9, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('b5cf14b3-08d8-4036-be39-20d3881f9b40', 'ER0597', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 15, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('9cbb6181-3efe-44e8-ae49-5b9f9e2cdd25', 'ER0913', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 26, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:30:26.315248+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('ed40d486-6625-4cf4-a508-1ab61c25fdcf', 'ER0873', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 28, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:30:37.961809+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('51fad6d7-19ad-4629-8619-7e1f41e1ff26', 'ER0763', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 29, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:31:34.330891+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('42291596-a2ac-45be-8149-ca9def38e038', 'ER0883', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', 'de4eac6f-3138-4cd7-a3a3-471fc8807fac', 34, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 14:16:17.149183+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('743ec23a-5e84-42ca-a6dc-4866c618f80e', 'ER0767', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 31, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:32:20.38135+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('d31e1fae-06d0-40ed-a1fa-79e9d3d4460e', 'ER0751', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-05 13:09:19.62863+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8801', '8802'),
+	('7608a57d-626c-4712-b841-989302584afc', 'ER0589', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 32, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:33:30.570544+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('977d61c0-c035-4da0-826c-5e5c4999ac87', 'ER0512', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 10, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('1d2b9978-bdd3-4447-b78e-012d0a6bbe3f', 'ER0916', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 11, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('54fe2abc-ec97-469e-9e34-0454a6aa7b32', 'ER0638', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 13, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('d1d449c7-2b7d-4775-8f8a-488a73479b92', 'ER0584', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 35, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:34:44.48747+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('fd2990f3-7ec8-4397-80b6-b23b94e94c74', 'ER0866', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 36, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:34:56.495722+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '8901', '8902'),
+	('eb6fc46f-3bf0-45f4-822f-07bf7d01e9fd', 'ER0803', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '0834fc83-c8d2-47e0-8ea3-9d330a054bc3', 30, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 12:41:47.048071+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('dae3c1e0-6b6d-47a2-96c0-0e03ee5c52d9', 'ER0681', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:05.953885+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('0690d5d8-be75-4283-9573-af174323fab7', 'ER0851', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:21.518469+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('9cfc891c-caf2-40d7-9139-68a905e12a3b', 'ER0927', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:32.791152+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('007303f5-d4cf-4637-9ca8-264e0acecac4', 'ER0912', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:34.102104+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('0a2ce50c-bf21-4981-8299-7d13fa3497b2', 'ER0899', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:35.003083+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('76a36173-8fa9-4ce4-ba36-c9ac09cc68e5', 'ER0882', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:36.508437+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('3b17430b-018b-4a98-992d-0f088a36501d', 'ER0810', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:15.758055+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('17bc723a-028b-4699-bf7e-815ba20d548a', 'ER0872', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:37.62904+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('ca1a5c47-1025-4346-a330-b0118bf8b757', 'ER0753', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:11.749403+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('71508fed-a930-4460-9bde-03e415b2694d', 'ER0738', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:10.030633+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('ff7c3c22-7dc3-49ba-ac7f-433791bf230c', 'ER0732', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:08.339289+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('99cfa733-16b2-438b-b4d3-9e1f81d32ea1', 'ER0802', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:14.035966+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('d687bc8e-15f5-433f-ae48-a581550706a0', 'ER0685', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:06.716674+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('e80c15f7-523d-40e3-a5f0-3a392c576422', 'ER0672', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:05.148039+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('39713945-dcae-4add-aca2-dc27134bf5f7', 'ER0836', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:17.244648+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('e49d57cf-ce59-40fb-a8fe-66215ee818ef', 'ER0770', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', '6de97a77-dbf1-4099-92ea-295416ab0d97', 17, 'ASSIGNED', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 10:28:24.970084+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('34d4a9b4-ebe4-4f76-b0cc-5a1acca7bd42', 'ER0754', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:12.426587+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('18913cc8-d661-47be-8f5e-3f9e05d7ca08', 'ER0842', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:18.031555+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('95675688-f08c-4fe1-a424-93fe4894a336', 'ER0741', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:10.864436+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('12ac04b3-e661-46c1-9160-4c0bc1ab2f7d', 'ER0865', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:29.767652+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('4bfced66-c757-4dbb-845a-56f8bbe765e8', 'ER0815', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:16.427655+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('5c4e268a-c656-447f-8dcd-1981c8f7cee0', 'ER0737', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:09.266252+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('8184b800-8425-4362-a4f2-308d73d93cee', 'ER0699', '8f717b09-eec1-46ad-be3d-2dc0a56e55e7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-08-07 09:02:07.564492+00', NULL, NULL, NULL, NULL, 'fc558b95-da28-4fc3-8348-311a290c34ae', '9001', '9002'),
+	('82a24ea2-601e-4045-ab17-538dc2272438', 'ER0152', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2352744b-c10d-4cf0-b36f-4ad36c2a0677', 'ER0153', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2666d867-4813-4daa-8dd7-ebc5f70a21ab', 'ER0261', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9a624605-f4f5-4238-861e-bdb6fbe19db7', 'ER0311', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('253ad40a-a50e-4a04-bb3a-dcc0e14e8abb', 'ER0376', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('11518ee8-fab4-4a1d-bd85-f6f07b7d0541', 'ER0377', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ce694206-518a-4f05-ac55-192ea519dd20', 'ER0378', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d9212a9c-91e4-4bf9-aadb-0982f68023ee', 'ER0379', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e81dc982-f5a9-48d9-a477-e3881cd97347', 'ER0380', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c675f3c3-05e1-482f-8be6-7626648984de', 'ER0381', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9119ecce-935f-489f-aa40-35c81a357637', 'ER0382', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6f442d43-8fdc-4a47-941b-897b8118adfe', 'ER0383', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d4b10557-60b6-4c78-b485-54e131668695', 'ER0384', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('148dc5c8-602d-4037-a5ed-bae92bf2fad6', 'ER0385', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('4e2ce2b9-6818-402b-a50c-188995d4fe3a', 'ER0386', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d0a52258-1672-481d-87b4-818d445e27db', 'ER0387', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('86d7948a-a242-4fec-8440-f42a41f4a4b5', 'ER0388', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('921f9015-eb0f-44c6-bc1e-198f47a07354', 'ER0389', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f562ae3e-8c50-482e-8b51-9b7b41318101', 'ER0390', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f6217d1f-68f3-4ee0-b181-a2762cfe1a19', 'ER0942', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('17ea5bb4-8487-4ead-b8e4-89b8711d54b5', 'ER0943', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8f644fd0-62de-4ead-8adf-75320ab65470', 'ER0944', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2af78a0f-0fca-431d-a290-52887b0c2fcd', 'ER0945', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('0508f39e-c950-4602-8d7e-d42cabf175a1', 'ER0946', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9f137ed6-9a36-432a-b01c-3a40fb023beb', 'ER0947', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e55b7f84-285b-4c4a-8b70-70092969133e', 'ER0948', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('47526f83-9b57-4c08-9c6d-82732207234e', 'ER0949', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('0bedca03-367b-470c-bba8-0a7e168f92ae', 'ER0950', 'c900bae3-cc3d-449b-9e8d-e66944ee74b0', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f60950c1-f989-48cd-84ed-9d98732064a8', 'ER0951', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c64ec0ae-da1e-4d7c-af1d-2b9497041cee', 'ER0952', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('0b2dbb6a-5ed6-44f3-b7bb-5d8272a67bf9', 'ER0953', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e8fd5a94-a4d3-4913-8c0b-0a3dfc0a4971', 'ER0954', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('4c7c5a2f-a8c9-4a5e-a05f-b6861d368f6b', 'ER0955', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6a3e4821-4e80-4508-bedd-d5b45cd48e04', 'ER0956', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5f4d69a2-d2bd-4bc5-ba7e-52b0f5d8148d', 'ER0957', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6b60f123-a53c-4a2e-a9e6-3cf930204556', 'ER0958', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2e037141-924e-4ad2-b3f7-6d5672a3e389', 'ER0959', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('da2595d2-13c0-4eed-b0e7-ca81d845c075', 'ER0960', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('16b92cd2-23cf-4da7-8fa0-8a13eb1942ff', 'ER0961', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('0434650c-823d-40f4-b504-418257364515', 'ER0962', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('776d0278-8ace-4f61-a206-c014d7b39ef0', 'ER0963', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8e91ac46-c56b-4497-b6c8-ddd64e667229', 'ER0964', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('04674748-3738-4ef1-a309-a682121a2ee2', 'ER0965', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8e5d21ae-5f67-47c1-8e2c-3ca9e20c5bc6', 'ER0966', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9b4d0300-6bf6-4aa6-8ce6-54916180a2f9', 'ER0967', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('39186290-b971-403b-a20e-e6b5eb59dba0', 'ER0968', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7d90c6dc-a55c-4920-a5e2-3bc338263c77', 'ER0070', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2152baca-bdec-4f94-8e69-dbd0f5d14127', 'ER0071', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('4860e142-17f4-4cdd-bd47-66385e29841b', 'ER0072', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ec7e98eb-d11e-48b5-ad24-00cfa2d59c7c', 'ER0073', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d69b6e4d-d5d9-4a2b-8115-0f9187d64ae2', 'ER0074', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('4e549e4f-345a-431e-bd52-e5a7f64382d3', 'ER0075', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('37cc2c46-29b4-471b-ac14-b477bba1c327', 'ER0076', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('356b53b3-96aa-4492-84af-c2bbb52efaea', 'ER0077', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a0eb134a-eba4-474a-b626-5bc8b36f227c', 'ER0078', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b2dff577-0936-4c18-9d0e-230a7a849961', 'ER0079', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6d16f4b1-2f75-45c1-b2c7-3f40904a1575', 'ER0080', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('10c05111-3911-4ccd-9c3c-37a0987d4173', 'ER0081', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f954b452-4e25-4264-bc13-eb16ca417ba2', 'ER0082', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a1fa9465-a47d-4b95-aa54-0b803e26f602', 'ER0083', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('bb024e14-18c9-406a-b3dc-c2dc307234a8', 'ER0084', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2a26eca4-dc74-4ba1-bf1b-443ea8c19164', 'ER0085', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('260e3c8c-7022-4e81-a70f-fb6d60d14b25', 'ER0086', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('439fd5ed-a5c8-47ee-aafd-a6fb79017983', 'ER0087', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a8608b11-3767-4c1c-834c-3fb11a4f9625', 'ER0088', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d28dcca0-79cf-44f9-bbcc-f05dfb3871d8', 'ER0089', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b345bc32-e194-4109-b05a-2d792f00c7ae', 'ER0090', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a2d5d82b-973b-4382-aba4-d4151d25927a', 'ER0091', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d71f0ea6-7662-4521-9b0e-d0e01af9ac26', 'ER0092', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ddbb0b22-28be-48fc-bc08-1f85f923d827', 'ER0094', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e1dcb1cf-a2aa-431f-afa1-cc24ae5b3302', 'ER0095', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9ac824d7-df2a-4be1-9a4b-b26911728a4a', 'ER0096', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5c30b86c-7ef0-4a5c-ba20-0dcea842c8c9', 'ER0097', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c883e7d4-39b8-4ce4-8d92-11e9985bcdb1', 'ER0098', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b3ccb0fb-b540-4edd-b20b-c600511507d8', 'ER0099', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('538ab731-707b-4b20-ae3e-344fc4b90f44', 'ER0100', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('19139af6-ff29-401f-a637-9ef3b50e6ea6', 'ER0101', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('32f1d7e2-3a53-48ba-a347-ef9164433465', 'ER0102', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3ec374ec-04c4-4e9f-b073-02283d98d944', 'ER0103', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('63ca48e7-7c69-45ea-91aa-623519e7653b', 'ER0104', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8be5aef4-41c2-4f11-95e1-708e74847d20', 'ER0105', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('723d54cc-cb65-431f-a83f-16a8e827fb5b', 'ER0106', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b6b7fed7-231a-4230-992f-6244d3e52bac', 'ER0107', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e47ccd47-3f33-4e50-af06-6ac4d339c411', 'ER0108', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6d217c67-cc0d-40af-ab5d-30c3036fa6be', 'ER0109', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('59999ba9-c609-4dde-9db5-61d7e18dae2d', 'ER0110', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('857396aa-1b93-438f-a1e4-0dacc515213e', 'ER0111', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f728c543-429f-4edf-98a1-3540012b0260', 'ER0112', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('af4ef229-a913-4c9e-a99b-bfa01462f21e', 'ER0113', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('75d100a5-81df-489b-97ca-457dfaf86ed9', 'ER0114', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('95812dc4-47e3-4413-9352-0a0fc8809684', 'ER0115', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('64b095ec-b141-42ad-b8b4-6c5a3b56d647', 'ER0116', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6964d051-7cae-4ea2-b46b-22807f63ad34', 'ER0117', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ac1a30d0-50e8-4471-8d06-0fd09267cec5', 'ER0118', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('cba88223-8555-4d67-821e-5545c8a2ade6', 'ER0119', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9fddbe77-b75c-4a44-b8b5-03d4e504d3c8', 'ER0120', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f902dfa7-b222-4c91-8b80-b926b2d27804', 'ER0121', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e4bca58a-fc36-4def-979f-c01ccf81a0fb', 'ER0122', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('23167608-94ed-4693-b632-ace98e265fc8', 'ER0123', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('dc15efc5-16e7-427e-8ad8-8ee9e77062e7', 'ER0124', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3cd95607-df36-431b-bdf3-b2e23a5ecce5', 'ER0125', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7c0c802d-c780-41c9-9cfc-93b257f919ce', 'ER0126', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5d7c4edb-2d9a-4fd8-bdad-0c27dd964ad5', 'ER0127', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('700eef99-d417-44cc-9117-c7b3e333f568', 'ER0128', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('1e00b5cf-3410-44fb-b9cb-3ae248c28dba', 'ER0129', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('776bc221-b33e-499c-8e4c-a3276c96f1a4', 'ER0130', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('aa9787e5-fe74-4446-bda7-f415e5d9356a', 'ER0131', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('4cad29ea-04c3-43c7-8bca-73f2079003fc', 'ER0132', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7bd1d525-6cdd-4563-9869-6b37d57b0d05', 'ER0133', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5c1bbfd4-5c29-4f4e-93bd-8a987aade639', 'ER0134', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('dafc1ab9-6e06-48e9-b6eb-272334176097', 'ER0135', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('1967d81c-38b5-4bec-ab69-899f193325bb', 'ER0136', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6cff2b1c-3059-430a-bc92-f4bbe1f7b89c', 'ER0137', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d7811177-34ee-4b0c-838b-cff212e7dbc2', 'ER0138', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('59eebc43-1100-4d9c-ad44-3e33ed26e220', 'ER0139', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3827bc55-018c-4e63-b141-ae0c694cf912', 'ER0140', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('707cffae-d9e7-4d27-8416-a9402483c052', 'ER0141', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('79ad43db-b334-47e9-992b-753634e8f707', 'ER0142', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('bcb61e30-cfb9-4df9-be16-b2d8a2e60c87', 'ER0143', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2f9c8471-cff2-4831-b225-f52795b6bfb7', 'ER0144', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d167f5a3-89a9-42eb-bb95-a5184bea49c7', 'ER0145', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ca5e87e9-2778-4f8e-a437-f6157ab23d81', 'ER0146', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('16ea60b9-52c2-4835-96f3-195a6fb53338', 'ER0147', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b5fe5fca-e621-4d32-93d3-a1f175b04dd6', 'ER0148', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ed53a790-c644-4d9f-9489-94a4ef64930e', 'ER0149', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('738139c7-b791-4b62-ae15-f2c17142a918', 'ER0150', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('47761149-c4ea-4647-9f5e-08fc74d4534c', 'ER0154', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9b329f3a-469d-4feb-ad76-79650e345650', 'ER0156', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6f24f8e2-03d9-4180-8b50-85c96f5bbbdd', 'ER0157', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('bd9687a5-ccaa-40c0-a30f-5ec9a74faa01', 'ER0158', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5c3259dc-df54-4aa3-b61b-141f6a936956', 'ER0159', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('abdd2d1d-6f30-42a8-b991-7708bc9142b9', 'ER0160', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8f917b2f-201e-4827-816a-db71237ea7b7', 'ER0161', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ac50df2d-eb2b-45a7-93d2-5001fb492412', 'ER0162', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f73a02a7-c502-42b3-a24c-10c6ed56159d', 'ER0163', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c6a1b24e-ba64-437d-9447-de659c3f9ed0', 'ER0164', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('52f7f983-f3eb-4e8b-91ec-4963c050439d', 'ER0165', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('81fa66c6-ef6c-4519-9a56-3b792c6b809f', 'ER0166', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('2d073f4d-b48c-4f1b-b08c-176ad69bbcbf', 'ER0167', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f1f1ecb4-a14f-4eaf-8303-914a31d77758', 'ER0168', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f0742e58-60ef-4a29-830e-800a2e02baa0', 'ER0169', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('64816cec-9b89-4bfd-b3ab-9d141cdd9dea', 'ER0170', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('352d7b66-1bf6-4faa-8107-bdc64aaaf71f', 'ER0171', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('755e4179-018e-464d-a71a-6d8ec4616f38', 'ER0172', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6f52ceb5-a596-4146-a52d-b7e01b896032', 'ER0173', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e68f3425-5bca-44d0-a447-d78ed3107596', 'ER0174', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7b62b6c7-1fee-43c7-875c-70785748e1be', 'ER0175', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5217dd7a-99dd-48c9-8c75-6bb06f890935', 'ER0176', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7763c2c5-ef48-49ed-beec-066a81ba5491', 'ER0177', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('90e65e25-e41d-423d-b9a9-273f87f547d5', 'ER0178', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('57be43c1-7ef5-47db-884d-30b56ed3ef2e', 'ER0179', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d360522b-6747-48a7-abcf-4f85e43beabe', 'ER0180', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('789410cd-fede-4a06-988d-5834ae8580db', 'ER0181', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d44bfc70-5c4a-468c-8a77-f44a82923bb4', 'ER0182', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('80ea2c38-e963-43ff-b709-7a526c9ca492', 'ER0183', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('630e0bb1-3d42-4aca-83b6-7b70ea27a63f', 'ER0184', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8a0117ee-f843-4479-9d31-b0461333b804', 'ER0185', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8a3b746d-4a7d-4e99-be34-ba26e02aa170', 'ER0186', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8c266122-8c3e-47f6-a705-f398bb6af107', 'ER0187', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3c974e56-246b-43a9-b742-ceb8b9d96a93', 'ER0188', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5df59e3a-9ab4-4abd-aa12-47af57732759', 'ER0189', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('69b4bc4c-001c-47ed-9cfe-ce75a1fe094f', 'ER0190', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('945c6183-dc92-489e-a156-741df2f72852', 'ER0191', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b06b0650-4920-4bbe-bcbc-31b5e2c856ee', 'ER0192', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e597d2e8-c148-40aa-8dcf-f5106f332d45', 'ER0193', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('0d9e8732-4e29-44a8-aab0-22ba88a1c974', 'ER0194', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ab1b4606-d336-4d14-9b6c-375735d1993e', 'ER0195', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a4fc2297-dcb7-4e12-94a4-87336dc6daa0', 'ER0196', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('92539eb9-9983-4deb-93d0-d80087c1e36a', 'ER0197', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7c400f6d-5e8b-4b0d-b1e6-82706eb33f3d', 'ER0198', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5c46838e-fe94-4118-bb99-f5e31dcfa90a', 'ER0199', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('325da358-b778-4558-b420-c9a036a3cca5', 'ER0200', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e73b17fb-a74a-4cc5-b0a2-271f2e44c948', 'ER0201', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a69393be-1b43-4126-93a1-594153207d95', 'ER0202', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('863fdbe2-ca4a-42ef-a9de-1d00f7876149', 'ER0203', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9beea13d-25ec-4e55-bb50-4a1fb798bc24', 'ER0204', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('727d6f6d-8b57-469a-b8ab-ef4c049b4e6b', 'ER0205', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('af85bd80-6da7-4727-8247-d9881dfcd6c9', 'ER0206', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('be39365b-eb0d-4e13-ab47-fa78ad6354c9', 'ER0207', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('008b8b08-2556-483d-975f-59621d2dd2d0', 'ER0208', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('17472ed5-5b63-4368-80c9-97c2313c40e2', 'ER0209', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d2c10572-aa46-4d3c-a9d6-be35d0ef98f2', 'ER0210', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a5f04d27-31b0-4e0d-936f-0706f297420c', 'ER0211', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ccca0043-5d89-4eff-a984-43503a74f219', 'ER0212', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3a547c97-e0dc-4732-bd1e-8e0c846bc304', 'ER0213', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('007d5816-58d4-427d-b8b8-f8024fe1675b', 'ER0214', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f5e85a78-d94a-4145-9751-5592f771aaff', 'ER0215', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8fb01995-adf9-48dc-ba35-285c6bab549c', 'ER0216', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('cd1318bf-b81e-49f4-bcf0-7d634c2fe770', 'ER0217', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f6375f89-2072-4644-bfbb-bc6a1be37427', 'ER0218', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8561ed45-3ba4-40e4-9ea1-51a38dbba008', 'ER0219', '8eec3a7d-8482-4397-96b6-59a028210722', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ea7d7949-e359-4622-8c8e-4b55fcf7a979', 'ER0281', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c8979fd7-8098-41d5-a9ae-9a5e14d23a22', 'ER0321', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3b0c8f9c-9d94-4a40-b3ab-c2781ba5d912', 'ER0351', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('023d45a2-69b1-4892-add1-54c048c48b7f', 'ER0352', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d24be559-0ef5-4c3d-9425-9a61f3ddfd9c', 'ER0353', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ef462152-d889-495c-827a-6093bc82b14c', 'ER0354', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5d369e5a-e560-4be9-85d8-9fdcf24478d9', 'ER0355', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('74f29b27-31d6-4c1a-9946-ed1f0db13cc4', 'ER0356', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('4bf3f0ed-c7db-49e4-a080-33c876703b99', 'ER0357', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c0df3452-0314-4046-ad36-085b64424cec', 'ER0358', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('94ef6e51-ec61-431f-b0be-39a3d92aa0b9', 'ER0359', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('47a4ee4d-4852-4bfb-8ad8-2834199a6c68', 'ER0360', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d155a909-c38c-40cc-9407-cfd96da9c14a', 'ER0361', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('763f38a9-8231-47c4-a5ad-6cf2cd4f55d1', 'ER0362', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c0ba94a3-8ca5-4591-b89c-e41cc4f0b4d6', 'ER0363', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8e47c26e-3152-4944-ae04-0add9e3450db', 'ER0364', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('68b5c423-bc1d-469a-9e94-b97384c63df1', 'ER0365', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a5d58f28-5804-45f7-8efb-c11b60105b21', 'ER0366', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('13b1a7f5-2f31-4a3d-aa8e-b403d8433bd7', 'ER0367', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('260c0a7a-e225-48f3-9e53-4e47640d0b2c', 'ER0368', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('1cbca24d-fab4-4bdb-a817-7b4228041727', 'ER0369', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('53568596-4b14-430f-ac61-6aaaf94a4550', 'ER0370', 'df1708d4-35dd-4ce2-aa73-f5061e534df7', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('29284c83-7dc9-495f-80b0-45d871922250', 'ER0371', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('58a17ba2-e515-4d69-8189-72392efbc62a', 'ER0372', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ef87c120-d1a4-4e96-aa10-c182bf5bfef3', 'ER0373', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c162a1e3-afb8-443f-8e84-3e25271f9804', 'ER0374', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ebab06d6-3700-4d0d-9edc-251b3761ee23', 'ER0375', '32b8a35f-5792-4c46-aa4f-ca22187faf18', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c3efe06c-f5c0-4414-9042-ecdb05f0a484', 'ER0969', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('67900c79-3d3a-4e5e-83f0-10433c4035e5', 'ER0970', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('af758500-8e0d-4568-827a-a845fbffb71f', 'ER0971', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f3f5b82f-5c8a-44c0-8c01-d03662ee8815', 'ER0972', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b82ae8fa-cdb5-44db-9789-e6cf9121e761', 'ER0973', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('398e15ea-80a7-44fc-894a-ccccf4c8ccdf', 'ER0974', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('310795ad-322c-42e0-9cc1-a27a45c34116', 'ER0975', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8bc227da-d4d1-486e-a497-1c29c03d8d08', 'ER0976', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('72619666-8b90-4c46-91a8-e6f64ee0ce54', 'ER0977', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a4cb83d7-6dd2-44bc-86fa-296f45adeef6', 'ER0978', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('5eacb9c8-1af0-4a6f-a6b0-5b2c95320ec7', 'ER0979', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('991d1fc6-1d79-448d-842b-4ef8524c6ef1', 'ER0980', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO freight.wagons VALUES
+	('29068caa-c1b9-47d2-bdd8-f4ff0d6faa4e', 'ER0981', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('77cfe49a-f4c9-4c86-a6ac-a2e72a64bac2', 'ER0982', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6aeb0e43-366d-43bf-ba06-95b5887b3b6e', 'ER0984', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e8870f2f-a790-4d3b-990b-f67a12324b20', 'ER0985', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('bbacfaa2-afd9-40f7-b067-56a77e4043db', 'ER0986', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('1dfabd43-cab1-4e34-8455-3d818d66d6f2', 'ER0987', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('1a38286e-ff9b-4e25-a813-960fb9f277f1', 'ER0988', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('83fa77d0-110e-4109-b5e4-e98081f8a9a7', 'ER0989', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7b32b1ff-281e-485d-8b84-4aab0c6533cf', 'ER0990', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f19ebc8a-39a3-4eb0-8fd1-aff36d2d7cad', 'ER0991', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7b355974-ece8-4984-8726-4844ed1d47ac', 'ER0992', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('017a8f86-f4e1-4719-ad21-698826eadc73', 'ER0993', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b9006420-6a1f-4858-9527-c23b7582b9c2', 'ER0994', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('66da1027-6612-4a65-abf6-2d2fa578352b', 'ER0995', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e9890831-5154-4362-b2e4-cf056d073cc1', 'ER0996', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3a5df2fa-406c-466a-8795-317cdb367b63', 'ER0997', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3414ae1a-a963-4e80-b3ad-2f5ab4b9928a', 'ER0998', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f92d6318-34dc-417d-be44-b9ad1d1c293e', 'ER0999', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('904a4532-f9b7-4d45-ab29-05088ec062b4', 'ER1000', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('471fce0e-f504-4d59-a772-62d265024038', 'ER1001', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8bd6a4a6-9c2d-4ba5-b1ff-e33054cdf6b4', 'ER1002', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8a23e93a-8cb0-4d8b-b8d7-a5366805c2ee', 'ER1003', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7a2ade8f-a1bb-4fd9-ba18-226d5d4d80e1', 'ER1004', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('678a6089-e99c-461d-94f6-eb9920567a56', 'ER1005', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('89f94aa8-97f8-412e-8c95-6599df312924', 'ER1006', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('7e60ea43-5bb3-40fc-825a-7861ee58b0b7', 'ER1007', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f3b0222a-46d9-4ebd-9426-9962540ec44f', 'ER1008', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a199f434-12d0-4ce4-978d-3aa5513f8ac6', 'ER1009', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('cd6a5f3c-60c1-4131-a4f2-e66fddf962eb', 'ER1010', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('941a85d3-0840-4d22-a6a1-478113c234d4', 'ER1011', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('be377f74-7604-444a-aaba-cd309d4f6b37', 'ER1012', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d8aa2d10-ff65-4983-846a-c5d1ac56e1ab', 'ER1013', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('16ad37a1-deca-480a-8698-a3d221044220', 'ER1014', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a65e87ef-6e64-4037-8be1-26fee6257ec4', 'ER1015', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ad4dce10-f40d-46b2-ae2e-4739a168abeb', 'ER1016', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('37969895-c798-4129-ad72-7b72e3c699fb', 'ER1017', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a7326afb-3662-436c-aade-0f9be262857f', 'ER1018', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('55d2bad0-d912-4cf5-ac94-fd7244be7194', 'ER1019', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8a466332-4a89-4981-8787-4cca90f38832', 'ER1020', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d1e41312-11b1-4e52-864f-5bcfdc9ce308', 'ER1021', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b9093e3d-f493-449b-bb01-868785acaba7', 'ER1022', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f6be1d0a-6396-424e-898e-ee09fbcca2b2', 'ER1023', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('94c37d67-51df-4bc4-9d05-35e2df11480d', 'ER1024', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d0a52769-71fc-4f9a-a536-878c2915078e', 'ER1025', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('53b6f431-3178-41f0-bebe-b1a44c32047d', 'ER1026', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a7197dd5-6c33-4e50-b098-2465b0580e26', 'ER1027', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('1011ad0e-b814-4df7-aa1a-fc3261f3211f', 'ER1028', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('430f2ef5-807a-4614-94cc-198918b8ec10', 'ER1029', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('889a8897-9d50-44c5-bc11-27bc1bfbc6e7', 'ER1030', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('e6314a38-a81d-4b18-935c-42944acf9907', 'ER1031', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('cb5079e8-2f7d-498d-96cb-89416aa74b40', 'ER1032', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('cd68e488-f1d5-4871-add5-50de8d68a6ee', 'ER1033', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('103d04d8-022e-4b55-974b-d1847be4ad32', 'ER1034', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('bb01453a-c6fa-477c-96a7-2f9050b207d1', 'ER1035', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('d2639563-06c7-4bb5-9378-0aba5fe92fcd', 'ER1036', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6e07f999-55a7-4e82-9fd6-bb58f4080678', 'ER1037', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('265ff8e6-0520-4b5e-a276-9511d61461ba', 'ER1038', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8e6cc4b0-ebb4-456b-9f08-95cc26e846ea', 'ER1039', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('871e6ce5-0cb1-47a9-a78c-0330182e69c1', 'ER1040', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('a61e343c-ea54-41b6-a82d-c84f32093d9a', 'ER1041', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('364119ac-6b89-4ab5-b35f-88dc1396d204', 'ER1042', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('23a36df1-9d31-44ec-babb-a3325013a466', 'ER1043', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('f7a5b48c-a156-455b-a13c-0cf7c6209aad', 'ER1044', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('0c49df63-df1e-454f-827d-0df0d2cbcdb8', 'ER1045', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('fba11112-6ba3-497f-b0ad-71da281c5a55', 'ER1046', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('b55ab787-8c46-4b31-b3be-c3e8037214ba', 'ER1047', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9ac80a38-a97e-43a6-b326-7d2eaba7f433', 'ER1048', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('73618289-ffb6-4a26-a3f5-8f5e1694cb68', 'ER1049', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('baa2700c-bdd2-462c-b883-13b0e763c750', 'ER1050', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('4fc785a0-3a11-48f3-b255-fbcb84f3da39', 'ER1051', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('931b6a3b-9818-4897-a8ea-52229fd57a8d', 'ER1052', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('80a44163-30b1-4578-9c5e-7cb21b3badf0', 'ER1053', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('300433d7-2d65-400a-908d-1d76d16bae52', 'ER1054', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('37a218fe-46b6-4c44-ab80-f7d34a4d16fa', 'ER1055', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('ef03a753-49b0-4946-8296-8062d907b788', 'ER1056', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c831ae05-1800-4a3d-bfbb-c03092d4e5dd', 'ER1057', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('16026fab-92b8-4081-aa11-4b4a5f9d627d', 'ER1058', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('259478c3-71e2-46ac-bfa3-a8e6bee5ad7a', 'ER1059', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('6c311954-96e5-446b-973e-79edb6a3533c', 'ER1060', '07c38e9a-7627-4be9-af41-7651957aca3d', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('8c30540e-2222-4d23-a2ec-0199316fc01a', 'ER1081', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('3a59336e-c0c4-486a-bdbc-2a736ef03ba1', 'ER1082', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('43f15463-4f31-4255-bc63-4a63dc127034', 'ER1083', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('998bb722-7344-421a-8401-3cba3035f999', 'ER1084', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('faced5a6-be31-4fa5-a514-2011ec137285', 'ER1085', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('208fa65d-456a-4c9e-b8e7-9a2691fc0bd7', 'ER1086', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('9f81b959-83e4-4c47-a7f6-82ec00265cdc', 'ER1087', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('fc535bb7-34d7-4b8b-ad12-38d4eb299bcc', 'ER1088', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('c2a8f33c-8a90-409a-be09-cc91f5009d10', 'ER1089', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('18c91bc8-3291-47e5-b5b0-9ee1aff8ff10', 'ER1090', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('92d92907-876d-4c12-8b9f-6721315021dd', 'ER1091', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('05507fd8-f9ff-497a-b33c-d689478edd29', 'ER1092', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('28e1a423-9180-4ea4-9d5a-9fcfbd006e7d', 'ER1093', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('28f8fa14-3a19-431e-a298-e6f1f60bcb73', 'ER1094', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('264a9721-bfbb-4c64-9b5a-860c7e52a626', 'ER1095', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('40bccad2-5129-4038-a5e8-4f5e0737dfb4', 'ER1096', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('20e26fc2-3f97-4a60-8e8e-8b568f7c8a52', 'ER1097', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('094d902a-dccb-4f95-b009-782ff629b4fc', 'ER1098', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('14327e40-f6e9-45ab-9c37-7c4d01536bfa', 'ER1099', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('92c22b8f-5105-4464-afb0-aea84c614c45', 'ER1100', 'f4ba54be-002f-46cb-af7c-ff55ed84dcdd', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+	('27b00c01-cee9-45ea-b01a-2cd951acb798', 'ER0251', 'bcfcc533-01be-4e82-952c-26e20e7ecdfc', NULL, NULL, 'AVAILABLE', NULL, '2026-07-27 11:32:03.580707+00', '2026-07-27 11:32:03.735237+00', NULL, NULL, NULL, NULL, NULL, '9001', '9002');
+
+
+--
+-- Data for Name: warehouse_accrual_acks; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_activity_log; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_allocation_rules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_fee_rules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_inspection_reports; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_inventory; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_inventory_movement; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_loadings; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_yard_cargo_types; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_yards; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouse_zones; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warehouses; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: warranties; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: weight_limit_rules; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.weight_limit_rules VALUES
+	('be79c917-0fea-4802-bb89-68dcf46b0baf', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'EXPORT', 25.000, '2026-07-18 05:32:03.767+00', '2026-08-04 07:50:53.320369+00', NULL, 30.500),
+	('7e42ab3a-8066-4e84-baaa-891158461ba3', '77cf24ec-e74b-4bdb-b1cc-6f336379cc58', 'IMPORT', 20.000, '2026-07-18 05:31:39.014+00', '2026-08-04 07:51:02.787452+00', NULL, 30.500),
+	('b1ae1430-dbf0-46ae-b9f2-fc76fc065742', '349072e7-8a90-4c03-b682-08976abfd7e8', 'IMPORT', 32.500, '2026-08-04 07:52:28.407742+00', '2026-08-04 07:52:28.407742+00', NULL, 32.500),
+	('876ba9f1-3566-47f9-bbd9-263a1d28377b', '349072e7-8a90-4c03-b682-08976abfd7e8', 'EXPORT', 32.500, '2026-08-04 07:54:08.35154+00', '2026-08-04 07:54:08.35154+00', NULL, 32.500);
+
+
+--
+-- Data for Name: work_orders; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: yard_distances; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.yard_distances VALUES
+	('0e41b970-624d-40ce-9916-d21df7971fd9', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 334.00, '2026-08-04 13:57:03.61038+00', '2026-08-04 13:57:03.61038+00', NULL),
+	('b4c6a03b-d76d-4d63-be02-533113f35cd9', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 869.00, '2026-08-04 13:54:27.291077+00', '2026-08-04 13:54:27.291077+00', NULL),
+	('b8838737-5a3c-4bdc-8a00-7cc2b7ded5f4', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 819.00, '2026-08-04 13:54:43.266791+00', '2026-08-04 13:54:43.266791+00', NULL),
+	('5885bdcc-cf11-430b-af4e-84caa7fb85c8', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', '23fda607-6cc6-4923-b05b-56b7adb1626b', 746.00, '2026-08-04 13:55:00.015441+00', '2026-08-04 13:55:00.015441+00', NULL),
+	('fa4ccacb-0639-4e94-adf8-963625be5a17', '2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 319.00, '2026-08-04 13:55:20.162112+00', '2026-08-04 13:55:20.162112+00', NULL),
+	('38868c91-0a14-4506-9de8-ed0092adc346', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 880.00, '2026-08-04 13:55:58.641536+00', '2026-08-04 13:55:58.641536+00', NULL),
+	('842a108e-abde-45c9-9d35-8548abb44e5c', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 938.00, '2026-08-04 13:56:25.050387+00', '2026-08-04 13:56:25.050387+00', NULL),
+	('6e3180ee-8109-4de9-8ae0-2f895452f73a', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '23fda607-6cc6-4923-b05b-56b7adb1626b', 858.00, '2026-08-04 13:56:42.61084+00', '2026-08-04 13:56:42.61084+00', NULL),
+	('8b6abac3-f031-4e60-bc95-106f75ec3db2', '7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', '1e2fa308-c9eb-4480-840c-e486b1d98029', 918.00, '2026-08-04 13:57:19.60419+00', '2026-08-04 13:57:19.60419+00', NULL),
+	('9e98f4a7-9389-4292-b0b8-59d21cf8a6dd', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 380.00, '2026-08-04 13:57:51.468721+00', '2026-08-04 13:57:51.468721+00', NULL),
+	('292f404c-42de-4d54-b96b-29e9618daa98', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', '1e2fa308-c9eb-4480-840c-e486b1d98029', 535.00, '2026-08-04 13:58:15.75051+00', '2026-08-04 13:58:15.75051+00', NULL),
+	('8801f07c-ae89-409d-aacd-d2e80e75dd58', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 55.40, '2026-08-05 11:13:59.377538+00', '2026-08-05 11:13:59.377538+00', NULL),
+	('47677f2f-f388-40b6-8f75-4801e79292d4', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 'fc558b95-da28-4fc3-8348-311a290c34ae', 817.00, '2026-08-05 18:22:07.515643+00', '2026-08-05 18:22:07.515643+00', NULL),
+	('ae036e73-4ca4-4737-8a5c-46cb17482eb6', 'fc558b95-da28-4fc3-8348-311a290c34ae', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', 867.00, '2026-08-05 18:30:33.322191+00', '2026-08-05 18:30:33.322191+00', NULL),
+	('556b8184-59ba-4d18-a4ac-5f552f6c12d8', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 'cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 375.00, '2026-08-05 18:33:00.477338+00', '2026-08-05 18:33:00.477338+00', NULL),
+	('4ca36c39-c89d-4a91-a539-2264191a5393', 'fc558b95-da28-4fc3-8348-311a290c34ae', 'f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 316.00, '2026-08-05 18:35:30.574021+00', '2026-08-05 18:35:30.574021+00', NULL),
+	('f843c946-b905-4546-8817-48125321fe68', '61ae1e66-c229-4dcd-9851-b2b9424f3a95', '23fda607-6cc6-4923-b05b-56b7adb1626b', 76.00, '2026-08-05 18:50:16.919743+00', '2026-08-05 18:50:16.919743+00', NULL);
+
+
+--
+-- Data for Name: yard_facilities; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: yard_locations; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+
+
+--
+-- Data for Name: yards; Type: TABLE DATA; Schema: freight; Owner: -
+--
+
+INSERT INTO freight.yards VALUES
+	('61ae1e66-c229-4dcd-9851-b2b9424f3a95', 'KALITY', 'GMP (Gelan Multipurpose Port)', 'Ethiopia', true, 3, '2026-07-27 11:31:59.400905+00', '2026-08-04 08:45:07.898298+00', NULL, true),
+	('f7b1686f-d43e-42aa-bc6a-d3d5849296c9', 'DIRE_DAWA', 'Dire Dawa Port', 'Ethiopia', true, 12, '2026-07-27 11:31:59.400905+00', '2026-08-04 08:45:58.339151+00', NULL, true),
+	('2187ac77-1d23-4f6c-ada8-e12c9bacd88c', 'NAGAD', 'Nagad Port', 'Djibouti', true, 19, '2026-07-27 11:31:59.400905+00', '2026-08-04 08:46:30.596448+00', NULL, false),
+	('1e2fa308-c9eb-4480-840c-e486b1d98029', 'SEBETA', 'Sebeta', 'Ethiopia', true, 1, '2026-08-04 08:06:27.58091+00', '2026-08-04 08:18:17.610749+00', NULL, true),
+	('e944b82d-5ac0-4843-817b-2fcb6ddb5b06', 'LEBU', 'Lebu', 'Ethiopia', true, 2, '2026-07-17 11:04:12.618+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('6083a69b-d4ad-49bb-be45-95acaba6d197', 'BISHOFTU', 'Bishoftu', 'Ethiopia', true, 4, '2026-07-17 09:22:19.03+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('cea2955d-5da4-4e1c-a3fa-652d94d8df1a', 'MOJO', 'Mojo Dry Port', 'Ethiopia', true, 5, '2026-07-27 11:31:59.400905+00', '2026-08-04 08:18:17.610749+00', NULL, true),
+	('23fda607-6cc6-4923-b05b-56b7adb1626b', 'ADAMA', 'Adama', 'Ethiopia', true, 6, '2026-07-17 09:22:59.392+00', '2026-08-04 08:18:17.610749+00', NULL, true),
+	('6a372083-6f63-42f5-9bac-afd776559945', 'FETO', 'Feto', 'Ethiopia', true, 7, '2026-07-17 09:23:37.716+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('874aa661-2065-436d-b8a8-45238848d520', 'METEHARA', 'Metehara', 'Ethiopia', true, 8, '2026-07-17 09:24:09.157+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('25a0a1ec-dcd3-48cd-9af8-acd611b7bdcf', 'SIRBA', 'Sirba', 'Ethiopia', true, 9, '2026-07-17 09:24:19.496+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('73fccf2b-1eea-4772-a5fc-a4487219bf20', 'MEISO', 'Meiso', 'Ethiopia', true, 10, '2026-07-17 09:24:34.861+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('7c8c8909-be75-4cfa-995f-0e2c58bda71b', 'BIKE', 'Bike', 'Ethiopia', true, 11, '2026-07-17 09:24:51.596+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('65fccdcf-fbbf-42ad-80b1-4fd8f7403325', 'AREWA', 'Arewa', 'Ethiopia', true, 13, '2026-07-17 09:25:06.084+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('59e53178-ba1f-46c6-ae56-86d169a20829', 'ADIGALA', 'Adigala', 'Ethiopia', true, 14, '2026-07-17 09:25:20.638+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('4ca1f68a-be26-473d-ac49-99eeb417e789', 'AYSHAH', 'Ayshah', 'Ethiopia', true, 15, '2026-07-17 09:25:47.277+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('b4cbca40-4256-40cc-b10b-e2e30c7407b0', 'DEWALE', 'Dewale', 'Ethiopia', true, 16, '2026-07-17 09:26:03.099+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('34cd401c-9048-4ed1-b1e7-d1c61b6ecd1f', 'ALISABEH', 'Alisabeh', 'Djibouti', true, 17, '2026-07-17 09:26:43.682+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('5241fc9e-93ac-4844-a20f-c3153bde771c', 'HOLHOL', 'Holhol', 'Djibouti', true, 18, '2026-07-17 09:26:53.991+00', '2026-08-04 08:18:17.610749+00', NULL, false),
+	('fc558b95-da28-4fc3-8348-311a290c34ae', 'DORALEH_FREEZONE', 'DCT/SGTD', 'Djibouti', true, 22, '2026-07-23 07:06:17.982+00', '2026-08-04 13:54:00.862187+00', NULL, false),
+	('7b658678-ce2b-41aa-8dc5-b38ba4a76e9b', 'DORALEH_MULTIPURPOSE_PORT_DMP', 'DMP (Doraleh Multipurpose Port)', 'Djibouti', true, 21, '2026-07-23 07:05:36.326+00', '2026-08-05 21:28:16.030175+00', NULL, true),
+	('7d1b9c9c-372a-41ea-8125-363163fc6351', 'DJIBOUTI', 'Djibouti', 'Djibouti', true, 1, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, false),
+	('91c3912b-036a-4a09-b9f7-f70d0da0b717', 'ADDIS_ABABA', 'Addis Ababa', 'Ethiopia', true, 2, '2026-08-09 20:15:36.202428+00', '2026-08-09 20:15:36.202428+00', NULL, false);
+
+
+--
+-- Name: migrations_id_seq; Type: SEQUENCE SET; Schema: freight; Owner: -
+--
+
+SELECT pg_catalog.setval('freight.migrations_id_seq', 314, true);
+
+
+--
+-- Name: seq_company_profile_ex; Type: SEQUENCE SET; Schema: freight; Owner: -
+--
+
+SELECT pg_catalog.setval('freight.seq_company_profile_ex', 7, true);
+
+
+--
+-- Name: seq_company_profile_ffe; Type: SEQUENCE SET; Schema: freight; Owner: -
+--
+
+SELECT pg_catalog.setval('freight.seq_company_profile_ffe', 1, true);
+
+
+--
+-- Name: seq_company_profile_fwj; Type: SEQUENCE SET; Schema: freight; Owner: -
+--
+
+SELECT pg_catalog.setval('freight.seq_company_profile_fwj', 1, false);
+
+
+--
+-- Name: seq_company_profile_im; Type: SEQUENCE SET; Schema: freight; Owner: -
+--
+
+SELECT pg_catalog.setval('freight.seq_company_profile_im', 7, true);
+
+
+--
+-- Name: seq_company_profile_tr; Type: SEQUENCE SET; Schema: freight; Owner: -
+--
+
+SELECT pg_catalog.setval('freight.seq_company_profile_tr', 1, false);
+
+
+--
+-- Name: approval_rules PK_048d2ffdf7169337b4cc237d772; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.approval_rules
+    ADD CONSTRAINT "PK_048d2ffdf7169337b4cc237d772" PRIMARY KEY (id);
+
+
+--
+-- Name: company_change_request PK_0a57bba5aaf77b376e7fee5fcf8; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.company_change_request
+    ADD CONSTRAINT "PK_0a57bba5aaf77b376e7fee5fcf8" PRIMARY KEY (id);
+
+
+--
+-- Name: interchange_document_items PK_163803862ca83ef98678e39a43b; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.interchange_document_items
+    ADD CONSTRAINT "PK_163803862ca83ef98678e39a43b" PRIMARY KEY (id);
+
+
+--
+-- Name: company_profiles PK_1980200b310bd1e2ac86aa1ae4a; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.company_profiles
+    ADD CONSTRAINT "PK_1980200b310bd1e2ac86aa1ae4a" PRIMARY KEY (id);
+
+
+--
+-- Name: service_types PK_1dc93417a097cdee3491f39d7cc; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.service_types
+    ADD CONSTRAINT "PK_1dc93417a097cdee3491f39d7cc" PRIMARY KEY (id);
+
+
+--
+-- Name: train_composition_removal_logs PK_29f7cdb5e0ae32ef1b96155fc9a; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_composition_removal_logs
+    ADD CONSTRAINT "PK_29f7cdb5e0ae32ef1b96155fc9a" PRIMARY KEY (id);
+
+
+--
+-- Name: rates PK_2c804ed4019b80ce48eedba5cec; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.rates
+    ADD CONSTRAINT "PK_2c804ed4019b80ce48eedba5cec" PRIMARY KEY (id);
+
+
+--
+-- Name: facilities PK_2e6c685b2e1195e6d6394a22bc7; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.facilities
+    ADD CONSTRAINT "PK_2e6c685b2e1195e6d6394a22bc7" PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_allocation_rules PK_2e7632f009769d4da579c14f151; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_allocation_rules
+    ADD CONSTRAINT "PK_2e7632f009769d4da579c14f151" PRIMARY KEY (id);
+
+
+--
+-- Name: shipping_lines PK_336306f24563d798ec54eedca0c; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.shipping_lines
+    ADD CONSTRAINT "PK_336306f24563d798ec54eedca0c" PRIMARY KEY (id);
+
+
+--
+-- Name: import_djibouti_operations PK_3456f58d03f6719b38c70018ab6; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.import_djibouti_operations
+    ADD CONSTRAINT "PK_3456f58d03f6719b38c70018ab6" PRIMARY KEY (id);
+
+
+--
+-- Name: yards PK_3aa7dacb4c4fb065b1e2f8dfb5a; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yards
+    ADD CONSTRAINT "PK_3aa7dacb4c4fb065b1e2f8dfb5a" PRIMARY KEY (id);
+
+
+--
+-- Name: booking_document_review PK_3d7705ea54a01cb4d6db5b743cd; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_document_review
+    ADD CONSTRAINT "PK_3d7705ea54a01cb4d6db5b743cd" PRIMARY KEY (id);
+
+
+--
+-- Name: exchange_settings PK_48f5730ce6881caf75f279d0a5d; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.exchange_settings
+    ADD CONSTRAINT "PK_48f5730ce6881caf75f279d0a5d" PRIMARY KEY (id);
+
+
+--
+-- Name: container_types PK_50e6b62fcd07ba58bdb6415d47c; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.container_types
+    ADD CONSTRAINT "PK_50e6b62fcd07ba58bdb6415d47c" PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_inspection_reports PK_625df1e3a62e5aa4c3f14e7172e; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_inspection_reports
+    ADD CONSTRAINT "PK_625df1e3a62e5aa4c3f14e7172e" PRIMARY KEY (id);
+
+
+--
+-- Name: booking_requests PK_62c29ee249979fe0bcdcde33dae; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_requests
+    ADD CONSTRAINT "PK_62c29ee249979fe0bcdcde33dae" PRIMARY KEY (id);
+
+
+--
+-- Name: first_mile PK_72bc92607db5356f03c2aaeb6ec; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile
+    ADD CONSTRAINT "PK_72bc92607db5356f03c2aaeb6ec" PRIMARY KEY (id);
+
+
+--
+-- Name: first_mile_container_allocations PK_8be4b0df481f8a1555a4fb9d05d; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile_container_allocations
+    ADD CONSTRAINT "PK_8be4b0df481f8a1555a4fb9d05d" PRIMARY KEY (id);
+
+
+--
+-- Name: last_mile PK_8be9fbd78fd39e78b6d30ab119b; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile
+    ADD CONSTRAINT "PK_8be9fbd78fd39e78b6d30ab119b" PRIMARY KEY (id);
+
+
+--
+-- Name: booking_rate_snapshot PK_8ca5cf692c4c3e95d91a7343117; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_rate_snapshot
+    ADD CONSTRAINT "PK_8ca5cf692c4c3e95d91a7343117" PRIMARY KEY (id);
+
+
+--
+-- Name: user_trade_access PK_94e21d7bfb20e57940e3255df87; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.user_trade_access
+    ADD CONSTRAINT "PK_94e21d7bfb20e57940e3255df87" PRIMARY KEY (id);
+
+
+--
+-- Name: priority_rules PK_95c73e8a6e80f29d81edf66dbe2; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.priority_rules
+    ADD CONSTRAINT "PK_95c73e8a6e80f29d81edf66dbe2" PRIMARY KEY (id);
+
+
+--
+-- Name: interchange_documents PK_95e5a5484c57ecc6f4a2927ddb4; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.interchange_documents
+    ADD CONSTRAINT "PK_95e5a5484c57ecc6f4a2927ddb4" PRIMARY KEY (id);
+
+
+--
+-- Name: last_mile_container_allocations PK_9d5180799a6dd494156ec980dfb; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_container_allocations
+    ADD CONSTRAINT "PK_9d5180799a6dd494156ec980dfb" PRIMARY KEY (id);
+
+
+--
+-- Name: last_mile_requests PK_be0bf389a4b0f01b05e5eded98b; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_requests
+    ADD CONSTRAINT "PK_be0bf389a4b0f01b05e5eded98b" PRIMARY KEY (id);
+
+
+--
+-- Name: booking_container PK_c1805410bccc51530297b2960ef; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container
+    ADD CONSTRAINT "PK_c1805410bccc51530297b2960ef" PRIMARY KEY (id);
+
+
+--
+-- Name: company_revisions PK_c8ed8b5e0e0d93edffd43c8c024; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.company_revisions
+    ADD CONSTRAINT "PK_c8ed8b5e0e0d93edffd43c8c024" PRIMARY KEY (id);
+
+
+--
+-- Name: cargo_type_wagon_types PK_cargo_type_wagon_types; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargo_type_wagon_types
+    ADD CONSTRAINT "PK_cargo_type_wagon_types" PRIMARY KEY (cargo_type_id, wagon_type_id);
+
+
+--
+-- Name: djibouti_import_incidents PK_cf3871f27f8bd0db9176f09bf95; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.djibouti_import_incidents
+    ADD CONSTRAINT "PK_cf3871f27f8bd0db9176f09bf95" PRIMARY KEY (id);
+
+
+--
+-- Name: container_type_wagon_types PK_container_type_wagon_types; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.container_type_wagon_types
+    ADD CONSTRAINT "PK_container_type_wagon_types" PRIMARY KEY (container_type_id, wagon_type_id);
+
+
+--
+-- Name: warehouse_fee_rules PK_d24f444e0cb6841c1b19342e134; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_fee_rules
+    ADD CONSTRAINT "PK_d24f444e0cb6841c1b19342e134" PRIMARY KEY (id);
+
+
+--
+-- Name: companies PK_d4bc3e82a314fa9e29f652c2c22; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.companies
+    ADD CONSTRAINT "PK_d4bc3e82a314fa9e29f652c2c22" PRIMARY KEY (id);
+
+
+--
+-- Name: weight_limit_rules PK_d82c70fa7e878ca301e2aaff709; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.weight_limit_rules
+    ADD CONSTRAINT "PK_d82c70fa7e878ca301e2aaff709" PRIMARY KEY (id);
+
+
+--
+-- Name: booking_cargo_modifier PK_d949ef8f1b862135ad7e4afdbf1; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_cargo_modifier
+    ADD CONSTRAINT "PK_d949ef8f1b862135ad7e4afdbf1" PRIMARY KEY (id);
+
+
+--
+-- Name: cargo_types PK_db1aa5f07b0c5ea996eaea03394; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargo_types
+    ADD CONSTRAINT "PK_db1aa5f07b0c5ea996eaea03394" PRIMARY KEY (id);
+
+
+--
+-- Name: dropdown_options PK_dropdown_options; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.dropdown_options
+    ADD CONSTRAINT "PK_dropdown_options" PRIMARY KEY (id);
+
+
+--
+-- Name: dropdown_settings PK_dropdown_settings; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.dropdown_settings
+    ADD CONSTRAINT "PK_dropdown_settings" PRIMARY KEY (id);
+
+
+--
+-- Name: ff_clients PK_eb91bf3ee74a361acee369dbda2; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.ff_clients
+    ADD CONSTRAINT "PK_eb91bf3ee74a361acee369dbda2" PRIMARY KEY (id);
+
+
+--
+-- Name: external_profiles PK_f01bade59a434fa68039620ccb9; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.external_profiles
+    ADD CONSTRAINT "PK_f01bade59a434fa68039620ccb9" PRIMARY KEY (id);
+
+
+--
+-- Name: import_customs_finalizations PK_f67c60e65b732153fc050dd166c; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.import_customs_finalizations
+    ADD CONSTRAINT "PK_f67c60e65b732153fc050dd166c" PRIMARY KEY (id);
+
+
+--
+-- Name: empty_container_returns PK_f82bda09e0ff411811193579948; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.empty_container_returns
+    ADD CONSTRAINT "PK_f82bda09e0ff411811193579948" PRIMARY KEY (id);
+
+
+--
+-- Name: booking_container_allocations PK_fb0dee3634a65d2ebd734ff46e3; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container_allocations
+    ADD CONSTRAINT "PK_fb0dee3634a65d2ebd734ff46e3" PRIMARY KEY (id);
+
+
+--
+-- Name: schedule_wagon_adjustment_logs PK_schedule_wagon_adjustment_logs; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.schedule_wagon_adjustment_logs
+    ADD CONSTRAINT "PK_schedule_wagon_adjustment_logs" PRIMARY KEY (id);
+
+
+--
+-- Name: train_locomotives PK_train_locomotives; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_locomotives
+    ADD CONSTRAINT "PK_train_locomotives" PRIMARY KEY (id);
+
+
+--
+-- Name: train_set_locomotives PK_train_set_locomotives; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_locomotives
+    ADD CONSTRAINT "PK_train_set_locomotives" PRIMARY KEY (id);
+
+
+--
+-- Name: companies UQ_1b3738f728d42fc9aca8d4ac19b; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.companies
+    ADD CONSTRAINT "UQ_1b3738f728d42fc9aca8d4ac19b" UNIQUE (tin);
+
+
+--
+-- Name: ff_clients UQ_4107fef2abf7128f890ef276244; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.ff_clients
+    ADD CONSTRAINT "UQ_4107fef2abf7128f890ef276244" UNIQUE (forwarder_company_id, client_company_id);
+
+
+--
+-- Name: company_profiles UQ_539ff8f8225951adb2ef76b0313; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.company_profiles
+    ADD CONSTRAINT "UQ_539ff8f8225951adb2ef76b0313" UNIQUE (reference);
+
+
+--
+-- Name: import_djibouti_operations UQ_6c3e3046300b152a13505bf8ffd; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.import_djibouti_operations
+    ADD CONSTRAINT "UQ_6c3e3046300b152a13505bf8ffd" UNIQUE (train_schedule_id);
+
+
+--
+-- Name: first_mile_vehicle_assignments UQ_FIRST_MILE_VEHICLE; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile_vehicle_assignments
+    ADD CONSTRAINT "UQ_FIRST_MILE_VEHICLE" UNIQUE (first_mile_id, vehicle_id);
+
+
+--
+-- Name: last_mile_vehicle_assignments UQ_LAST_MILE_VEHICLE; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_vehicle_assignments
+    ADD CONSTRAINT "UQ_LAST_MILE_VEHICLE" UNIQUE (last_mile_id, vehicle_id);
+
+
+--
+-- Name: import_customs_finalizations UQ_ad87af234cc0068a05fa7bd2335; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.import_customs_finalizations
+    ADD CONSTRAINT "UQ_ad87af234cc0068a05fa7bd2335" UNIQUE (booking_id);
+
+
+--
+-- Name: approval_rules UQ_approval_rules_chain_step; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.approval_rules
+    ADD CONSTRAINT "UQ_approval_rules_chain_step" UNIQUE (requires_director_approval, step_order);
+
+
+--
+-- Name: interchange_documents UQ_b44369ad5b13e0d897487fc4284; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.interchange_documents
+    ADD CONSTRAINT "UQ_b44369ad5b13e0d897487fc4284" UNIQUE (document_no);
+
+
+--
+-- Name: facilities UQ_bf808b325b190fb9049254ba55e; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.facilities
+    ADD CONSTRAINT "UQ_bf808b325b190fb9049254ba55e" UNIQUE (code);
+
+
+--
+-- Name: user_trade_access UQ_e54889f850f4db112a77b9e8431; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.user_trade_access
+    ADD CONSTRAINT "UQ_e54889f850f4db112a77b9e8431" UNIQUE (user_id);
+
+
+--
+-- Name: asset_acquisitions asset_acquisitions_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.asset_acquisitions
+    ADD CONSTRAINT asset_acquisitions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: asset_disposals asset_disposals_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.asset_disposals
+    ADD CONSTRAINT asset_disposals_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: booking_batch_offers booking_batch_offers_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_batch_offers
+    ADD CONSTRAINT booking_batch_offers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: booking_container_units booking_container_units_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container_units
+    ADD CONSTRAINT booking_container_units_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: booking_contract_signatures booking_contract_signatures_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_contract_signatures
+    ADD CONSTRAINT booking_contract_signatures_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: booking_handovers booking_handovers_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_handovers
+    ADD CONSTRAINT booking_handovers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: booking_review_note booking_review_note_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_review_note
+    ADD CONSTRAINT booking_review_note_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: booking_wagon_cancellations booking_wagon_cancellations_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_wagon_cancellations
+    ADD CONSTRAINT booking_wagon_cancellations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bookings bookings_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT bookings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bookings bookings_reference_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT bookings_reference_key UNIQUE (reference);
+
+
+--
+-- Name: cargoes cargoes_cargo_reference_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargoes
+    ADD CONSTRAINT cargoes_cargo_reference_key UNIQUE (cargo_reference);
+
+
+--
+-- Name: cargoes cargoes_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargoes
+    ADD CONSTRAINT cargoes_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: clearance_incidents clearance_incidents_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.clearance_incidents
+    ADD CONSTRAINT clearance_incidents_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: clearance_milestones clearance_milestones_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.clearance_milestones
+    ADD CONSTRAINT clearance_milestones_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: compliance_records compliance_records_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.compliance_records
+    ADD CONSTRAINT compliance_records_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: containers containers_container_number_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.containers
+    ADD CONSTRAINT containers_container_number_key UNIQUE (container_number);
+
+
+--
+-- Name: containers containers_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.containers
+    ADD CONSTRAINT containers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_approval_steps contract_approval_steps_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_approval_steps
+    ADD CONSTRAINT contract_approval_steps_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_cargo_scope contract_cargo_scope_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_cargo_scope
+    ADD CONSTRAINT contract_cargo_scope_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_clearance_cycles contract_clearance_cycles_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_clearance_cycles
+    ADD CONSTRAINT contract_clearance_cycles_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_document_review contract_document_review_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_document_review
+    ADD CONSTRAINT contract_document_review_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_document_revisions contract_document_revisions_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_document_revisions
+    ADD CONSTRAINT contract_document_revisions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_rate_snapshots contract_rate_snapshots_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_rate_snapshots
+    ADD CONSTRAINT contract_rate_snapshots_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_review_notes contract_review_notes_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_review_notes
+    ADD CONSTRAINT contract_review_notes_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_routes contract_routes_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_routes
+    ADD CONSTRAINT contract_routes_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_signatures contract_signatures_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_signatures
+    ADD CONSTRAINT contract_signatures_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contract_templates contract_templates_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_templates
+    ADD CONSTRAINT contract_templates_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contracts contracts_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contracts
+    ADD CONSTRAINT contracts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contracts contracts_reference_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contracts
+    ADD CONSTRAINT contracts_reference_key UNIQUE (reference);
+
+
+--
+-- Name: customer_truck_assignments customer_truck_assignments_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customer_truck_assignments
+    ADD CONSTRAINT customer_truck_assignments_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: customer_truck_containers customer_truck_containers_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customer_truck_containers
+    ADD CONSTRAINT customer_truck_containers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: customers customers_email_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customers
+    ADD CONSTRAINT customers_email_key UNIQUE (email);
+
+
+--
+-- Name: customers customers_fan_number_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customers
+    ADD CONSTRAINT customers_fan_number_key UNIQUE (fan_number);
+
+
+--
+-- Name: customers customers_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customers
+    ADD CONSTRAINT customers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: customers customers_tin_number_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customers
+    ADD CONSTRAINT customers_tin_number_key UNIQUE (tin_number);
+
+
+--
+-- Name: drivers drivers_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.drivers
+    ADD CONSTRAINT drivers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: eims_system_state eims_system_state_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.eims_system_state
+    ADD CONSTRAINT eims_system_state_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: eims_system_state eims_system_state_system_number_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.eims_system_state
+    ADD CONSTRAINT eims_system_state_system_number_key UNIQUE (system_number);
+
+
+--
+-- Name: facility_handling_events facility_handling_events_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.facility_handling_events
+    ADD CONSTRAINT facility_handling_events_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: fayda_verification_sessions fayda_verification_sessions_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fayda_verification_sessions
+    ADD CONSTRAINT fayda_verification_sessions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: fayda_verification_sessions fayda_verification_sessions_state_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fayda_verification_sessions
+    ADD CONSTRAINT fayda_verification_sessions_state_key UNIQUE (state);
+
+
+--
+-- Name: file_upload_fields file_upload_fields_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.file_upload_fields
+    ADD CONSTRAINT file_upload_fields_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: file_upload_settings file_upload_settings_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.file_upload_settings
+    ADD CONSTRAINT file_upload_settings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: files files_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.files
+    ADD CONSTRAINT files_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: first_mile_vehicle_assignments first_mile_vehicle_assignments_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile_vehicle_assignments
+    ADD CONSTRAINT first_mile_vehicle_assignments_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: fleet_events fleet_events_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fleet_events
+    ADD CONSTRAINT fleet_events_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: gps_devices gps_devices_imei_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.gps_devices
+    ADD CONSTRAINT gps_devices_imei_key UNIQUE (imei);
+
+
+--
+-- Name: gps_devices gps_devices_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.gps_devices
+    ADD CONSTRAINT gps_devices_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: gps_positions gps_positions_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.gps_positions
+    ADD CONSTRAINT gps_positions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: incidents incidents_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.incidents
+    ADD CONSTRAINT incidents_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: last_mile_vehicle_assignments last_mile_vehicle_assignments_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_vehicle_assignments
+    ADD CONSTRAINT last_mile_vehicle_assignments_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: last_mile_vehicle_containers last_mile_vehicle_containers_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_vehicle_containers
+    ADD CONSTRAINT last_mile_vehicle_containers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: locomotives locomotives_code_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.locomotives
+    ADD CONSTRAINT locomotives_code_key UNIQUE (code);
+
+
+--
+-- Name: locomotives locomotives_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.locomotives
+    ADD CONSTRAINT locomotives_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: maintenance_costs maintenance_costs_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.maintenance_costs
+    ADD CONSTRAINT maintenance_costs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: maintenance_intervals maintenance_intervals_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.maintenance_intervals
+    ADD CONSTRAINT maintenance_intervals_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: maintenance_schedules maintenance_schedules_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.maintenance_schedules
+    ADD CONSTRAINT maintenance_schedules_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: migrations migrations_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.migrations
+    ADD CONSTRAINT migrations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: notifications notifications_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.notifications
+    ADD CONSTRAINT notifications_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: otp_verifications otp_verifications_email_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.otp_verifications
+    ADD CONSTRAINT otp_verifications_email_key UNIQUE (email);
+
+
+--
+-- Name: parts parts_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.parts
+    ADD CONSTRAINT parts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: consignments pk_consignments; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.consignments
+    ADD CONSTRAINT pk_consignments PRIMARY KEY (id);
+
+
+--
+-- Name: fuel_consumption pk_fuel_consumption; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fuel_consumption
+    ADD CONSTRAINT pk_fuel_consumption PRIMARY KEY (id);
+
+
+--
+-- Name: fuel_purchases pk_fuel_purchases; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fuel_purchases
+    ADD CONSTRAINT pk_fuel_purchases PRIMARY KEY (id);
+
+
+--
+-- Name: invoice_lines pk_invoice_lines; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.invoice_lines
+    ADD CONSTRAINT pk_invoice_lines PRIMARY KEY (id);
+
+
+--
+-- Name: invoices pk_invoices; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.invoices
+    ADD CONSTRAINT pk_invoices PRIMARY KEY (id);
+
+
+--
+-- Name: otp_verifications pk_otp_verifications; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.otp_verifications
+    ADD CONSTRAINT pk_otp_verifications PRIMARY KEY (id);
+
+
+--
+-- Name: payment_refunds pk_payment_refunds; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.payment_refunds
+    ADD CONSTRAINT pk_payment_refunds PRIMARY KEY (id);
+
+
+--
+-- Name: payment_webhook_events pk_payment_webhook_events; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.payment_webhook_events
+    ADD CONSTRAINT pk_payment_webhook_events PRIMARY KEY (id);
+
+
+--
+-- Name: payments pk_payments; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.payments
+    ADD CONSTRAINT pk_payments PRIMARY KEY (id);
+
+
+--
+-- Name: tracking_events pk_tracking_events; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.tracking_events
+    ADD CONSTRAINT pk_tracking_events PRIMARY KEY (id);
+
+
+--
+-- Name: wagon_transfer_requests pk_wagon_transfer_requests; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_transfer_requests
+    ADD CONSTRAINT pk_wagon_transfer_requests PRIMARY KEY (id);
+
+
+--
+-- Name: priority_configs priority_configs_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.priority_configs
+    ADD CONSTRAINT priority_configs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: priority_rule_change_requests priority_rule_change_requests_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.priority_rule_change_requests
+    ADD CONSTRAINT priority_rule_change_requests_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: rate_change_requests rate_change_requests_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.rate_change_requests
+    ADD CONSTRAINT rate_change_requests_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: route_milestones route_milestones_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.route_milestones
+    ADD CONSTRAINT route_milestones_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: routes routes_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.routes
+    ADD CONSTRAINT routes_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: saved_signatures saved_signatures_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.saved_signatures
+    ADD CONSTRAINT saved_signatures_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: scheduling_events scheduling_events_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.scheduling_events
+    ADD CONSTRAINT scheduling_events_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: support_conversations support_conversations_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.support_conversations
+    ADD CONSTRAINT support_conversations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: support_document_versions support_document_versions_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.support_document_versions
+    ADD CONSTRAINT support_document_versions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: support_documents support_documents_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.support_documents
+    ADD CONSTRAINT support_documents_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: support_messages support_messages_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.support_messages
+    ADD CONSTRAINT support_messages_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: train_checkpoint_events train_checkpoint_events_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_checkpoint_events
+    ADD CONSTRAINT train_checkpoint_events_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: train_schedule_bookings train_schedule_bookings_booking_id_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedule_bookings
+    ADD CONSTRAINT train_schedule_bookings_booking_id_key UNIQUE (booking_id);
+
+
+--
+-- Name: train_schedule_bookings train_schedule_bookings_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedule_bookings
+    ADD CONSTRAINT train_schedule_bookings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: train_schedules train_schedules_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedules
+    ADD CONSTRAINT train_schedules_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: train_schedules train_schedules_train_set_id_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedules
+    ADD CONSTRAINT train_schedules_train_set_id_key UNIQUE (train_set_id);
+
+
+--
+-- Name: train_scheduling_global_rules train_scheduling_global_rules_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_scheduling_global_rules
+    ADD CONSTRAINT train_scheduling_global_rules_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: train_set_wagons train_set_wagons_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_wagons
+    ADD CONSTRAINT train_set_wagons_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: train_sets train_sets_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_sets
+    ADD CONSTRAINT train_sets_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: trains trains_code_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.trains
+    ADD CONSTRAINT trains_code_key UNIQUE (code);
+
+
+--
+-- Name: trains trains_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.trains
+    ADD CONSTRAINT trains_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: transit_agents transit_agents_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.transit_agents
+    ADD CONSTRAINT transit_agents_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: truck_types truck_types_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.truck_types
+    ADD CONSTRAINT truck_types_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: booking_container_units uq_booking_container_unit_number; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container_units
+    ADD CONSTRAINT uq_booking_container_unit_number UNIQUE (booking_container_id, container_number);
+
+
+--
+-- Name: booking_contract_signatures uq_booking_contract_signatures_role; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_contract_signatures
+    ADD CONSTRAINT uq_booking_contract_signatures_role UNIQUE (booking_id, signer_role);
+
+
+--
+-- Name: consignments uq_consignments_tracking_number; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.consignments
+    ADD CONSTRAINT uq_consignments_tracking_number UNIQUE (tracking_number);
+
+
+--
+-- Name: contract_clearance_cycles uq_contract_clearance_cycle; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_clearance_cycles
+    ADD CONSTRAINT uq_contract_clearance_cycle UNIQUE (contract_id, cycle_number);
+
+
+--
+-- Name: contract_cargo_scope uq_contract_container_size; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_cargo_scope
+    ADD CONSTRAINT uq_contract_container_size UNIQUE NULLS NOT DISTINCT (contract_id, container_size);
+
+
+--
+-- Name: contract_document_review uq_contract_document_review_doc; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_document_review
+    ADD CONSTRAINT uq_contract_document_review_doc UNIQUE NULLS NOT DISTINCT (contract_id, clearance_cycle_id, setting_code, file_key);
+
+
+--
+-- Name: contract_routes uq_contract_route; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_routes
+    ADD CONSTRAINT uq_contract_route UNIQUE (contract_id, origin_yard_id, destination_yard_id);
+
+
+--
+-- Name: fuel_consumption uq_fuel_consumption_vehicle_month; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fuel_consumption
+    ADD CONSTRAINT uq_fuel_consumption_vehicle_month UNIQUE (vehicle_id, month);
+
+
+--
+-- Name: invoices uq_invoices_invoice_number; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.invoices
+    ADD CONSTRAINT uq_invoices_invoice_number UNIQUE (invoice_number);
+
+
+--
+-- Name: otp_verifications uq_otp_verifications_phone; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.otp_verifications
+    ADD CONSTRAINT uq_otp_verifications_phone UNIQUE (phone);
+
+
+--
+-- Name: payment_webhook_events uq_payment_webhook_events_provider_event; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.payment_webhook_events
+    ADD CONSTRAINT uq_payment_webhook_events_provider_event UNIQUE (provider, external_event_id);
+
+
+--
+-- Name: payments uq_payments_merchant_order_id; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.payments
+    ADD CONSTRAINT uq_payments_merchant_order_id UNIQUE (merchant_order_id);
+
+
+--
+-- Name: payments uq_payments_transaction_id; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.payments
+    ADD CONSTRAINT uq_payments_transaction_id UNIQUE (transaction_id);
+
+
+--
+-- Name: route_milestones uq_route_milestones_route_sequence; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.route_milestones
+    ADD CONSTRAINT uq_route_milestones_route_sequence UNIQUE (route_id, sequence_no);
+
+
+--
+-- Name: saved_signatures uq_saved_signatures_user_id; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.saved_signatures
+    ADD CONSTRAINT uq_saved_signatures_user_id UNIQUE (user_id);
+
+
+--
+-- Name: train_schedule_bookings uq_train_schedule_booking; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedule_bookings
+    ADD CONSTRAINT uq_train_schedule_booking UNIQUE (train_schedule_id, booking_id);
+
+
+--
+-- Name: train_set_wagons uq_train_set_wagons_sequence; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_wagons
+    ADD CONSTRAINT uq_train_set_wagons_sequence UNIQUE (train_set_id, sequence_no);
+
+
+--
+-- Name: warehouse_yards uq_warehouse_yards_code; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_yards
+    ADD CONSTRAINT uq_warehouse_yards_code UNIQUE (warehouse_id, code);
+
+
+--
+-- Name: warehouse_zones uq_warehouse_zones_code; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_zones
+    ADD CONSTRAINT uq_warehouse_zones_code UNIQUE (yard_id, code);
+
+
+--
+-- Name: vehicles vehicles_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.vehicles
+    ADD CONSTRAINT vehicles_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: vehicles vehicles_plate_number_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.vehicles
+    ADD CONSTRAINT vehicles_plate_number_key UNIQUE (plate_number);
+
+
+--
+-- Name: vehicles vehicles_registration_number_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.vehicles
+    ADD CONSTRAINT vehicles_registration_number_key UNIQUE (registration_number);
+
+
+--
+-- Name: vendors vendors_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.vendors
+    ADD CONSTRAINT vendors_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: wagon_allocation_bulk_loads wagon_allocation_bulk_loads_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_bulk_loads
+    ADD CONSTRAINT wagon_allocation_bulk_loads_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: wagon_allocation_bulk_loads wagon_allocation_bulk_loads_wagon_booking_allocation_id_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_bulk_loads
+    ADD CONSTRAINT wagon_allocation_bulk_loads_wagon_booking_allocation_id_key UNIQUE (wagon_booking_allocation_id);
+
+
+--
+-- Name: wagon_allocation_container_items wagon_allocation_container_items_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_container_items
+    ADD CONSTRAINT wagon_allocation_container_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: wagon_booking_allocations wagon_booking_allocations_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_booking_allocations
+    ADD CONSTRAINT wagon_booking_allocations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: wagon_movements wagon_movements_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_movements
+    ADD CONSTRAINT wagon_movements_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: wagon_status_logs wagon_status_logs_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_status_logs
+    ADD CONSTRAINT wagon_status_logs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: wagon_types wagon_types_code_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_types
+    ADD CONSTRAINT wagon_types_code_key UNIQUE (code);
+
+
+--
+-- Name: wagon_types wagon_types_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_types
+    ADD CONSTRAINT wagon_types_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: wagons wagons_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagons
+    ADD CONSTRAINT wagons_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_accrual_acks warehouse_accrual_acks_inventory_id_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_accrual_acks
+    ADD CONSTRAINT warehouse_accrual_acks_inventory_id_key UNIQUE (inventory_id);
+
+
+--
+-- Name: warehouse_accrual_acks warehouse_accrual_acks_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_accrual_acks
+    ADD CONSTRAINT warehouse_accrual_acks_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_activity_log warehouse_activity_log_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_activity_log
+    ADD CONSTRAINT warehouse_activity_log_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_inventory_movement warehouse_inventory_movement_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_inventory_movement
+    ADD CONSTRAINT warehouse_inventory_movement_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_inventory warehouse_inventory_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_inventory
+    ADD CONSTRAINT warehouse_inventory_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_loadings warehouse_loadings_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_loadings
+    ADD CONSTRAINT warehouse_loadings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_yard_cargo_types warehouse_yard_cargo_types_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_yard_cargo_types
+    ADD CONSTRAINT warehouse_yard_cargo_types_pkey PRIMARY KEY (yard_id, cargo_type_id);
+
+
+--
+-- Name: warehouse_yards warehouse_yards_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_yards
+    ADD CONSTRAINT warehouse_yards_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse_zones warehouse_zones_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_zones
+    ADD CONSTRAINT warehouse_zones_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouses warehouses_code_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouses
+    ADD CONSTRAINT warehouses_code_key UNIQUE (code);
+
+
+--
+-- Name: warehouses warehouses_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouses
+    ADD CONSTRAINT warehouses_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warranties warranties_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warranties
+    ADD CONSTRAINT warranties_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: work_orders work_orders_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.work_orders
+    ADD CONSTRAINT work_orders_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: yard_distances yard_distances_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_distances
+    ADD CONSTRAINT yard_distances_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: yard_facilities yard_facilities_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_facilities
+    ADD CONSTRAINT yard_facilities_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: yard_locations yard_locations_pkey; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_locations
+    ADD CONSTRAINT yard_locations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: yard_locations yard_locations_yard_id_key; Type: CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_locations
+    ADD CONSTRAINT yard_locations_yard_id_key UNIQUE (yard_id);
+
+
+--
+-- Name: IDX_1101fbe8e745d91b6bd0747b58; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_1101fbe8e745d91b6bd0747b58" ON freight.ff_clients USING btree (forwarder_company_id);
+
+
+--
+-- Name: IDX_1b3738f728d42fc9aca8d4ac19; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_1b3738f728d42fc9aca8d4ac19" ON freight.companies USING btree (tin);
+
+
+--
+-- Name: IDX_1e57cd6c6afae8f303847f159d; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_1e57cd6c6afae8f303847f159d" ON freight.companies USING btree (type);
+
+
+--
+-- Name: IDX_26d2a16e263ab4fe0a4c8e9195; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_26d2a16e263ab4fe0a4c8e9195" ON freight.external_profiles USING btree (company_id);
+
+
+--
+-- Name: IDX_30228dd283a0f14486346e1db9; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_30228dd283a0f14486346e1db9" ON freight.company_profiles USING btree (company_id);
+
+
+--
+-- Name: IDX_CARGO_TYPES_DISPLAY_ORDER; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_CARGO_TYPES_DISPLAY_ORDER" ON freight.cargo_types USING btree (display_order);
+
+
+--
+-- Name: IDX_CARGO_TYPES_IS_ACTIVE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_CARGO_TYPES_IS_ACTIVE" ON freight.cargo_types USING btree (is_active);
+
+
+--
+-- Name: IDX_CARGO_TYPES_PARENT_GROUP_ID; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_CARGO_TYPES_PARENT_GROUP_ID" ON freight.cargo_types USING btree (parent_group_id);
+
+
+--
+-- Name: IDX_FAYDA_SESSIONS_EXPIRES_AT; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_FAYDA_SESSIONS_EXPIRES_AT" ON freight.fayda_verification_sessions USING btree (expires_at);
+
+
+--
+-- Name: IDX_FAYDA_SESSIONS_IAM_USER_ID; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_FAYDA_SESSIONS_IAM_USER_ID" ON freight.fayda_verification_sessions USING btree (iam_user_id);
+
+
+--
+-- Name: IDX_FILES_RESOURCE_LOOKUP; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_FILES_RESOURCE_LOOKUP" ON freight.files USING btree (resource, resource_id) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: IDX_FLEET_EVENTS_DRIVER; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_FLEET_EVENTS_DRIVER" ON freight.fleet_events USING btree (driver_id, created_at);
+
+
+--
+-- Name: IDX_FLEET_EVENTS_VEHICLE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_FLEET_EVENTS_VEHICLE" ON freight.fleet_events USING btree (vehicle_id, created_at);
+
+
+--
+-- Name: IDX_FM_VEHICLE_ASSIGNMENTS_VEHICLE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_FM_VEHICLE_ASSIGNMENTS_VEHICLE" ON freight.first_mile_vehicle_assignments USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_GPS_DEVICES_VEHICLE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_GPS_DEVICES_VEHICLE" ON freight.gps_devices USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_GPS_POSITIONS_DEVICE_TIME; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_GPS_POSITIONS_DEVICE_TIME" ON freight.gps_positions USING btree (device_id, gps_time);
+
+
+--
+-- Name: IDX_GPS_POSITIONS_VEHICLE_TIME; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_GPS_POSITIONS_VEHICLE_TIME" ON freight.gps_positions USING btree (vehicle_id, gps_time);
+
+
+--
+-- Name: IDX_INCIDENTS_DRIVER; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_INCIDENTS_DRIVER" ON freight.incidents USING btree (driver_id, occurred_at);
+
+
+--
+-- Name: IDX_INCIDENTS_VEHICLE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_INCIDENTS_VEHICLE" ON freight.incidents USING btree (vehicle_id, occurred_at);
+
+
+--
+-- Name: IDX_LM_VEHICLE_ASSIGNMENTS_VEHICLE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_LM_VEHICLE_ASSIGNMENTS_VEHICLE" ON freight.last_mile_vehicle_assignments USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_NOTIFICATIONS_RECIPIENT_CREATED; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_NOTIFICATIONS_RECIPIENT_CREATED" ON freight.notifications USING btree (recipient_user_id, created_at);
+
+
+--
+-- Name: IDX_NOTIFICATIONS_RECIPIENT_UNREAD; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_NOTIFICATIONS_RECIPIENT_UNREAD" ON freight.notifications USING btree (recipient_user_id, is_read);
+
+
+--
+-- Name: IDX_SERVICE_TYPES_DISPLAY_ORDER; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_SERVICE_TYPES_DISPLAY_ORDER" ON freight.service_types USING btree (display_order);
+
+
+--
+-- Name: IDX_SERVICE_TYPES_IS_ACTIVE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_SERVICE_TYPES_IS_ACTIVE" ON freight.service_types USING btree (is_active);
+
+
+--
+-- Name: IDX_SUPPORT_CONV_COMPANY; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "IDX_SUPPORT_CONV_COMPANY" ON freight.support_conversations USING btree (company_id) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: IDX_SUPPORT_CONV_LASTMSG; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_SUPPORT_CONV_LASTMSG" ON freight.support_conversations USING btree (last_message_at);
+
+
+--
+-- Name: IDX_SUPPORT_MSG_CONV_CREATED; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_SUPPORT_MSG_CONV_CREATED" ON freight.support_messages USING btree (conversation_id, created_at);
+
+
+--
+-- Name: IDX_af4d6bac2844d39095b2056e97; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_af4d6bac2844d39095b2056e97" ON freight.ff_clients USING btree (client_company_id);
+
+
+--
+-- Name: IDX_b658cd8f6876645a05c0366a56; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_b658cd8f6876645a05c0366a56" ON freight.external_profiles USING btree (user_id);
+
+
+--
+-- Name: IDX_booking_cargo_modifier_rate_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_booking_cargo_modifier_rate_id" ON freight.booking_cargo_modifier USING btree (rate_id);
+
+
+--
+-- Name: IDX_booking_container_allocations_booking_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_booking_container_allocations_booking_id" ON freight.booking_container_allocations USING btree (booking_id);
+
+
+--
+-- Name: IDX_booking_container_allocations_vehicle_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_booking_container_allocations_vehicle_id" ON freight.booking_container_allocations USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_booking_container_units_grn; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_booking_container_units_grn" ON freight.booking_container_units USING btree (grn_number);
+
+
+--
+-- Name: IDX_booking_handovers_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_booking_handovers_booking" ON freight.booking_handovers USING btree (booking_id);
+
+
+--
+-- Name: IDX_cargo_types_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "IDX_cargo_types_code" ON freight.cargo_types USING btree (code);
+
+
+--
+-- Name: IDX_cargoes_container_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_cargoes_container_id" ON freight.cargoes USING btree (container_id);
+
+
+--
+-- Name: IDX_companies_kind; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_companies_kind" ON freight.companies USING btree (kind);
+
+
+--
+-- Name: IDX_container_types_is_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_container_types_is_active" ON freight.container_types USING btree (is_active);
+
+
+--
+-- Name: IDX_container_types_size_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "IDX_container_types_size_code" ON freight.container_types USING btree (code);
+
+
+--
+-- Name: IDX_containers_wagon_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_containers_wagon_id" ON freight.containers USING btree (wagon_id);
+
+
+--
+-- Name: IDX_customer_truck_assignments_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_customer_truck_assignments_booking" ON freight.customer_truck_assignments USING btree (booking_id);
+
+
+--
+-- Name: IDX_customer_truck_containers_assignment; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_customer_truck_containers_assignment" ON freight.customer_truck_containers USING btree (assignment_id);
+
+
+--
+-- Name: IDX_customer_truck_departed; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_customer_truck_departed" ON freight.customer_truck_assignments USING btree (booking_id, departed_at) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: IDX_dc808839c3d64c763cc7f6ff68; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_dc808839c3d64c763cc7f6ff68" ON freight.company_profiles USING btree (type);
+
+
+--
+-- Name: IDX_e669a91069a3aa982b2c99c256; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_e669a91069a3aa982b2c99c256" ON freight.train_composition_removal_logs USING btree (schedule_id);
+
+
+--
+-- Name: IDX_facility_handling_events_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_facility_handling_events_booking" ON freight.facility_handling_events USING btree (booking_id);
+
+
+--
+-- Name: IDX_facility_handling_events_grn; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_facility_handling_events_grn" ON freight.facility_handling_events USING btree (grn_number) WHERE (grn_number IS NOT NULL);
+
+
+--
+-- Name: IDX_facility_handling_events_yard; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_facility_handling_events_yard" ON freight.facility_handling_events USING btree (yard_id);
+
+
+--
+-- Name: IDX_files_open_change_request; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_files_open_change_request" ON freight.files USING btree (resource, resource_id) WHERE (((review_status)::text = 'change_requested'::text) AND (deleted_at IS NULL));
+
+
+--
+-- Name: IDX_files_version_history; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_files_version_history" ON freight.files USING btree (resource, resource_id, code, created_at DESC);
+
+
+--
+-- Name: IDX_first_mile_booking_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_first_mile_booking_id" ON freight.first_mile USING btree (booking_id);
+
+
+--
+-- Name: IDX_first_mile_container_allocations_first_mile_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_first_mile_container_allocations_first_mile_id" ON freight.first_mile_container_allocations USING btree (first_mile_id);
+
+
+--
+-- Name: IDX_first_mile_container_allocations_vehicle_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_first_mile_container_allocations_vehicle_id" ON freight.first_mile_container_allocations USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_first_mile_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_first_mile_status" ON freight.first_mile USING btree (status);
+
+
+--
+-- Name: IDX_first_mile_vehicle_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_first_mile_vehicle_id" ON freight.first_mile USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_freight_customers_email; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_freight_customers_email" ON freight.customers USING btree (email);
+
+
+--
+-- Name: IDX_freight_files_resource; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_freight_files_resource" ON freight.files USING btree (resource_id, resource);
+
+
+--
+-- Name: IDX_freight_files_resource_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_freight_files_resource_code" ON freight.files USING btree (resource_id, resource, code);
+
+
+--
+-- Name: IDX_last_mile_booking_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_last_mile_booking_id" ON freight.last_mile USING btree (booking_id);
+
+
+--
+-- Name: IDX_last_mile_container_allocations_last_mile_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_last_mile_container_allocations_last_mile_id" ON freight.last_mile_container_allocations USING btree (last_mile_id);
+
+
+--
+-- Name: IDX_last_mile_container_allocations_vehicle_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_last_mile_container_allocations_vehicle_id" ON freight.last_mile_container_allocations USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_last_mile_requests_booking_schedule; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "IDX_last_mile_requests_booking_schedule" ON freight.last_mile_requests USING btree (booking_id, train_schedule_id) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: IDX_last_mile_requests_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_last_mile_requests_status" ON freight.last_mile_requests USING btree (status);
+
+
+--
+-- Name: IDX_last_mile_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_last_mile_status" ON freight.last_mile USING btree (status);
+
+
+--
+-- Name: IDX_last_mile_vehicle_containers_assignment; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_last_mile_vehicle_containers_assignment" ON freight.last_mile_vehicle_containers USING btree (assignment_id);
+
+
+--
+-- Name: IDX_last_mile_vehicle_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_last_mile_vehicle_id" ON freight.last_mile USING btree (vehicle_id);
+
+
+--
+-- Name: IDX_locomotive_current_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_locomotive_current_yard_id" ON freight.locomotives USING btree (current_yard_id);
+
+
+--
+-- Name: IDX_maintenance_intervals_vehicle_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_maintenance_intervals_vehicle_type" ON freight.maintenance_intervals USING btree (vehicle_id, maintenance_type);
+
+
+--
+-- Name: IDX_parts_category; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_parts_category" ON freight.parts USING btree (category);
+
+
+--
+-- Name: IDX_priority_rules_is_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_priority_rules_is_active" ON freight.priority_rules USING btree (is_active);
+
+
+--
+-- Name: IDX_rates_destination_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_rates_destination_yard_id" ON freight.rates USING btree (destination_yard_id);
+
+
+--
+-- Name: IDX_rates_origin_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_rates_origin_yard_id" ON freight.rates USING btree (origin_yard_id);
+
+
+--
+-- Name: IDX_rates_trigger; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_rates_trigger" ON freight.rates USING btree (trigger);
+
+
+--
+-- Name: IDX_routes_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_routes_status" ON freight.routes USING btree (status);
+
+
+--
+-- Name: IDX_service_types_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "IDX_service_types_code" ON freight.service_types USING btree (code);
+
+
+--
+-- Name: IDX_swal_train_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_swal_train_id" ON freight.schedule_wagon_adjustment_logs USING btree (train_id);
+
+
+--
+-- Name: IDX_swal_train_schedule_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_swal_train_schedule_id" ON freight.schedule_wagon_adjustment_logs USING btree (train_schedule_id);
+
+
+--
+-- Name: IDX_train_sets_train_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_train_sets_train_id" ON freight.train_sets USING btree (train_id);
+
+
+--
+-- Name: IDX_trains_current_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_trains_current_yard_id" ON freight.trains USING btree (current_yard_id);
+
+
+--
+-- Name: IDX_wagon_current_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_wagon_current_yard_id" ON freight.wagons USING btree (current_yard_id);
+
+
+--
+-- Name: IDX_wagon_movements_schedule; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_wagon_movements_schedule" ON freight.wagon_movements USING btree (train_schedule_id);
+
+
+--
+-- Name: IDX_wagon_movements_wagon_occurred; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_wagon_movements_wagon_occurred" ON freight.wagon_movements USING btree (wagon_id, occurred_at);
+
+
+--
+-- Name: IDX_wagons_current_location_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_wagons_current_location_yard_id" ON freight.wagons USING btree (current_location_yard_id);
+
+
+--
+-- Name: IDX_wagons_train_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_wagons_train_id" ON freight.wagons USING btree (train_id);
+
+
+--
+-- Name: IDX_warranties_vehicle_id_expiry_date; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_warranties_vehicle_id_expiry_date" ON freight.warranties USING btree (vehicle_id, expiry_date);
+
+
+--
+-- Name: IDX_weight_limit_rules_container_type_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_weight_limit_rules_container_type_id" ON freight.weight_limit_rules USING btree (container_type_id);
+
+
+--
+-- Name: IDX_work_orders_vehicle_id_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX "IDX_work_orders_vehicle_id_status" ON freight.work_orders USING btree (vehicle_id, status);
+
+
+--
+-- Name: UQ_DRIVERS_EMAIL_ACTIVE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_DRIVERS_EMAIL_ACTIVE" ON freight.drivers USING btree (email) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_DRIVERS_FAYDA_SUB_ACTIVE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_DRIVERS_FAYDA_SUB_ACTIVE" ON freight.drivers USING btree (fayda_sub) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_DRIVERS_LICENSE_ACTIVE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_DRIVERS_LICENSE_ACTIVE" ON freight.drivers USING btree (license_number) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_DRIVERS_PHONE_ACTIVE; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_DRIVERS_PHONE_ACTIVE" ON freight.drivers USING btree (phone_number) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_booking_handovers_booking_edr_truck; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_booking_handovers_booking_edr_truck" ON freight.booking_handovers USING btree (booking_id, edr_assignment_id) WHERE ((deleted_at IS NULL) AND (edr_assignment_id IS NOT NULL));
+
+
+--
+-- Name: UQ_booking_handovers_booking_truck; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_booking_handovers_booking_truck" ON freight.booking_handovers USING btree (booking_id, truck_assignment_id) WHERE ((deleted_at IS NULL) AND (truck_assignment_id IS NOT NULL));
+
+
+--
+-- Name: UQ_customer_truck_containers_booking_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_customer_truck_containers_booking_number" ON freight.customer_truck_containers USING btree (booking_id, container_number) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_dropdown_options_setting_value; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_dropdown_options_setting_value" ON freight.dropdown_options USING btree (setting_id, value);
+
+
+--
+-- Name: UQ_dropdown_settings_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_dropdown_settings_code" ON freight.dropdown_settings USING btree (code);
+
+
+--
+-- Name: UQ_file_upload_fields_setting_file_key; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_file_upload_fields_setting_file_key" ON freight.file_upload_fields USING btree (setting_id, file_key);
+
+
+--
+-- Name: UQ_file_upload_settings_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_file_upload_settings_code" ON freight.file_upload_settings USING btree (code);
+
+
+--
+-- Name: UQ_last_mile_vehicle_container; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_last_mile_vehicle_container" ON freight.last_mile_vehicle_containers USING btree (last_mile_id, container_number) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_locomotives_name_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_locomotives_name_active" ON freight.locomotives USING btree (lower(btrim((name)::text))) WHERE ((deleted_at IS NULL) AND (name IS NOT NULL) AND (btrim((name)::text) <> ''::text));
+
+
+--
+-- Name: UQ_maintenance_intervals_vehicle_type_item; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_maintenance_intervals_vehicle_type_item" ON freight.maintenance_intervals USING btree (vehicle_id, maintenance_type, COALESCE(service_item, ''::character varying)) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_priority_rules_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_priority_rules_code" ON freight.priority_rules USING btree (code);
+
+
+--
+-- Name: UQ_rates_pattern; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_rates_pattern" ON freight.rates USING btree (rate_type, COALESCE(container_type_id, '00000000-0000-0000-0000-000000000000'::uuid), COALESCE(cargo_type_id, '00000000-0000-0000-0000-000000000000'::uuid), COALESCE(trade_direction, ''::character varying), COALESCE(origin_yard_id, '00000000-0000-0000-0000-000000000000'::uuid), COALESCE(destination_yard_id, '00000000-0000-0000-0000-000000000000'::uuid), rate_unit, COALESCE(min_km, '-1'::numeric)) WHERE ((deleted_at IS NULL) AND ((status)::text <> 'SUPERSEDED'::text));
+
+
+--
+-- Name: UQ_shipping_lines_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_shipping_lines_code" ON freight.shipping_lines USING btree (code);
+
+
+--
+-- Name: UQ_train_locomotives_train_loco; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_train_locomotives_train_loco" ON freight.train_locomotives USING btree (train_id, locomotive_id);
+
+
+--
+-- Name: UQ_train_set_locomotives_set_loco; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_train_set_locomotives_set_loco" ON freight.train_set_locomotives USING btree (train_set_id, locomotive_id);
+
+
+--
+-- Name: UQ_trains_export_train_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_trains_export_train_number" ON freight.trains USING btree (export_train_number) WHERE (export_train_number IS NOT NULL);
+
+
+--
+-- Name: UQ_trains_import_train_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_trains_import_train_number" ON freight.trains USING btree (import_train_number) WHERE (import_train_number IS NOT NULL);
+
+
+--
+-- Name: UQ_trains_train_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_trains_train_number" ON freight.trains USING btree (train_number) WHERE (train_number IS NOT NULL);
+
+
+--
+-- Name: UQ_wagons_wagon_number_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_wagons_wagon_number_active" ON freight.wagons USING btree (wagon_number) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_weight_limit_rules_pattern; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_weight_limit_rules_pattern" ON freight.weight_limit_rules USING btree (container_type_id, trade_direction) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_yard_facility_yard; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_yard_facility_yard" ON freight.yard_facilities USING btree (yard_id) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_yards_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_yards_code" ON freight.yards USING btree (code);
+
+
+--
+-- Name: UQ_yards_code_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_yards_code_active" ON freight.yards USING btree (lower(TRIM(BOTH FROM code))) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: UQ_yards_label_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX "UQ_yards_label_active" ON freight.yards USING btree (lower(TRIM(BOTH FROM label))) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: idx_asset_acquisitions_vehicle_date; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_asset_acquisitions_vehicle_date ON freight.asset_acquisitions USING btree (vehicle_id, acquisition_date);
+
+
+--
+-- Name: idx_asset_disposals_vehicle_date; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_asset_disposals_vehicle_date ON freight.asset_disposals USING btree (vehicle_id, disposal_date);
+
+
+--
+-- Name: idx_booking_batch_offers_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_batch_offers_booking ON freight.booking_batch_offers USING btree (booking_id);
+
+
+--
+-- Name: idx_booking_batch_offers_schedule; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_batch_offers_schedule ON freight.booking_batch_offers USING btree (train_schedule_id);
+
+
+--
+-- Name: idx_booking_batch_offers_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_batch_offers_status ON freight.booking_batch_offers USING btree (status);
+
+
+--
+-- Name: idx_booking_contract_signatures_booking_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_contract_signatures_booking_id ON freight.booking_contract_signatures USING btree (booking_id);
+
+
+--
+-- Name: idx_booking_document_review_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_document_review_booking ON freight.booking_document_review USING btree (booking_id);
+
+
+--
+-- Name: idx_booking_document_review_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_document_review_status ON freight.booking_document_review USING btree (status);
+
+
+--
+-- Name: idx_booking_requests_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_requests_contract ON freight.booking_requests USING btree (contract_id);
+
+
+--
+-- Name: idx_booking_requests_contract_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_requests_contract_status ON freight.booking_requests USING btree (contract_id, status);
+
+
+--
+-- Name: idx_booking_requests_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_requests_status ON freight.booking_requests USING btree (status);
+
+
+--
+-- Name: idx_booking_review_note_booking_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_booking_review_note_booking_id ON freight.booking_review_note USING btree (booking_id);
+
+
+--
+-- Name: idx_bookings_booking_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_booking_type ON freight.bookings USING btree (booking_type);
+
+
+--
+-- Name: idx_bookings_company_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_company_id ON freight.bookings USING btree (company_id);
+
+
+--
+-- Name: idx_bookings_company_profile_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_company_profile_id ON freight.bookings USING btree (company_profile_id);
+
+
+--
+-- Name: idx_bookings_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_contract ON freight.bookings USING btree (contract_id);
+
+
+--
+-- Name: idx_bookings_is_government; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_is_government ON freight.bookings USING btree (is_government) WHERE ((is_government = true) AND (deleted_at IS NULL));
+
+
+--
+-- Name: idx_bookings_route_day; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_route_day ON freight.bookings USING btree (origin_yard_id, destination_yard_id, scheduled_date, status) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: idx_bookings_scheduling_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_scheduling_status ON freight.bookings USING btree (scheduling_status);
+
+
+--
+-- Name: idx_bookings_train_schedule_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bookings_train_schedule_id ON freight.bookings USING btree (train_schedule_id) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: idx_bwc_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bwc_booking ON freight.booking_wagon_cancellations USING btree (booking_id);
+
+
+--
+-- Name: idx_bwc_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_bwc_status ON freight.booking_wagon_cancellations USING btree (status);
+
+
+--
+-- Name: idx_clearance_incidents_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_clearance_incidents_booking ON freight.clearance_incidents USING btree (booking_id);
+
+
+--
+-- Name: idx_clearance_milestones_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_clearance_milestones_booking ON freight.clearance_milestones USING btree (booking_id);
+
+
+--
+-- Name: idx_clearance_milestones_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_clearance_milestones_contract ON freight.clearance_milestones USING btree (contract_id);
+
+
+--
+-- Name: idx_clearance_milestones_region; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_clearance_milestones_region ON freight.clearance_milestones USING btree (owner_region, status);
+
+
+--
+-- Name: idx_company_change_request_company; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_company_change_request_company ON freight.company_change_request USING btree (company_id);
+
+
+--
+-- Name: idx_company_change_request_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_company_change_request_status ON freight.company_change_request USING btree (status);
+
+
+--
+-- Name: idx_company_revisions_company; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_company_revisions_company ON freight.company_revisions USING btree (company_id);
+
+
+--
+-- Name: idx_compliance_records_expiry_date; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_compliance_records_expiry_date ON freight.compliance_records USING btree (expiry_date);
+
+
+--
+-- Name: idx_compliance_records_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_compliance_records_type ON freight.compliance_records USING btree (type);
+
+
+--
+-- Name: idx_compliance_records_vehicle_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_compliance_records_vehicle_id ON freight.compliance_records USING btree (vehicle_id);
+
+
+--
+-- Name: idx_contract_approval_steps_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_approval_steps_contract ON freight.contract_approval_steps USING btree (contract_id);
+
+
+--
+-- Name: idx_contract_cargo_scope_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_cargo_scope_contract ON freight.contract_cargo_scope USING btree (contract_id);
+
+
+--
+-- Name: idx_contract_clearance_cycles_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_clearance_cycles_contract ON freight.contract_clearance_cycles USING btree (contract_id);
+
+
+--
+-- Name: idx_contract_doc_review_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_doc_review_contract ON freight.contract_document_review USING btree (contract_id);
+
+
+--
+-- Name: idx_contract_doc_review_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_doc_review_status ON freight.contract_document_review USING btree (status);
+
+
+--
+-- Name: idx_contract_document_revisions_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_document_revisions_contract ON freight.contract_document_revisions USING btree (contract_id, created_at DESC);
+
+
+--
+-- Name: idx_contract_rate_snapshots_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_rate_snapshots_contract ON freight.contract_rate_snapshots USING btree (contract_id);
+
+
+--
+-- Name: idx_contract_review_notes_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_review_notes_contract ON freight.contract_review_notes USING btree (contract_id);
+
+
+--
+-- Name: idx_contract_routes_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_routes_contract ON freight.contract_routes USING btree (contract_id);
+
+
+--
+-- Name: idx_contract_signatures_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contract_signatures_contract ON freight.contract_signatures USING btree (contract_id);
+
+
+--
+-- Name: idx_contracts_company; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contracts_company ON freight.contracts USING btree (company_id);
+
+
+--
+-- Name: idx_contracts_kind; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contracts_kind ON freight.contracts USING btree (contract_kind);
+
+
+--
+-- Name: idx_contracts_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contracts_status ON freight.contracts USING btree (status);
+
+
+--
+-- Name: idx_contracts_valid_until; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_contracts_valid_until ON freight.contracts USING btree (contract_valid_until);
+
+
+--
+-- Name: idx_djibouti_incidents_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_djibouti_incidents_booking ON freight.djibouti_import_incidents USING btree (booking_id);
+
+
+--
+-- Name: idx_djibouti_incidents_container; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_djibouti_incidents_container ON freight.djibouti_import_incidents USING btree (container_number);
+
+
+--
+-- Name: idx_djibouti_incidents_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_djibouti_incidents_type ON freight.djibouti_import_incidents USING btree (incident_type);
+
+
+--
+-- Name: idx_drivers_email; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_drivers_email ON freight.drivers USING btree (email);
+
+
+--
+-- Name: idx_drivers_license_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_drivers_license_number ON freight.drivers USING btree (license_number);
+
+
+--
+-- Name: idx_drivers_phone_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_drivers_phone_number ON freight.drivers USING btree (phone_number);
+
+
+--
+-- Name: idx_drivers_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_drivers_status ON freight.drivers USING btree (status);
+
+
+--
+-- Name: idx_empty_returns_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_empty_returns_booking ON freight.empty_container_returns USING btree (booking_id);
+
+
+--
+-- Name: idx_empty_returns_container; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_empty_returns_container ON freight.empty_container_returns USING btree (container_number);
+
+
+--
+-- Name: idx_empty_returns_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_empty_returns_status ON freight.empty_container_returns USING btree (status);
+
+
+--
+-- Name: idx_facilities_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX idx_facilities_code ON freight.facilities USING btree (code);
+
+
+--
+-- Name: idx_facilities_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_facilities_status ON freight.facilities USING btree (facility_status);
+
+
+--
+-- Name: idx_files_resource_lookup; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_files_resource_lookup ON freight.files USING btree (resource, resource_id);
+
+
+--
+-- Name: idx_fuel_consumption_vehicle_month; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_fuel_consumption_vehicle_month ON freight.fuel_consumption USING btree (vehicle_id, month);
+
+
+--
+-- Name: idx_fuel_purchases_date; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_fuel_purchases_date ON freight.fuel_purchases USING btree (purchase_date);
+
+
+--
+-- Name: idx_fuel_purchases_vehicle; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_fuel_purchases_vehicle ON freight.fuel_purchases USING btree (vehicle_id);
+
+
+--
+-- Name: idx_import_customs_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_import_customs_booking ON freight.import_customs_finalizations USING btree (booking_id);
+
+
+--
+-- Name: idx_import_customs_risk; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_import_customs_risk ON freight.import_customs_finalizations USING btree (customs_risk);
+
+
+--
+-- Name: idx_import_djibouti_operations_schedule; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_import_djibouti_operations_schedule ON freight.import_djibouti_operations USING btree (train_schedule_id);
+
+
+--
+-- Name: idx_interchange_documents_direction; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_interchange_documents_direction ON freight.interchange_documents USING btree (direction);
+
+
+--
+-- Name: idx_interchange_documents_schedule; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_interchange_documents_schedule ON freight.interchange_documents USING btree (schedule_id);
+
+
+--
+-- Name: idx_interchange_documents_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_interchange_documents_status ON freight.interchange_documents USING btree (status);
+
+
+--
+-- Name: idx_interchange_items_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_interchange_items_booking ON freight.interchange_document_items USING btree (booking_id);
+
+
+--
+-- Name: idx_interchange_items_document; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_interchange_items_document ON freight.interchange_document_items USING btree (interchange_document_id);
+
+
+--
+-- Name: idx_invoice_lines_invoice; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_invoice_lines_invoice ON freight.invoice_lines USING btree (invoice_id);
+
+
+--
+-- Name: idx_invoices_company; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_invoices_company ON freight.invoices USING btree (company_id);
+
+
+--
+-- Name: idx_invoices_company_profile; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_invoices_company_profile ON freight.invoices USING btree (company_profile_id);
+
+
+--
+-- Name: idx_invoices_source; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_invoices_source ON freight.invoices USING btree (source, source_id);
+
+
+--
+-- Name: idx_invoices_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_invoices_status ON freight.invoices USING btree (status);
+
+
+--
+-- Name: idx_locomotives_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_locomotives_status ON freight.locomotives USING btree (status);
+
+
+--
+-- Name: idx_maintenance_costs_vehicle_date; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_maintenance_costs_vehicle_date ON freight.maintenance_costs USING btree (vehicle_id, incurred_date);
+
+
+--
+-- Name: idx_maintenance_schedules_vehicle_date; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_maintenance_schedules_vehicle_date ON freight.maintenance_schedules USING btree (vehicle_id, scheduled_date);
+
+
+--
+-- Name: idx_payment_webhook_events_merchant_order_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_payment_webhook_events_merchant_order_id ON freight.payment_webhook_events USING btree (merchant_order_id);
+
+
+--
+-- Name: idx_prcr_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_prcr_status ON freight.priority_rule_change_requests USING btree (status);
+
+
+--
+-- Name: idx_priority_configs_currency_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_priority_configs_currency_type ON freight.priority_configs USING btree (currency, type);
+
+
+--
+-- Name: idx_priority_configs_type_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_priority_configs_type_active ON freight.priority_configs USING btree (type, is_active);
+
+
+--
+-- Name: idx_rcr_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_rcr_status ON freight.rate_change_requests USING btree (status);
+
+
+--
+-- Name: idx_route_milestones_route_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_route_milestones_route_id ON freight.route_milestones USING btree (route_id);
+
+
+--
+-- Name: idx_route_milestones_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_route_milestones_yard_id ON freight.route_milestones USING btree (yard_id);
+
+
+--
+-- Name: idx_routes_destination_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_routes_destination_yard_id ON freight.routes USING btree (destination_yard_id);
+
+
+--
+-- Name: idx_routes_origin_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_routes_origin_yard_id ON freight.routes USING btree (origin_yard_id);
+
+
+--
+-- Name: idx_scheduling_events_train_schedule_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_scheduling_events_train_schedule_id ON freight.scheduling_events USING btree (train_schedule_id) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: idx_support_doc_versions_document; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_support_doc_versions_document ON freight.support_document_versions USING btree (document_id);
+
+
+--
+-- Name: idx_train_checkpoint_events_schedule; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_checkpoint_events_schedule ON freight.train_checkpoint_events USING btree (train_schedule_id, sequence_no) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: idx_train_schedules_booking_window_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_schedules_booking_window_status ON freight.train_schedules USING btree (booking_window_status) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: idx_train_schedules_departure_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_schedules_departure_status ON freight.train_schedules USING btree (scheduled_departure_date, status);
+
+
+--
+-- Name: idx_train_schedules_route_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_schedules_route_id ON freight.train_schedules USING btree (route_id);
+
+
+--
+-- Name: idx_train_schedules_train_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_schedules_train_number ON freight.train_schedules USING btree (train_number);
+
+
+--
+-- Name: idx_train_schedules_window_phase; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_schedules_window_phase ON freight.train_schedules USING btree (window_phase) WHERE (window_phase IS NOT NULL);
+
+
+--
+-- Name: idx_train_set_wagons_physical_wagon; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_set_wagons_physical_wagon ON freight.train_set_wagons USING btree (physical_wagon_id);
+
+
+--
+-- Name: idx_train_sets_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_train_sets_status ON freight.train_sets USING btree (status);
+
+
+--
+-- Name: idx_user_trade_access_user_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_user_trade_access_user_id ON freight.user_trade_access USING btree (user_id);
+
+
+--
+-- Name: idx_vehicles_manufacturer; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_vehicles_manufacturer ON freight.vehicles USING btree (manufacturer);
+
+
+--
+-- Name: idx_vehicles_plate_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_vehicles_plate_number ON freight.vehicles USING btree (plate_number);
+
+
+--
+-- Name: idx_vehicles_registration_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_vehicles_registration_number ON freight.vehicles USING btree (registration_number);
+
+
+--
+-- Name: idx_vehicles_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_vehicles_status ON freight.vehicles USING btree (status);
+
+
+--
+-- Name: idx_vehicles_vehicle_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_vehicles_vehicle_type ON freight.vehicles USING btree (vehicle_type);
+
+
+--
+-- Name: idx_wabl_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wabl_booking ON freight.wagon_allocation_bulk_loads USING btree (booking_id);
+
+
+--
+-- Name: idx_waci_allocation; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_waci_allocation ON freight.wagon_allocation_container_items USING btree (wagon_booking_allocation_id);
+
+
+--
+-- Name: idx_wagon_booking_allocations_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wagon_booking_allocations_booking ON freight.wagon_booking_allocations USING btree (booking_id);
+
+
+--
+-- Name: idx_wagon_status_logs_wagon; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wagon_status_logs_wagon ON freight.wagon_status_logs USING btree (wagon_id, created_at DESC);
+
+
+--
+-- Name: idx_wagons_current_train_schedule_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wagons_current_train_schedule_id ON freight.wagons USING btree (current_train_schedule_id);
+
+
+--
+-- Name: idx_wagons_train_set_wagon_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wagons_train_set_wagon_id ON freight.wagons USING btree (train_set_wagon_id);
+
+
+--
+-- Name: idx_war_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_war_active ON freight.warehouse_allocation_rules USING btree (is_active);
+
+
+--
+-- Name: idx_war_priority; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_war_priority ON freight.warehouse_allocation_rules USING btree (priority);
+
+
+--
+-- Name: idx_warehouse_activity_log_activity_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_activity_log_activity_type ON freight.warehouse_activity_log USING btree (activity_type);
+
+
+--
+-- Name: idx_warehouse_activity_log_inventory_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_activity_log_inventory_id ON freight.warehouse_activity_log USING btree (inventory_id);
+
+
+--
+-- Name: idx_warehouse_activity_log_warehouse_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_activity_log_warehouse_id ON freight.warehouse_activity_log USING btree (warehouse_id);
+
+
+--
+-- Name: idx_warehouse_inventory_booking_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_booking_id ON freight.warehouse_inventory USING btree (booking_id);
+
+
+--
+-- Name: idx_warehouse_inventory_cargo_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_cargo_id ON freight.warehouse_inventory USING btree (cargo_id);
+
+
+--
+-- Name: idx_warehouse_inventory_container_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_container_id ON freight.warehouse_inventory USING btree (container_id);
+
+
+--
+-- Name: idx_warehouse_inventory_goods_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_goods_id ON freight.warehouse_inventory USING btree (goods_id);
+
+
+--
+-- Name: idx_warehouse_inventory_grn_number; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_grn_number ON freight.warehouse_inventory USING btree (grn_number) WHERE (grn_number IS NOT NULL);
+
+
+--
+-- Name: idx_warehouse_inventory_inspection_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_inspection_status ON freight.warehouse_inventory USING btree (inspection_status);
+
+
+--
+-- Name: idx_warehouse_inventory_movement_inventory_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_movement_inventory_id ON freight.warehouse_inventory_movement USING btree (inventory_id);
+
+
+--
+-- Name: idx_warehouse_inventory_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_status ON freight.warehouse_inventory USING btree (status);
+
+
+--
+-- Name: idx_warehouse_inventory_warehouse_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_warehouse_id ON freight.warehouse_inventory USING btree (warehouse_id);
+
+
+--
+-- Name: idx_warehouse_inventory_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_yard_id ON freight.warehouse_inventory USING btree (yard_id);
+
+
+--
+-- Name: idx_warehouse_inventory_zone_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_inventory_zone_id ON freight.warehouse_inventory USING btree (zone_id);
+
+
+--
+-- Name: idx_warehouse_loadings_booking_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_loadings_booking_id ON freight.warehouse_loadings USING btree (booking_id);
+
+
+--
+-- Name: idx_warehouse_loadings_inventory_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_loadings_inventory_id ON freight.warehouse_loadings USING btree (warehouse_inventory_id);
+
+
+--
+-- Name: idx_warehouse_loadings_train_schedule; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_loadings_train_schedule ON freight.warehouse_loadings USING btree (train_schedule_id) WHERE (train_schedule_id IS NOT NULL);
+
+
+--
+-- Name: idx_warehouse_loadings_wagon_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_loadings_wagon_id ON freight.warehouse_loadings USING btree (wagon_id);
+
+
+--
+-- Name: idx_warehouse_yards_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_yards_status ON freight.warehouse_yards USING btree (status);
+
+
+--
+-- Name: idx_warehouse_yards_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_yards_type ON freight.warehouse_yards USING btree (type);
+
+
+--
+-- Name: idx_warehouse_yards_warehouse_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_yards_warehouse_id ON freight.warehouse_yards USING btree (warehouse_id);
+
+
+--
+-- Name: idx_warehouse_zones_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_zones_status ON freight.warehouse_zones USING btree (status);
+
+
+--
+-- Name: idx_warehouse_zones_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_zones_type ON freight.warehouse_zones USING btree (type);
+
+
+--
+-- Name: idx_warehouse_zones_yard_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouse_zones_yard_id ON freight.warehouse_zones USING btree (yard_id);
+
+
+--
+-- Name: idx_warehouses_station_id; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouses_station_id ON freight.warehouses USING btree (station_id);
+
+
+--
+-- Name: idx_warehouses_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouses_status ON freight.warehouses USING btree (status);
+
+
+--
+-- Name: idx_warehouses_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_warehouses_type ON freight.warehouses USING btree (type);
+
+
+--
+-- Name: idx_wfr_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wfr_active ON freight.warehouse_fee_rules USING btree (is_active);
+
+
+--
+-- Name: idx_wfr_type; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wfr_type ON freight.warehouse_fee_rules USING btree (rule_type);
+
+
+--
+-- Name: idx_wir_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wir_booking ON freight.warehouse_inspection_reports USING btree (booking_id);
+
+
+--
+-- Name: idx_wir_inventory; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wir_inventory ON freight.warehouse_inspection_reports USING btree (inventory_id);
+
+
+--
+-- Name: idx_wir_status; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wir_status ON freight.warehouse_inspection_reports USING btree (inspection_status);
+
+
+--
+-- Name: idx_wm_moved_by; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wm_moved_by ON freight.wagon_movements USING btree (moved_by_user_id);
+
+
+--
+-- Name: idx_wm_transfer_request; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wm_transfer_request ON freight.wagon_movements USING btree (transfer_request_id);
+
+
+--
+-- Name: idx_wtr_status_from_yard; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_wtr_status_from_yard ON freight.wagon_transfer_requests USING btree (status, from_yard_id);
+
+
+--
+-- Name: idx_yard_distances_from_yard; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_yard_distances_from_yard ON freight.yard_distances USING btree (from_yard_id);
+
+
+--
+-- Name: idx_yard_distances_to_yard; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX idx_yard_distances_to_yard ON freight.yard_distances USING btree (to_yard_id);
+
+
+--
+-- Name: ix_transit_agents_is_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX ix_transit_agents_is_active ON freight.transit_agents USING btree (is_active);
+
+
+--
+-- Name: ix_truck_types_is_active; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE INDEX ix_truck_types_is_active ON freight.truck_types USING btree (is_active);
+
+
+--
+-- Name: uq_booking_document_review_doc; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_booking_document_review_doc ON freight.booking_document_review USING btree (booking_id, setting_code, file_key);
+
+
+--
+-- Name: uq_clearance_milestone_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_clearance_milestone_booking ON freight.clearance_milestones USING btree (booking_id, milestone_code) WHERE (booking_id IS NOT NULL);
+
+
+--
+-- Name: uq_clearance_milestone_cycle; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_clearance_milestone_cycle ON freight.clearance_milestones USING btree (clearance_cycle_id, milestone_code) WHERE (clearance_cycle_id IS NOT NULL);
+
+
+--
+-- Name: uq_contract_templates_cargo_customs; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_contract_templates_cargo_customs ON freight.contract_templates USING btree (cargo_type_id, with_customs) WHERE ((deleted_at IS NULL) AND (cargo_type_id IS NOT NULL));
+
+
+--
+-- Name: uq_contract_templates_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_contract_templates_code ON freight.contract_templates USING btree (code) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: uq_interchange_active_schedule_direction; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_interchange_active_schedule_direction ON freight.interchange_documents USING btree (schedule_id, direction) WHERE ((schedule_id IS NOT NULL) AND ((status)::text <> 'CANCELLED'::text) AND (deleted_at IS NULL));
+
+
+--
+-- Name: uq_one_active_booking_per_one_time_contract; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_one_active_booking_per_one_time_contract ON freight.bookings USING btree (contract_id) WHERE (((status)::text <> ALL (ARRAY[('EXPIRED'::character varying)::text, ('CANCELLED'::character varying)::text, ('COMPLETED'::character varying)::text, ('REJECTED'::character varying)::text])) AND (contract_id IS NOT NULL) AND ((contract_kind)::text = 'ONE_TIME'::text));
+
+
+--
+-- Name: uq_open_wagon_cancellation_per_booking; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_open_wagon_cancellation_per_booking ON freight.booking_wagon_cancellations USING btree (booking_id) WHERE (((status)::text = 'FEE_PENDING'::text) AND (deleted_at IS NULL));
+
+
+--
+-- Name: uq_rcr_one_pending_per_rate; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_rcr_one_pending_per_rate ON freight.rate_change_requests USING btree (rate_id) WHERE (((status)::text = 'PENDING'::text) AND (deleted_at IS NULL));
+
+
+--
+-- Name: uq_support_doc_version; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_support_doc_version ON freight.support_document_versions USING btree (document_id, version);
+
+
+--
+-- Name: uq_support_documents_slug; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_support_documents_slug ON freight.support_documents USING btree (slug);
+
+
+--
+-- Name: uq_yard_distances_pair; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX uq_yard_distances_pair ON freight.yard_distances USING btree (from_yard_id, to_yard_id) WHERE (deleted_at IS NULL);
+
+
+--
+-- Name: ux_invoices_eims_irn; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX ux_invoices_eims_irn ON freight.invoices USING btree (eims_irn) WHERE (eims_irn IS NOT NULL);
+
+
+--
+-- Name: ux_train_schedules_reference; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX ux_train_schedules_reference ON freight.train_schedules USING btree (reference) WHERE (reference IS NOT NULL);
+
+
+--
+-- Name: ux_truck_types_code; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX ux_truck_types_code ON freight.truck_types USING btree (code);
+
+
+--
+-- Name: ux_vehicles_vin; Type: INDEX; Schema: freight; Owner: -
+--
+
+CREATE UNIQUE INDEX ux_vehicles_vin ON freight.vehicles USING btree (vin) WHERE (vin IS NOT NULL);
+
+
+--
+-- Name: last_mile_container_allocations FK_0bc28c4087bb0c6e435677a6fcb; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_container_allocations
+    ADD CONSTRAINT "FK_0bc28c4087bb0c6e435677a6fcb" FOREIGN KEY (last_mile_id) REFERENCES freight.last_mile(id) ON DELETE CASCADE;
+
+
+--
+-- Name: ff_clients FK_1101fbe8e745d91b6bd0747b582; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.ff_clients
+    ADD CONSTRAINT "FK_1101fbe8e745d91b6bd0747b582" FOREIGN KEY (forwarder_company_id) REFERENCES freight.companies(id);
+
+
+--
+-- Name: last_mile FK_173a865c0889b8c5564993c70ff; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile
+    ADD CONSTRAINT "FK_173a865c0889b8c5564993c70ff" FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE SET NULL;
+
+
+--
+-- Name: external_profiles FK_26d2a16e263ab4fe0a4c8e91954; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.external_profiles
+    ADD CONSTRAINT "FK_26d2a16e263ab4fe0a4c8e91954" FOREIGN KEY (company_id) REFERENCES freight.companies(id);
+
+
+--
+-- Name: company_profiles FK_30228dd283a0f14486346e1db96; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.company_profiles
+    ADD CONSTRAINT "FK_30228dd283a0f14486346e1db96" FOREIGN KEY (company_id) REFERENCES freight.companies(id);
+
+
+--
+-- Name: first_mile_container_allocations FK_31dfdcea6bf62ec98f2e5428996; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile_container_allocations
+    ADD CONSTRAINT "FK_31dfdcea6bf62ec98f2e5428996" FOREIGN KEY (first_mile_id) REFERENCES freight.first_mile(id) ON DELETE CASCADE;
+
+
+--
+-- Name: last_mile_requests FK_32653c7b15225addbafdaa297c1; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_requests
+    ADD CONSTRAINT "FK_32653c7b15225addbafdaa297c1" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: company_change_request FK_366962cebba507dd8b0146f7f47; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.company_change_request
+    ADD CONSTRAINT "FK_366962cebba507dd8b0146f7f47" FOREIGN KEY (company_id) REFERENCES freight.companies(id) ON DELETE CASCADE;
+
+
+--
+-- Name: warehouses FK_374ce3a1439d02d5ff97e479921; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouses
+    ADD CONSTRAINT "FK_374ce3a1439d02d5ff97e479921" FOREIGN KEY (facility_id) REFERENCES freight.facilities(id) ON DELETE SET NULL;
+
+
+--
+-- Name: booking_container_allocations FK_4fa907f6cc2cfe181385dcd57c5; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container_allocations
+    ADD CONSTRAINT "FK_4fa907f6cc2cfe181385dcd57c5" FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE SET NULL;
+
+
+--
+-- Name: booking_requests FK_590f6298c3c3ae09d982f96fb9d; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_requests
+    ADD CONSTRAINT "FK_590f6298c3c3ae09d982f96fb9d" FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: import_djibouti_operations FK_6c3e3046300b152a13505bf8ffd; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.import_djibouti_operations
+    ADD CONSTRAINT "FK_6c3e3046300b152a13505bf8ffd" FOREIGN KEY (train_schedule_id) REFERENCES freight.train_schedules(id) ON DELETE CASCADE;
+
+
+--
+-- Name: bookings FK_6fa72e9c8fdfa587cffd9383470; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_6fa72e9c8fdfa587cffd9383470" FOREIGN KEY (destination_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: last_mile_container_allocations FK_825ceccffec68ac49c85bd75de0; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_container_allocations
+    ADD CONSTRAINT "FK_825ceccffec68ac49c85bd75de0" FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE SET NULL;
+
+
+--
+-- Name: interchange_document_items FK_864508e9249279bd3e12dafdd21; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.interchange_document_items
+    ADD CONSTRAINT "FK_864508e9249279bd3e12dafdd21" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE SET NULL;
+
+
+--
+-- Name: company_revisions FK_8a17ca32f9e4624e1c55c51f7c7; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.company_revisions
+    ADD CONSTRAINT "FK_8a17ca32f9e4624e1c55c51f7c7" FOREIGN KEY (company_id) REFERENCES freight.companies(id) ON DELETE CASCADE;
+
+
+--
+-- Name: first_mile_container_allocations FK_8bba293eb2fd548433d28d97103; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile_container_allocations
+    ADD CONSTRAINT "FK_8bba293eb2fd548433d28d97103" FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE SET NULL;
+
+
+--
+-- Name: booking_container FK_91946ca51ff65658f487eae1162; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container
+    ADD CONSTRAINT "FK_91946ca51ff65658f487eae1162" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_container_allocations FK_99c89fe4e4c3e3670fdc25ea9a9; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container_allocations
+    ADD CONSTRAINT "FK_99c89fe4e4c3e3670fdc25ea9a9" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_requests FK_9e49de0ed55d84d3f97627040cd; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_requests
+    ADD CONSTRAINT "FK_9e49de0ed55d84d3f97627040cd" FOREIGN KEY (created_booking_id) REFERENCES freight.bookings(id) ON DELETE SET NULL;
+
+
+--
+-- Name: cargo_types FK_CARGO_TYPES_PARENT_GROUP; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargo_types
+    ADD CONSTRAINT "FK_CARGO_TYPES_PARENT_GROUP" FOREIGN KEY (parent_group_id) REFERENCES freight.cargo_types(id) ON DELETE SET NULL;
+
+
+--
+-- Name: first_mile FK_a19b54ac3d426df8cc0e313be06; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile
+    ADD CONSTRAINT "FK_a19b54ac3d426df8cc0e313be06" FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE SET NULL;
+
+
+--
+-- Name: first_mile FK_a2ae03360a02c61fdc2e8361ea8; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile
+    ADD CONSTRAINT "FK_a2ae03360a02c61fdc2e8361ea8" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: ff_clients FK_af4d6bac2844d39095b2056e978; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.ff_clients
+    ADD CONSTRAINT "FK_af4d6bac2844d39095b2056e978" FOREIGN KEY (client_company_id) REFERENCES freight.companies(id);
+
+
+--
+-- Name: booking_cargo_modifier FK_booking_cargo_modifier_booking_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_cargo_modifier
+    ADD CONSTRAINT "FK_booking_cargo_modifier_booking_id" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_cargo_modifier FK_booking_cargo_modifier_rate_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_cargo_modifier
+    ADD CONSTRAINT "FK_booking_cargo_modifier_rate_id" FOREIGN KEY (rate_id) REFERENCES freight.rates(id);
+
+
+--
+-- Name: booking_cargo_modifier FK_booking_cargo_modifier_rate_snapshot_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_cargo_modifier
+    ADD CONSTRAINT "FK_booking_cargo_modifier_rate_snapshot_id" FOREIGN KEY (rate_snapshot_id) REFERENCES freight.booking_rate_snapshot(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: booking_container FK_booking_container_container_type_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container
+    ADD CONSTRAINT "FK_booking_container_container_type_id" FOREIGN KEY (container_type_id) REFERENCES freight.container_types(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: booking_container FK_booking_container_weight_limit_rule_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container
+    ADD CONSTRAINT "FK_booking_container_weight_limit_rule_id" FOREIGN KEY (weight_limit_rule_id) REFERENCES freight.weight_limit_rules(id) ON DELETE SET NULL;
+
+
+--
+-- Name: booking_rate_snapshot FK_booking_rate_snapshot_booking_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_rate_snapshot
+    ADD CONSTRAINT "FK_booking_rate_snapshot_booking_id" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_rate_snapshot FK_booking_rate_snapshot_rate_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_rate_snapshot
+    ADD CONSTRAINT "FK_booking_rate_snapshot_rate_id" FOREIGN KEY (rate_id) REFERENCES freight.rates(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: bookings FK_bookings_cargo_type_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_cargo_type_id" FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: bookings FK_bookings_company_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_company_id" FOREIGN KEY (company_id) REFERENCES freight.companies(id);
+
+
+--
+-- Name: bookings FK_bookings_company_profile_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_company_profile_id" FOREIGN KEY (company_profile_id) REFERENCES freight.company_profiles(id);
+
+
+--
+-- Name: bookings FK_bookings_consolidation_partner_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_consolidation_partner_id" FOREIGN KEY (consolidation_partner_id) REFERENCES freight.bookings(id) ON DELETE SET NULL;
+
+
+--
+-- Name: bookings FK_bookings_customer_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_customer_id" FOREIGN KEY (customer_id) REFERENCES freight.customers(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: bookings FK_bookings_service_type_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_service_type_id" FOREIGN KEY (service_type_id) REFERENCES freight.service_types(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: bookings FK_bookings_shipping_line_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_shipping_line_id" FOREIGN KEY (shipping_line_id) REFERENCES freight.shipping_lines(id) ON DELETE SET NULL;
+
+
+--
+-- Name: bookings FK_bookings_train_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_bookings_train_id" FOREIGN KEY (train_id) REFERENCES freight.trains(id) ON DELETE SET NULL;
+
+
+--
+-- Name: last_mile FK_c2d9331fda382ae3e92e6bf913a; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile
+    ADD CONSTRAINT "FK_c2d9331fda382ae3e92e6bf913a" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_document_review FK_c669c986810af3b82cf033a8d79; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_document_review
+    ADD CONSTRAINT "FK_c669c986810af3b82cf033a8d79" FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: last_mile_requests FK_c845afc4aeaf8f73e38a5b5483d; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_requests
+    ADD CONSTRAINT "FK_c845afc4aeaf8f73e38a5b5483d" FOREIGN KEY (train_schedule_id) REFERENCES freight.train_schedules(id) ON DELETE CASCADE;
+
+
+--
+-- Name: interchange_document_items FK_c9fba2c4a1631542a37ad5089d7; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.interchange_document_items
+    ADD CONSTRAINT "FK_c9fba2c4a1631542a37ad5089d7" FOREIGN KEY (interchange_document_id) REFERENCES freight.interchange_documents(id) ON DELETE CASCADE;
+
+
+--
+-- Name: bookings FK_cabe80a0c7b9e0144854a4f353d; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT "FK_cabe80a0c7b9e0144854a4f353d" FOREIGN KEY (origin_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: cargoes FK_cargoes_cargo_type_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargoes
+    ADD CONSTRAINT "FK_cargoes_cargo_type_id" FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id);
+
+
+--
+-- Name: cargoes FK_cargoes_container_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargoes
+    ADD CONSTRAINT "FK_cargoes_container_id" FOREIGN KEY (container_id) REFERENCES freight.containers(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: cargo_type_wagon_types FK_cgwt_cargo_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargo_type_wagon_types
+    ADD CONSTRAINT "FK_cgwt_cargo_type" FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id) ON DELETE CASCADE;
+
+
+--
+-- Name: cargo_type_wagon_types FK_cgwt_wagon_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargo_type_wagon_types
+    ADD CONSTRAINT "FK_cgwt_wagon_type" FOREIGN KEY (wagon_type_id) REFERENCES freight.wagon_types(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: containers FK_containers_container_type_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.containers
+    ADD CONSTRAINT "FK_containers_container_type_id" FOREIGN KEY (container_type_id) REFERENCES freight.container_types(id);
+
+
+--
+-- Name: containers FK_containers_wagon_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.containers
+    ADD CONSTRAINT "FK_containers_wagon_id" FOREIGN KEY (wagon_id) REFERENCES freight.wagons(id) ON DELETE SET NULL;
+
+
+--
+-- Name: container_type_wagon_types FK_ctwt_container_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.container_type_wagon_types
+    ADD CONSTRAINT "FK_ctwt_container_type" FOREIGN KEY (container_type_id) REFERENCES freight.container_types(id) ON DELETE CASCADE;
+
+
+--
+-- Name: container_type_wagon_types FK_ctwt_wagon_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.container_type_wagon_types
+    ADD CONSTRAINT "FK_ctwt_wagon_type" FOREIGN KEY (wagon_type_id) REFERENCES freight.wagon_types(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: last_mile_requests FK_d8e15175ed6471429295e2cd788; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_requests
+    ADD CONSTRAINT "FK_d8e15175ed6471429295e2cd788" FOREIGN KEY (resulting_last_mile_id) REFERENCES freight.last_mile(id) ON DELETE SET NULL;
+
+
+--
+-- Name: dropdown_options FK_dropdown_options_setting; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.dropdown_options
+    ADD CONSTRAINT "FK_dropdown_options_setting" FOREIGN KEY (setting_id) REFERENCES freight.dropdown_settings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: file_upload_fields FK_file_upload_fields_setting; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.file_upload_fields
+    ADD CONSTRAINT "FK_file_upload_fields_setting" FOREIGN KEY (setting_id) REFERENCES freight.file_upload_settings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: locomotives FK_locomotive_current_yard; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.locomotives
+    ADD CONSTRAINT "FK_locomotive_current_yard" FOREIGN KEY (current_yard_id) REFERENCES freight.yards(id) ON DELETE SET NULL;
+
+
+--
+-- Name: rates FK_rates_cargo_type_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.rates
+    ADD CONSTRAINT "FK_rates_cargo_type_id" FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id) ON DELETE SET NULL;
+
+
+--
+-- Name: rates FK_rates_destination_yard_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.rates
+    ADD CONSTRAINT "FK_rates_destination_yard_id" FOREIGN KEY (destination_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: rates FK_rates_origin_yard_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.rates
+    ADD CONSTRAINT "FK_rates_origin_yard_id" FOREIGN KEY (origin_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: train_locomotives FK_train_locomotives_locomotive; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_locomotives
+    ADD CONSTRAINT "FK_train_locomotives_locomotive" FOREIGN KEY (locomotive_id) REFERENCES freight.locomotives(id);
+
+
+--
+-- Name: train_locomotives FK_train_locomotives_train; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_locomotives
+    ADD CONSTRAINT "FK_train_locomotives_train" FOREIGN KEY (train_id) REFERENCES freight.trains(id) ON DELETE CASCADE;
+
+
+--
+-- Name: train_set_locomotives FK_train_set_locomotives_locomotive; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_locomotives
+    ADD CONSTRAINT "FK_train_set_locomotives_locomotive" FOREIGN KEY (locomotive_id) REFERENCES freight.locomotives(id);
+
+
+--
+-- Name: train_set_locomotives FK_train_set_locomotives_train_set; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_locomotives
+    ADD CONSTRAINT "FK_train_set_locomotives_train_set" FOREIGN KEY (train_set_id) REFERENCES freight.train_sets(id) ON DELETE CASCADE;
+
+
+--
+-- Name: train_sets FK_train_sets_train; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_sets
+    ADD CONSTRAINT "FK_train_sets_train" FOREIGN KEY (train_id) REFERENCES freight.trains(id) ON DELETE SET NULL;
+
+
+--
+-- Name: trains FK_trains_current_yard; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.trains
+    ADD CONSTRAINT "FK_trains_current_yard" FOREIGN KEY (current_yard_id) REFERENCES freight.yards(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagons FK_wagon_current_yard; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagons
+    ADD CONSTRAINT "FK_wagon_current_yard" FOREIGN KEY (current_yard_id) REFERENCES freight.yards(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagons FK_wagons_current_location_yard_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagons
+    ADD CONSTRAINT "FK_wagons_current_location_yard_id" FOREIGN KEY (current_location_yard_id) REFERENCES freight.yards(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagons FK_wagons_train_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagons
+    ADD CONSTRAINT "FK_wagons_train_id" FOREIGN KEY (train_id) REFERENCES freight.trains(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagons FK_wagons_wagon_type_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagons
+    ADD CONSTRAINT "FK_wagons_wagon_type_id" FOREIGN KEY (wagon_type_id) REFERENCES freight.wagon_types(id);
+
+
+--
+-- Name: warranties FK_warranties_vehicle_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warranties
+    ADD CONSTRAINT "FK_warranties_vehicle_id" FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE CASCADE;
+
+
+--
+-- Name: weight_limit_rules FK_weight_limit_rules_container_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.weight_limit_rules
+    ADD CONSTRAINT "FK_weight_limit_rules_container_type" FOREIGN KEY (container_type_id) REFERENCES freight.container_types(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: work_orders FK_work_orders_vehicle_id; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.work_orders
+    ADD CONSTRAINT "FK_work_orders_vehicle_id" FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_batch_offers booking_batch_offers_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_batch_offers
+    ADD CONSTRAINT booking_batch_offers_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_batch_offers booking_batch_offers_train_schedule_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_batch_offers
+    ADD CONSTRAINT booking_batch_offers_train_schedule_id_fkey FOREIGN KEY (train_schedule_id) REFERENCES freight.train_schedules(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_container_units booking_container_units_booking_container_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_container_units
+    ADD CONSTRAINT booking_container_units_booking_container_id_fkey FOREIGN KEY (booking_container_id) REFERENCES freight.booking_container(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_contract_signatures booking_contract_signatures_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_contract_signatures
+    ADD CONSTRAINT booking_contract_signatures_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_contract_signatures booking_contract_signatures_signature_file_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_contract_signatures
+    ADD CONSTRAINT booking_contract_signatures_signature_file_id_fkey FOREIGN KEY (signature_file_id) REFERENCES freight.files(id) ON DELETE SET NULL;
+
+
+--
+-- Name: booking_document_review booking_document_review_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_document_review
+    ADD CONSTRAINT booking_document_review_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id);
+
+
+--
+-- Name: booking_handovers booking_handovers_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_handovers
+    ADD CONSTRAINT booking_handovers_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_handovers booking_handovers_edr_assignment_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_handovers
+    ADD CONSTRAINT booking_handovers_edr_assignment_id_fkey FOREIGN KEY (edr_assignment_id) REFERENCES freight.last_mile_vehicle_assignments(id) ON DELETE SET NULL;
+
+
+--
+-- Name: booking_handovers booking_handovers_truck_assignment_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_handovers
+    ADD CONSTRAINT booking_handovers_truck_assignment_id_fkey FOREIGN KEY (truck_assignment_id) REFERENCES freight.customer_truck_assignments(id) ON DELETE SET NULL;
+
+
+--
+-- Name: booking_review_note booking_review_note_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_review_note
+    ADD CONSTRAINT booking_review_note_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: booking_wagon_cancellations booking_wagon_cancellations_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_wagon_cancellations
+    ADD CONSTRAINT booking_wagon_cancellations_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id);
+
+
+--
+-- Name: booking_wagon_cancellations booking_wagon_cancellations_fee_invoice_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_wagon_cancellations
+    ADD CONSTRAINT booking_wagon_cancellations_fee_invoice_id_fkey FOREIGN KEY (fee_invoice_id) REFERENCES freight.invoices(id);
+
+
+--
+-- Name: booking_wagon_cancellations booking_wagon_cancellations_fee_rate_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_wagon_cancellations
+    ADD CONSTRAINT booking_wagon_cancellations_fee_rate_id_fkey FOREIGN KEY (fee_rate_id) REFERENCES freight.rates(id);
+
+
+--
+-- Name: booking_wagon_cancellations booking_wagon_cancellations_rebooked_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.booking_wagon_cancellations
+    ADD CONSTRAINT booking_wagon_cancellations_rebooked_booking_id_fkey FOREIGN KEY (rebooked_booking_id) REFERENCES freight.bookings(id);
+
+
+--
+-- Name: bookings bookings_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT bookings_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id);
+
+
+--
+-- Name: bookings bookings_contract_route_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.bookings
+    ADD CONSTRAINT bookings_contract_route_id_fkey FOREIGN KEY (contract_route_id) REFERENCES freight.contract_routes(id);
+
+
+--
+-- Name: clearance_incidents clearance_incidents_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.clearance_incidents
+    ADD CONSTRAINT clearance_incidents_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: clearance_milestones clearance_milestones_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.clearance_milestones
+    ADD CONSTRAINT clearance_milestones_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: clearance_milestones clearance_milestones_clearance_cycle_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.clearance_milestones
+    ADD CONSTRAINT clearance_milestones_clearance_cycle_id_fkey FOREIGN KEY (clearance_cycle_id) REFERENCES freight.contract_clearance_cycles(id);
+
+
+--
+-- Name: clearance_milestones clearance_milestones_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.clearance_milestones
+    ADD CONSTRAINT clearance_milestones_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: compliance_records compliance_records_vehicle_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.compliance_records
+    ADD CONSTRAINT compliance_records_vehicle_id_fkey FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id);
+
+
+--
+-- Name: contract_approval_steps contract_approval_steps_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_approval_steps
+    ADD CONSTRAINT contract_approval_steps_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_cargo_scope contract_cargo_scope_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_cargo_scope
+    ADD CONSTRAINT contract_cargo_scope_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_clearance_cycles contract_clearance_cycles_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_clearance_cycles
+    ADD CONSTRAINT contract_clearance_cycles_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_document_review contract_document_review_clearance_cycle_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_document_review
+    ADD CONSTRAINT contract_document_review_clearance_cycle_id_fkey FOREIGN KEY (clearance_cycle_id) REFERENCES freight.contract_clearance_cycles(id);
+
+
+--
+-- Name: contract_document_review contract_document_review_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_document_review
+    ADD CONSTRAINT contract_document_review_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_document_revisions contract_document_revisions_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_document_revisions
+    ADD CONSTRAINT contract_document_revisions_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_rate_snapshots contract_rate_snapshots_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_rate_snapshots
+    ADD CONSTRAINT contract_rate_snapshots_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_review_notes contract_review_notes_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_review_notes
+    ADD CONSTRAINT contract_review_notes_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_routes contract_routes_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_routes
+    ADD CONSTRAINT contract_routes_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_signatures contract_signatures_contract_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_signatures
+    ADD CONSTRAINT contract_signatures_contract_id_fkey FOREIGN KEY (contract_id) REFERENCES freight.contracts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: contract_templates contract_templates_cargo_type_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contract_templates
+    ADD CONSTRAINT contract_templates_cargo_type_id_fkey FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id);
+
+
+--
+-- Name: contracts contracts_renewal_of_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.contracts
+    ADD CONSTRAINT contracts_renewal_of_id_fkey FOREIGN KEY (renewal_of_id) REFERENCES freight.contracts(id);
+
+
+--
+-- Name: customer_truck_assignments customer_truck_assignments_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customer_truck_assignments
+    ADD CONSTRAINT customer_truck_assignments_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: customer_truck_containers customer_truck_containers_assignment_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customer_truck_containers
+    ADD CONSTRAINT customer_truck_containers_assignment_id_fkey FOREIGN KEY (assignment_id) REFERENCES freight.customer_truck_assignments(id) ON DELETE CASCADE;
+
+
+--
+-- Name: customer_truck_containers customer_truck_containers_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.customer_truck_containers
+    ADD CONSTRAINT customer_truck_containers_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE CASCADE;
+
+
+--
+-- Name: facility_handling_events facility_handling_events_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.facility_handling_events
+    ADD CONSTRAINT facility_handling_events_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id);
+
+
+--
+-- Name: facility_handling_events facility_handling_events_inventory_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.facility_handling_events
+    ADD CONSTRAINT facility_handling_events_inventory_id_fkey FOREIGN KEY (inventory_id) REFERENCES freight.warehouse_inventory(id);
+
+
+--
+-- Name: facility_handling_events facility_handling_events_train_schedule_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.facility_handling_events
+    ADD CONSTRAINT facility_handling_events_train_schedule_id_fkey FOREIGN KEY (train_schedule_id) REFERENCES freight.train_schedules(id);
+
+
+--
+-- Name: facility_handling_events facility_handling_events_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.facility_handling_events
+    ADD CONSTRAINT facility_handling_events_yard_id_fkey FOREIGN KEY (yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: first_mile_vehicle_assignments first_mile_vehicle_assignments_first_mile_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile_vehicle_assignments
+    ADD CONSTRAINT first_mile_vehicle_assignments_first_mile_id_fkey FOREIGN KEY (first_mile_id) REFERENCES freight.first_mile(id) ON DELETE CASCADE;
+
+
+--
+-- Name: first_mile_vehicle_assignments first_mile_vehicle_assignments_vehicle_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.first_mile_vehicle_assignments
+    ADD CONSTRAINT first_mile_vehicle_assignments_vehicle_id_fkey FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id);
+
+
+--
+-- Name: cargoes fk_cargoes_booking; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargoes
+    ADD CONSTRAINT fk_cargoes_booking FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE SET NULL;
+
+
+--
+-- Name: cargoes fk_cargoes_wagon_allocation; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.cargoes
+    ADD CONSTRAINT fk_cargoes_wagon_allocation FOREIGN KEY (wagon_booking_allocation_id) REFERENCES freight.wagon_booking_allocations(id) ON DELETE SET NULL;
+
+
+--
+-- Name: containers fk_containers_booking; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.containers
+    ADD CONSTRAINT fk_containers_booking FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE SET NULL;
+
+
+--
+-- Name: containers fk_containers_booking_container; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.containers
+    ADD CONSTRAINT fk_containers_booking_container FOREIGN KEY (booking_container_id) REFERENCES freight.booking_container(id) ON DELETE SET NULL;
+
+
+--
+-- Name: containers fk_containers_wagon_allocation; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.containers
+    ADD CONSTRAINT fk_containers_wagon_allocation FOREIGN KEY (wagon_booking_allocation_id) REFERENCES freight.wagon_booking_allocations(id) ON DELETE SET NULL;
+
+
+--
+-- Name: fuel_consumption fk_fuel_consumption_vehicle; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fuel_consumption
+    ADD CONSTRAINT fk_fuel_consumption_vehicle FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE CASCADE;
+
+
+--
+-- Name: fuel_purchases fk_fuel_purchases_vehicle; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.fuel_purchases
+    ADD CONSTRAINT fk_fuel_purchases_vehicle FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE CASCADE;
+
+
+--
+-- Name: invoice_lines fk_invoice_lines_invoice; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.invoice_lines
+    ADD CONSTRAINT fk_invoice_lines_invoice FOREIGN KEY (invoice_id) REFERENCES freight.invoices(id) ON DELETE CASCADE;
+
+
+--
+-- Name: invoices fk_invoices_company; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.invoices
+    ADD CONSTRAINT fk_invoices_company FOREIGN KEY (company_id) REFERENCES freight.companies(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: invoices fk_invoices_company_profile; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.invoices
+    ADD CONSTRAINT fk_invoices_company_profile FOREIGN KEY (company_profile_id) REFERENCES freight.company_profiles(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: invoices fk_invoices_payment; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.invoices
+    ADD CONSTRAINT fk_invoices_payment FOREIGN KEY (payment_id) REFERENCES freight.payments(id) ON DELETE SET NULL;
+
+
+--
+-- Name: maintenance_costs fk_maintenance_schedule; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.maintenance_costs
+    ADD CONSTRAINT fk_maintenance_schedule FOREIGN KEY (maintenance_schedule_id) REFERENCES freight.maintenance_schedules(id) ON DELETE SET NULL;
+
+
+--
+-- Name: payment_refunds fk_payment_refunds_payment; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.payment_refunds
+    ADD CONSTRAINT fk_payment_refunds_payment FOREIGN KEY (payment_id) REFERENCES freight.payments(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: train_schedule_bookings fk_train_schedule_bookings_booking; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedule_bookings
+    ADD CONSTRAINT fk_train_schedule_bookings_booking FOREIGN KEY (booking_id) REFERENCES freight.bookings(id);
+
+
+--
+-- Name: train_schedule_bookings fk_train_schedule_bookings_schedule; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedule_bookings
+    ADD CONSTRAINT fk_train_schedule_bookings_schedule FOREIGN KEY (train_schedule_id) REFERENCES freight.train_schedules(id) ON DELETE CASCADE;
+
+
+--
+-- Name: train_schedules fk_train_schedules_destination; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedules
+    ADD CONSTRAINT fk_train_schedules_destination FOREIGN KEY (destination_station_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: train_schedules fk_train_schedules_origin; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedules
+    ADD CONSTRAINT fk_train_schedules_origin FOREIGN KEY (origin_station_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: train_schedules fk_train_schedules_route; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedules
+    ADD CONSTRAINT fk_train_schedules_route FOREIGN KEY (route_id) REFERENCES freight.routes(id);
+
+
+--
+-- Name: train_schedules fk_train_schedules_train_set; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_schedules
+    ADD CONSTRAINT fk_train_schedules_train_set FOREIGN KEY (train_set_id) REFERENCES freight.train_sets(id);
+
+
+--
+-- Name: train_set_wagons fk_train_set_wagons_physical_wagon; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_wagons
+    ADD CONSTRAINT fk_train_set_wagons_physical_wagon FOREIGN KEY (physical_wagon_id) REFERENCES freight.wagons(id) ON DELETE SET NULL;
+
+
+--
+-- Name: train_set_wagons fk_train_set_wagons_train_set; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_wagons
+    ADD CONSTRAINT fk_train_set_wagons_train_set FOREIGN KEY (train_set_id) REFERENCES freight.train_sets(id) ON DELETE CASCADE;
+
+
+--
+-- Name: train_set_wagons fk_train_set_wagons_wagon_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_wagons
+    ADD CONSTRAINT fk_train_set_wagons_wagon_type FOREIGN KEY (wagon_type_id) REFERENCES freight.wagon_types(id);
+
+
+--
+-- Name: train_sets fk_train_sets_locomotive; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_sets
+    ADD CONSTRAINT fk_train_sets_locomotive FOREIGN KEY (locomotive_id) REFERENCES freight.locomotives(id);
+
+
+--
+-- Name: vehicles fk_vehicles_truck_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.vehicles
+    ADD CONSTRAINT fk_vehicles_truck_type FOREIGN KEY (truck_type_id) REFERENCES freight.truck_types(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_allocation_bulk_loads fk_wabl_allocation; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_bulk_loads
+    ADD CONSTRAINT fk_wabl_allocation FOREIGN KEY (wagon_booking_allocation_id) REFERENCES freight.wagon_booking_allocations(id) ON DELETE CASCADE;
+
+
+--
+-- Name: wagon_allocation_bulk_loads fk_wabl_booking; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_bulk_loads
+    ADD CONSTRAINT fk_wabl_booking FOREIGN KEY (booking_id) REFERENCES freight.bookings(id);
+
+
+--
+-- Name: wagon_allocation_bulk_loads fk_wabl_cargo_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_bulk_loads
+    ADD CONSTRAINT fk_wabl_cargo_type FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_allocation_container_items fk_waci_allocation; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_container_items
+    ADD CONSTRAINT fk_waci_allocation FOREIGN KEY (wagon_booking_allocation_id) REFERENCES freight.wagon_booking_allocations(id) ON DELETE CASCADE;
+
+
+--
+-- Name: wagon_allocation_container_items fk_waci_booking_container; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_container_items
+    ADD CONSTRAINT fk_waci_booking_container FOREIGN KEY (booking_container_id) REFERENCES freight.booking_container(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_allocation_container_items fk_waci_container; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_container_items
+    ADD CONSTRAINT fk_waci_container FOREIGN KEY (container_id) REFERENCES freight.containers(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_allocation_container_items fk_waci_container_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_allocation_container_items
+    ADD CONSTRAINT fk_waci_container_type FOREIGN KEY (container_type_id) REFERENCES freight.container_types(id);
+
+
+--
+-- Name: wagon_booking_allocations fk_wagon_booking_allocations_booking; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_booking_allocations
+    ADD CONSTRAINT fk_wagon_booking_allocations_booking FOREIGN KEY (booking_id) REFERENCES freight.bookings(id);
+
+
+--
+-- Name: wagon_booking_allocations fk_wagon_booking_allocations_wagon; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_booking_allocations
+    ADD CONSTRAINT fk_wagon_booking_allocations_wagon FOREIGN KEY (train_set_wagon_id) REFERENCES freight.train_set_wagons(id) ON DELETE CASCADE;
+
+
+--
+-- Name: wagons fk_wagons_current_train_schedule; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagons
+    ADD CONSTRAINT fk_wagons_current_train_schedule FOREIGN KEY (current_train_schedule_id) REFERENCES freight.train_schedules(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagons fk_wagons_train_set_wagon; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagons
+    ADD CONSTRAINT fk_wagons_train_set_wagon FOREIGN KEY (train_set_wagon_id) REFERENCES freight.train_set_wagons(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_movements fk_wm_transfer_request; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_movements
+    ADD CONSTRAINT fk_wm_transfer_request FOREIGN KEY (transfer_request_id) REFERENCES freight.wagon_transfer_requests(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_transfer_requests fk_wtr_from_yard; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_transfer_requests
+    ADD CONSTRAINT fk_wtr_from_yard FOREIGN KEY (from_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: wagon_transfer_requests fk_wtr_to_yard; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_transfer_requests
+    ADD CONSTRAINT fk_wtr_to_yard FOREIGN KEY (to_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: wagon_transfer_requests fk_wtr_wagon_type; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_transfer_requests
+    ADD CONSTRAINT fk_wtr_wagon_type FOREIGN KEY (wagon_type_id) REFERENCES freight.wagon_types(id);
+
+
+--
+-- Name: gps_devices gps_devices_vehicle_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.gps_devices
+    ADD CONSTRAINT gps_devices_vehicle_id_fkey FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id);
+
+
+--
+-- Name: last_mile_vehicle_assignments last_mile_vehicle_assignments_last_mile_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_vehicle_assignments
+    ADD CONSTRAINT last_mile_vehicle_assignments_last_mile_id_fkey FOREIGN KEY (last_mile_id) REFERENCES freight.last_mile(id) ON DELETE CASCADE;
+
+
+--
+-- Name: last_mile_vehicle_assignments last_mile_vehicle_assignments_vehicle_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_vehicle_assignments
+    ADD CONSTRAINT last_mile_vehicle_assignments_vehicle_id_fkey FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id);
+
+
+--
+-- Name: last_mile_vehicle_containers last_mile_vehicle_containers_assignment_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.last_mile_vehicle_containers
+    ADD CONSTRAINT last_mile_vehicle_containers_assignment_id_fkey FOREIGN KEY (assignment_id) REFERENCES freight.last_mile_vehicle_assignments(id) ON DELETE CASCADE;
+
+
+--
+-- Name: maintenance_intervals maintenance_intervals_vehicle_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.maintenance_intervals
+    ADD CONSTRAINT maintenance_intervals_vehicle_id_fkey FOREIGN KEY (vehicle_id) REFERENCES freight.vehicles(id) ON DELETE CASCADE;
+
+
+--
+-- Name: priority_rule_change_requests priority_rule_change_requests_priority_config_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.priority_rule_change_requests
+    ADD CONSTRAINT priority_rule_change_requests_priority_config_id_fkey FOREIGN KEY (priority_config_id) REFERENCES freight.priority_configs(id);
+
+
+--
+-- Name: rate_change_requests rate_change_requests_rate_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.rate_change_requests
+    ADD CONSTRAINT rate_change_requests_rate_id_fkey FOREIGN KEY (rate_id) REFERENCES freight.rates(id);
+
+
+--
+-- Name: route_milestones route_milestones_route_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.route_milestones
+    ADD CONSTRAINT route_milestones_route_id_fkey FOREIGN KEY (route_id) REFERENCES freight.routes(id) ON DELETE CASCADE;
+
+
+--
+-- Name: route_milestones route_milestones_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.route_milestones
+    ADD CONSTRAINT route_milestones_yard_id_fkey FOREIGN KEY (yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: routes routes_destination_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.routes
+    ADD CONSTRAINT routes_destination_yard_id_fkey FOREIGN KEY (destination_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: routes routes_origin_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.routes
+    ADD CONSTRAINT routes_origin_yard_id_fkey FOREIGN KEY (origin_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: support_document_versions support_document_versions_document_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.support_document_versions
+    ADD CONSTRAINT support_document_versions_document_id_fkey FOREIGN KEY (document_id) REFERENCES freight.support_documents(id) ON DELETE CASCADE;
+
+
+--
+-- Name: train_checkpoint_events train_checkpoint_events_train_schedule_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_checkpoint_events
+    ADD CONSTRAINT train_checkpoint_events_train_schedule_id_fkey FOREIGN KEY (train_schedule_id) REFERENCES freight.train_schedules(id) ON DELETE CASCADE;
+
+
+--
+-- Name: train_set_wagons train_set_wagons_alight_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_wagons
+    ADD CONSTRAINT train_set_wagons_alight_yard_id_fkey FOREIGN KEY (alight_yard_id) REFERENCES freight.yards(id) ON DELETE SET NULL;
+
+
+--
+-- Name: train_set_wagons train_set_wagons_board_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.train_set_wagons
+    ADD CONSTRAINT train_set_wagons_board_yard_id_fkey FOREIGN KEY (board_yard_id) REFERENCES freight.yards(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_movements wagon_movements_booking_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_movements
+    ADD CONSTRAINT wagon_movements_booking_id_fkey FOREIGN KEY (booking_id) REFERENCES freight.bookings(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_movements wagon_movements_from_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_movements
+    ADD CONSTRAINT wagon_movements_from_yard_id_fkey FOREIGN KEY (from_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: wagon_movements wagon_movements_to_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_movements
+    ADD CONSTRAINT wagon_movements_to_yard_id_fkey FOREIGN KEY (to_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: wagon_movements wagon_movements_train_schedule_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_movements
+    ADD CONSTRAINT wagon_movements_train_schedule_id_fkey FOREIGN KEY (train_schedule_id) REFERENCES freight.train_schedules(id) ON DELETE SET NULL;
+
+
+--
+-- Name: wagon_movements wagon_movements_wagon_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_movements
+    ADD CONSTRAINT wagon_movements_wagon_id_fkey FOREIGN KEY (wagon_id) REFERENCES freight.wagons(id) ON DELETE CASCADE;
+
+
+--
+-- Name: wagon_status_logs wagon_status_logs_wagon_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.wagon_status_logs
+    ADD CONSTRAINT wagon_status_logs_wagon_id_fkey FOREIGN KEY (wagon_id) REFERENCES freight.wagons(id);
+
+
+--
+-- Name: warehouse_inventory_movement warehouse_inventory_movement_inventory_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_inventory_movement
+    ADD CONSTRAINT warehouse_inventory_movement_inventory_id_fkey FOREIGN KEY (inventory_id) REFERENCES freight.warehouse_inventory(id) ON DELETE CASCADE;
+
+
+--
+-- Name: warehouse_inventory warehouse_inventory_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_inventory
+    ADD CONSTRAINT warehouse_inventory_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES freight.warehouses(id);
+
+
+--
+-- Name: warehouse_inventory warehouse_inventory_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_inventory
+    ADD CONSTRAINT warehouse_inventory_yard_id_fkey FOREIGN KEY (yard_id) REFERENCES freight.warehouse_yards(id);
+
+
+--
+-- Name: warehouse_inventory warehouse_inventory_zone_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_inventory
+    ADD CONSTRAINT warehouse_inventory_zone_id_fkey FOREIGN KEY (zone_id) REFERENCES freight.warehouse_zones(id);
+
+
+--
+-- Name: warehouse_loadings warehouse_loadings_warehouse_inventory_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_loadings
+    ADD CONSTRAINT warehouse_loadings_warehouse_inventory_id_fkey FOREIGN KEY (warehouse_inventory_id) REFERENCES freight.warehouse_inventory(id) ON DELETE CASCADE;
+
+
+--
+-- Name: warehouse_yard_cargo_types warehouse_yard_cargo_types_cargo_type_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_yard_cargo_types
+    ADD CONSTRAINT warehouse_yard_cargo_types_cargo_type_id_fkey FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id) ON DELETE CASCADE;
+
+
+--
+-- Name: warehouse_yard_cargo_types warehouse_yard_cargo_types_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_yard_cargo_types
+    ADD CONSTRAINT warehouse_yard_cargo_types_yard_id_fkey FOREIGN KEY (yard_id) REFERENCES freight.warehouse_yards(id) ON DELETE CASCADE;
+
+
+--
+-- Name: warehouse_yards warehouse_yards_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_yards
+    ADD CONSTRAINT warehouse_yards_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES freight.warehouses(id) ON DELETE CASCADE;
+
+
+--
+-- Name: warehouse_zones warehouse_zones_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.warehouse_zones
+    ADD CONSTRAINT warehouse_zones_yard_id_fkey FOREIGN KEY (yard_id) REFERENCES freight.warehouse_yards(id) ON DELETE CASCADE;
+
+
+--
+-- Name: yard_distances yard_distances_from_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_distances
+    ADD CONSTRAINT yard_distances_from_yard_id_fkey FOREIGN KEY (from_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: yard_distances yard_distances_to_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_distances
+    ADD CONSTRAINT yard_distances_to_yard_id_fkey FOREIGN KEY (to_yard_id) REFERENCES freight.yards(id);
+
+
+--
+-- Name: yard_facilities yard_facilities_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_facilities
+    ADD CONSTRAINT yard_facilities_yard_id_fkey FOREIGN KEY (yard_id) REFERENCES freight.yards(id) ON DELETE CASCADE;
+
+
+--
+-- Name: yard_locations yard_locations_yard_id_fkey; Type: FK CONSTRAINT; Schema: freight; Owner: -
+--
+
+ALTER TABLE ONLY freight.yard_locations
+    ADD CONSTRAINT yard_locations_yard_id_fkey FOREIGN KEY (yard_id) REFERENCES freight.yards(id) ON DELETE CASCADE;
+
+
+--
+-- PostgreSQL database dump complete
+--
+
+
diff --git a/freight-backup-20260809.dump b/freight-backup-20260809.dump
new file mode 100644
index 000000000..41e7a4870
Binary files /dev/null and b/freight-backup-20260809.dump differ
diff --git a/freight-backup-preswap-20260809.dump b/freight-backup-preswap-20260809.dump
new file mode 100644
index 000000000..435dbbb11
Binary files /dev/null and b/freight-backup-preswap-20260809.dump differ
diff --git a/integration/src/cbe-bill.it.ts b/integration/src/cbe-bill.it.ts
index 974d00b07..0d1fc7e0e 100644
--- a/integration/src/cbe-bill.it.ts
+++ b/integration/src/cbe-bill.it.ts
@@ -122,15 +122,17 @@ describe("CBE Unified Bill (payment service as biller)", () => {
       End_To_End_Txn_Id: txnId("q404"),
       Bill_Id: "000000000000",
     });
-    // Business failures are HTTP 200 + Response_Code "3" — CBE treats a non-200
+    // Business failures are HTTP 200 + Response_Code "2" — CBE treats a non-200
     // as a channel fault and retries.
     expect(res.status).toBe(200);
-    expect(res.body.Response_Code).toBe("3");
+    expect(res.body.Response_Code).toBe("2");
   });
 
+  let settleBody: Record<string, string>;
+
   it("settles the freight invoice when CBE reports the debit", async () => {
     const invoice = await currentInvoice(invoiceId);
-    const res = await cbe(token, "/cbe/payment", {
+    settleBody = {
       Destination_Api_Name: API_NAME,
       End_To_End_Txn_Id: txnId("p1"),
       Cbe_Txn_Ref: `CBE${Date.now()}`,
@@ -140,7 +142,8 @@ describe("CBE Unified Bill (payment service as biller)", () => {
       Currency: "ETB",
       Full_Name: "IT Payer",
       Phone_No: "+251911000001",
-    });
+    };
+    const res = await cbe(token, "/cbe/payment", settleBody);
     expect(res.status).toBe(200);
     expect(res.body.Response_Code).toBe("0");
 
@@ -154,6 +157,24 @@ describe("CBE Unified Bill (payment service as biller)", () => {
     expect(paid.status).toBe("PAID");
   });
 
+  it("answers 'Already paid' when the settled attempt is sent again verbatim", async () => {
+    const res = await cbe(token, "/cbe/payment", settleBody);
+    expect(res.status).toBe(200);
+    expect(res.body.Status).toBe("FAILED");
+    expect(res.body.Response_Code).toBe("2");
+    expect(res.body.Response_Description).toBe("Already paid");
+  });
+
+  it("answers 'Already paid' when the settled End_To_End_Txn_Id is reused with a different amount", async () => {
+    const res = await cbe(token, "/cbe/payment", {
+      ...settleBody,
+      Amount: "1.00",
+    });
+    expect(res.status).toBe(200);
+    expect(res.body.Response_Code).toBe("2");
+    expect(res.body.Response_Description).toBe("Already paid");
+  });
+
   it("rejects a second debit on the same bill", async () => {
     const res = await cbe(token, "/cbe/payment", {
       Destination_Api_Name: API_NAME,
@@ -165,7 +186,7 @@ describe("CBE Unified Bill (payment service as biller)", () => {
       Currency: "ETB",
     });
     expect(res.status).toBe(200);
-    expect(res.body.Response_Code).toBe("3");
+    expect(res.body.Response_Code).toBe("2");
   });
 
   it("reports an already-paid bill on a later query", async () => {
@@ -175,6 +196,6 @@ describe("CBE Unified Bill (payment service as biller)", () => {
       Bill_Id: billId,
     });
     expect(res.status).toBe(200);
-    expect(res.body.Response_Code).toBe("3");
+    expect(res.body.Response_Code).toBe("2");
   });
 });
diff --git a/migrations-restore-299-rows.sql b/migrations-restore-299-rows.sql
new file mode 100644
index 000000000..5993e265e
--- /dev/null
+++ b/migrations-restore-299-rows.sql
@@ -0,0 +1,301 @@
+-- restore deleted pre-baseline migration rows
+INSERT INTO freight.migrations (timestamp, name) VALUES
+(1748427600000, 'AddServiceTypesAndCargoTypes1748427600000'),
+(1748514000000, 'AddRuleEngineTablesAndCodes1748514000000'),
+(1748550000000, 'CreateFreightLegacyBaseline1748550000000'),
+(1748600000000, 'ItmlsFullSchemaRewrite1748600000000'),
+(1748700000000, 'AddBookingsConfigForeignKeys1748700000000'),
+(1748800000000, 'AddBookingsRemainingForeignKeys1748800000000'),
+(1748900000000, 'MoveCustomersToFreightSchema1748900000000'),
+(1749000000000, 'NormalizeWeightLimitTradeDirectionBoth1749000000000'),
+(1749100000000, 'CreateFreightFilesTable1749100000000'),
+(1749200000000, 'CreateCompaniesModule1749200000000'),
+(1749200000000, 'BookingFlowRefactor1749200000000'),
+(1749300000000, 'AddFanNumberToCompanies1749300000000'),
+(1749300000000, 'AddBookingFreightType1749300000000'),
+(1749400000000, 'AddTrainScheduling1749400000000'),
+(1749400000000, 'AddContractSignatures1749400000000'),
+(1749500000000, 'AddCompanyIdToBookings1749500000000'),
+(1749600000000, 'AddBlocksRoleToApprovalStep1749600000000'),
+(1749700000000, 'SeedDefaultApprovalRules1749700000000'),
+(1749800000000, 'AddShippingLinesCodeUniqueIndex1749800000000'),
+(1749900000000, 'CreateFileUploadSettingsTables1749900000000'),
+(1750000000000, 'CreateFacilitiesTable1750000000000'),
+(1750000000000, 'AddTrainExtendedColumns1750000000000'),
+(1750000000000, 'AddCompanyContactColumns1750000000000'),
+(1750000000001, 'AddFacilityIdToWarehouses1750000000001'),
+(1750000000002, 'AddProofOfDeliveryToCargoes1750000000002'),
+(1750000000003, 'AddWarehouseInspection1750000000003'),
+(1750100000000, 'CreateFleetCrudTables1750100000000'),
+(1750100000000, 'AddRoutesAndExtendLocomotives1750100000000'),
+(1750200000000, 'SeedDefaultWagonTypes1750200000000'),
+(1750200000000, 'AddPhysicalWagonToTrainSetWagons1750200000000'),
+(1750300000000, 'AddRouteToTrainSchedules1750300000000'),
+(1750300000000, 'AddCurrentLocationToWagons1750300000000'),
+(1750400000000, 'SeedEdRWagonFleet1750400000000'),
+(1750400000000, 'AddSchedulingAllocationEnhancements1750400000000'),
+(1750500000000, 'AddWagonReadiness1750500000000'),
+(1750600000000, 'AddGovernmentBookingFields1750600000000'),
+(1750700000000, 'CreateSchedulingEvents1750700000000'),
+(1750800000000, 'FixContainerWagonsPerUnit1750800000000'),
+(1750900000000, 'AddContainerNumberToBookingContainer1750900000000'),
+(1751000000000, 'CreateTrainSchedulingGlobalRules1751000000000'),
+(1751000000001, 'AddDeletedAtToTrainSchedulingGlobalRules1751000000001'),
+(1752000000000, 'CreateCompanyProfiles1752000000000'),
+(1752000000001, 'MoveBusinessLicenseToProfile1752000000001'),
+(1770000000000, 'CreateVehiclesTable1770000000000'),
+(1775000000000, 'CreateDriversTable1775000000000'),
+(1780639311366, 'CreatePaymentTable1780639311366'),
+(1780639978834, 'AlterClientActionToJsonb1780639978834'),
+(1780644945086, 'UpdatePaymentTimestamp1780644945086'),
+(1781000000000, 'AddLocomotiveReadiness1781000000000'),
+(1781000000001, 'CreateTrainCheckpointEvents1781000000001'),
+(1781000000002, 'AddBatchBookingFields1781000000002'),
+(1781000000003, 'AddSelectedForBatchStatus1781000000003'),
+(1781000000004, 'AddDomesticWeightLimitTradeDirection1781000000004'),
+(1781000000005, 'CreateTrainCompositionRemovalLog1781000000005'),
+(1782000000000, 'WagonLocomotiveYardLink1782000000000'),
+(1782000000001, 'AddPaymentWebhookEventAndRefund1782000000001'),
+(1782000000002, 'ExtendPaymentMethodEnum1782000000002'),
+(1783000000000, 'ReplacePriorityRulesWithPriorityConfigs1783000000000'),
+(1784000000000, 'CreateSavedSignatures1784000000000'),
+(1784000000001, 'SeedWagonsWithYardAssignment1784000000001'),
+(1784100000000, 'AddBookingRouteDayIndex1784100000000'),
+(1790000000000, 'CreateWarehouseModule1790000000000'),
+(1790000000001, 'WarehouseBatch21790000000001'),
+(1790000000002, 'WarehouseBatch31790000000002'),
+(1791000000000, 'AddWarehouseAllocationAndFeeRules1791000000000'),
+(1791000000000, 'AddActiveModeAndOnboardingToExternalProfiles1791000000000'),
+(1791000000001, 'AddWarehouseFeeInvoices1791000000001'),
+(1791000000001, 'AddCompanyProfileIdToBookings1791000000001'),
+(1791000000002, 'AddNationalityToCompanies1791000000002'),
+(1791000000002, 'AddImportPickupDeliveryColumns1791000000002'),
+(1791000000003, 'AddInventoryUnloadedAt1791000000003'),
+(1791000000003, 'AddETradeFieldsToCompanies1791000000003'),
+(1791000000003, 'AddBusinessLicenseFilesToCompanyProfiles1791000000003'),
+(1791000000004, 'AddFacilityIdToWarehousesFix1791000000004'),
+(1791000000005, 'AddWarehouseInventoryInspectionStatusFix1791000000005'),
+(1791999999999, 'CreateDropdownSettings1791999999999'),
+(1792000000000, 'AddUnitOfMeasureToCargoTypes1792000000000'),
+(1792000000001, 'AddBookingTypeAndContractFields1792000000001'),
+(1792000000002, 'CreateBookingOrders1792000000002'),
+(1792000000003, 'SeedGeneralContractPeriod1792000000003'),
+(1792000000004, 'SeedContractValidityPeriods1792000000004'),
+(1800000000001, 'AddVehicleDriverAssignment1800000000001'),
+(1810000000000, 'CreateFirstMile1810000000000'),
+(1810000000001, 'CreateLastMile1810000000001'),
+(1810000000002, 'MakeCompanyProfileReferenceNullable1810000000002'),
+(1810000000002, 'CreateLastMileContainerAllocations1810000000002'),
+(1810000000002, 'AddVehicleCodeAndPlates1810000000002'),
+(1810000000003, 'CreateOtpVerifications1810000000003'),
+(1810000000004, 'AddPostPaymentCompletedColumn1810000000004'),
+(1820000000000, 'DropAllowConsolidation1820000000000'),
+(1820000000001, 'CreateContractRouteLines1820000000001'),
+(1820000000002, 'CreateBookingDocumentReview1820000000002'),
+(1820000000003, 'AddPriceAdjustment1820000000003'),
+(1820000000004, 'FoldSurchargeTypesIntoRates1820000000004'),
+(1820000000005, 'AddContractValidityWindow1820000000005'),
+(1820000000006, 'AddCustomsAgentAndMileCoordinates1820000000006'),
+(1820000000010, 'AddGeneralContractOrderFields1820000000010'),
+(1820000000011, 'DropEmailPhoneFromExternalProfiles1820000000011'),
+(1820000000011, 'AddTrainSetLocomotives1820000000011'),
+(1820000000012, 'AddEstimatedShipmentDate1820000000012'),
+(1821000000000, 'CreateInterchangeDocuments1821000000000'),
+(1821000000001, 'EnsureWarehouseInventoryInspectionStatus1821000000001'),
+(1821000000002, 'CreateInvoices1821000000002'),
+(1821000000002, 'AddDistanceColumnsToVehicles1821000000002'),
+(1821000000003, 'AddCompanyKindAndGovBookingLinks1821000000003'),
+(1821000000004, 'MakePaymentsTypeGeneric1821000000004'),
+(1822000000000, 'CreateImportDjiboutiOperations1822000000000'),
+(1822000000000, 'CreateContracts1822000000000'),
+(1823000000000, 'CreateImportOperationsTables1823000000000'),
+(1823000000000, 'BackfillContractsFromBookings1823000000000'),
+(1824000000000, 'DropLegacyContractTables1824000000000'),
+(1825000000000, 'CreateBookingContainerAllocations1825000000000'),
+(1825000000000, 'AddGlOperations1825000000000'),
+(1826000000000, 'AddCargoScopeQuantityCap1826000000000'),
+(1827000000000, 'CreateBookingRequests1827000000000'),
+(1828000000000, 'ExtendInvoicesForPartialPayment1828000000000'),
+(1828000000000, 'AddGrnNumberToWarehouseInventory1828000000000'),
+(1828000000000, 'AddBulkHazmatReeferQuantity1828000000000'),
+(1829000000000, 'PhasedClearanceCycleMeta1829000000000'),
+(1829000000000, 'CentralizeWarehouseInvoices1829000000000'),
+(1829000000001, 'SeedRoVesselMinDays1829000000001'),
+(1829000000002, 'BookingClearanceMeta1829000000002'),
+(1830000000000, 'DropCargoTypeShowFreeTextBox1830000000000'),
+(1830000000000, 'CreateFirstMileContainerAllocations1830000000000'),
+(1830000000000, 'AddExpiredInvoiceStatus1830000000000'),
+(1830000000001, 'RouteStatusAndSegmentKm1830000000001'),
+(1830000000002, 'PreClearanceFinalizedAt1830000000002'),
+(1831000000000, 'AddWarehouseFeeRuleTiers1831000000000'),
+(1832000000000, 'AddCustomerTruckAssignmentToBookings1832000000000'),
+(1840000000000, 'CreateFuelTables1840000000000'),
+(1850000000000, 'CreateMaintenanceTables1850000000000'),
+(1860000000000, 'AddPaidToFirstAndLastMile1860000000000'),
+(1861000000000, 'AddBookingWindowGlobalRules1861000000000'),
+(1861000000001, 'ReleaseStuckAssignedLocomotives1861000000001'),
+(1862000000000, 'AddScheduleWindowPhases1862000000000'),
+(1863000000000, 'CreateBookingBatchOffers1863000000000'),
+(1870000000000, 'RepairSynchronizeDrift1870000000000'),
+(1870000000000, 'AddLocationToVehicles1870000000000'),
+(1880000000000, 'AddVehicleStatuses1880000000000'),
+(1890000000000, 'SeparateVehicleAvailability1890000000000'),
+(1890000000001, 'AddVehicleCodeAndPlates1890000000001'),
+(1890000000002, 'AddFaydaVerificationSessions1890000000002'),
+(1890000000003, 'AddDriverFaydaVerification1890000000003'),
+(1890000000004, 'AddLastMileVehicleAssignments1890000000004'),
+(1890000000005, 'AddDriverGender1890000000005'),
+(1890000000006, 'AddDriverFaydaSubUnique1890000000006'),
+(1890000000007, 'DriverUniquePartialSoftDelete1890000000007'),
+(1890000000008, 'AddFleetEvents1890000000008'),
+(1890000000009, 'AddLastMileAssignmentContainerNumber1890000000009'),
+(1890000000010, 'AddLastMileAssignmentDistance1890000000010'),
+(1900000000000, 'SimplifyRatesAndWeightLimitRules1900000000000'),
+(1900000000000, 'AddLoadingStatusToTrainScheduleBookings1900000000000'),
+(1900000000000, 'AddEmailToOtpVerifications1900000000000'),
+(1910000000000, 'WidenWindowDurationHoursPrecision1910000000000'),
+(1920000000000, 'AddScheduleWindowRuleSnapshot1920000000000'),
+(1930000000000, 'AddMaxCapacityToWeightLimitRules1930000000000'),
+(1940000000000, 'AddWagonTypeFkToCargoAndContainerTypes1940000000000'),
+(1940000000000, 'AddFirstMileVehicleAssignments1940000000000'),
+(1950000000000, 'CreateNotifications1950000000000'),
+(1950000000000, 'AddWindowCloseHour1950000000000'),
+(1950000000000, 'AddVehicleCompliance1950000000000'),
+(1950000000000, 'AddCustomerTruckAssignments1950000000000'),
+(1960000000000, 'AddIncidents1960000000000'),
+(1960000000000, 'AddContainerReceiptToBookingContainerUnits1960000000000'),
+(1970000000000, 'AddMaintenanceDepth1970000000000'),
+(1970000000000, 'AddCustomerTruckDeparture1970000000000'),
+(1980000000000, 'YardCountryEnumAndRouteDirection1980000000000'),
+(1980000000000, 'AddProcurement1980000000000'),
+(1980000000000, 'AddBookingHandovers1980000000000'),
+(1990000000000, 'SegmentCorridorBookings1990000000000'),
+(1990000000000, 'AddVehiclePricePerKm1990000000000'),
+(1990000000000, 'AddDoubleHandlingBasisAndMachinery1990000000000'),
+(2000000000000, 'CreateCompanyChangeRequest2000000000000'),
+(2000000000000, 'AddTruckDetentionTiming2000000000000'),
+(2000000000000, 'AddGpsTracking2000000000000'),
+(2000000000000, 'AddCustomsPriorityConfig2000000000000'),
+(2000000000001, 'AddCompanyProfileReview2000000000001'),
+(2010000000000, 'AddFeeRuleVehicleType2010000000000'),
+(2010000000000, 'AddConsolidationResumeStatus2010000000000'),
+(2020000000000, 'WarehouseCapacityKgToTons2020000000000'),
+(2020000000000, 'RepairOtpEmailSchema2020000000000'),
+(2030000000000, 'AddTrainScheduleReference2030000000000'),
+(2040000000000, 'MigrateLicenseFilesToFileRecords2040000000000'),
+(2040000000000, 'AddLocomotiveOverageTolerance2040000000000'),
+(2050000000000, 'DropWagonTypeMaxWagonsPerTrain2050000000000'),
+(2050000000000, 'AddCustomerTruckContainerLoadedAt2050000000000'),
+(2060000000000, 'SeedRailWagonTypes2060000000000'),
+(2060000000000, 'CreateYardDistances2060000000000'),
+(2070000000000, 'MakeWagonTypeTareWeightRequired2070000000000'),
+(2080000000000, 'DropWagonSpecColumns2080000000000'),
+(2090000000000, 'RepairGrnNumberColumn2090000000000'),
+(2090000000000, 'CreateContractTemplates2090000000000'),
+(2100000000000, 'WarehouseLoadingTrainAssociation2100000000000'),
+(2100000000000, 'CompanyProfileDefaultPending2100000000000'),
+(2110000000000, 'RepairVehicleAvailabilityColumn2110000000000'),
+(2110000000000, 'AddBookingIsSplit2110000000000'),
+(2120000000000, 'AddScheduleWagonAllocationSnapshot2120000000000'),
+(2120000000000, 'AddLastMileProofOfDelivery2120000000000'),
+(2130000000000, 'AddHandoverSignerName2130000000000'),
+(2140000000000, 'CreateAccrualAcks2140000000000'),
+(2150000000000, 'TrainBuilder2150000000000'),
+(2160000000000, 'MultiWagonTypePerCargoAndContainer2160000000000'),
+(2170000000000, 'ScheduleWagonAdjustmentLogs2170000000000'),
+(2170000000000, 'CreateWagonTransferRequests2170000000000'),
+(2180000000000, 'LinkWagonMovementToTransferRequest2180000000000'),
+(2190000000000, 'DropReopenDelayMinutes2190000000000'),
+(2200000000000, 'TrainNumberPair2200000000000'),
+(2210000000000, 'ScheduleScopedWagonPins2210000000000'),
+(2220000000000, 'AddContractDocumentSnapshot2220000000000'),
+(2230000000000, 'RenameWagonStatusRetiredToDetained2230000000000'),
+(2240000000000, 'AddTransferRequestReason2240000000000'),
+(2250000000000, 'CreatePriorityRuleChangeRequests2250000000000'),
+(2260000000000, 'SeedEdrWagonFleetErNumbering2260000000000'),
+(2260000000000, 'AddLastMileTruckArrivalDeparture2260000000000'),
+(2260000000000, 'AddClearanceFeePayment2260000000000'),
+(2270000000000, 'AddWagonTrainNumbers2270000000000'),
+(2270000000000, 'AddContainerReturnQuantity2270000000000'),
+(2280000000000, 'WagonNumberPartialUnique2280000000000'),
+(2280000000000, 'SeedWagonRunNumbers2280000000000'),
+(2290000000000, 'YardFacilities2290000000000'),
+(2290000000000, 'SeedWagonYardDoraleh2290000000000'),
+(2290000000000, 'DropContainerWagonsPerUnit2290000000000'),
+(2300000000000, 'RepairGpsTrackingTables2300000000000'),
+(2300000000000, 'CreateRateChangeRequests2300000000000'),
+(2310000000000, 'CreateSupportChat2310000000000'),
+(2320000000000, 'YardFacilityFreightTypes2320000000000'),
+(2320000000000, 'SupportChatAttachments2320000000000'),
+(2320000000000, 'AddRateYardScope2320000000000'),
+(2330000000000, 'AddBookingCloseOffset2330000000000'),
+(2340000000000, 'AddReverseWagonOrder2340000000000'),
+(2340000000000, 'AddCargoTypeHasLashing2340000000000'),
+(2350000000000, 'RefreshContractPricingArticles2350000000000'),
+(2360000000000, 'RefreshContractPricingArticles2360000000000'),
+(2370000000000, 'AddContainerUnitReturnFlag2370000000000'),
+(2380000000000, 'AddTrainDeactivatedStatus2380000000000'),
+(2390000000000, 'WidenYardCodeForSoftDeleteSuffix2390000000000'),
+(2390000000000, 'SeedImportTrainNumbers2390000000000'),
+(2400000000000, 'NormalizeCompanyRegions2400000000000'),
+(2400000000000, 'AddCustomerTruckExitWeights2400000000000'),
+(2410000000000, 'DropBookingApprovalWidenRoles2410000000000'),
+(2420000000000, 'CreateContractDocumentRevisions2420000000000'),
+(2430000000000, 'UniqueLocomotiveName2430000000000'),
+(2430000000000, 'AddFileReviewStatus2430000000000'),
+(2440000000000, 'AddHandoverEdrAssignment2440000000000'),
+(2450000000000, 'DropActiveProfileTypeFromExternalProfiles2450000000000'),
+(2460000000000, 'AddCacBankPaymentMethod2460000000000'),
+(2470000000000, 'AddAcquisitionItemName2470000000000'),
+(2480000000000, 'AddMaintenanceDueNotifiedAt2480000000000'),
+(2800000000000, 'AddMaintenanceIntervals2800000000000'),
+(2800000000001, 'AddSignatureToHandover2800000000001'),
+(2810000000000, 'AddMaintenanceServiceItem2810000000000'),
+(2820000000000, 'CustomsClearanceRouteScope2820000000000'),
+(2820000000000, 'AddMileTonsQuantity2820000000000'),
+(2830000000000, 'ReturnSurchargeRouteScope2830000000000'),
+(2840000000000, 'AddTruckTypes2840000000000'),
+(2850000000000, 'AddBookingDoubleHandling2850000000000'),
+(2860000000000, 'DropClearanceFeePrepay2860000000000'),
+(2860000000000, 'AddPerTruckDetentionWindow2860000000000'),
+(2870000000000, 'CustomsClearancePerKind2870000000000'),
+(2880000000000, 'LashingPerKind2880000000000'),
+(2890000000000, 'LashingBulkOnlyPerDirection2890000000000'),
+(2900000000000, 'LivestockPerItem2900000000000'),
+(2910000000000, 'AddContractSignatureStamp2910000000000'),
+(2920000000000, 'AddRevisionActorName2920000000000'),
+(2930000000000, 'AddWagonTransferPartialFulfilment2930000000000'),
+(2940000000000, 'AddFileVersionHistory2940000000000'),
+(2950000000000, 'AddTransitAssigneeHandshake2950000000000'),
+(2960000000000, 'AddContractHazardDeclaration2960000000000'),
+(2970000000000, 'AddDoCollectionDates2970000000000'),
+(2980000000000, 'AddBookingRequestCurrency2980000000000'),
+(2990000000000, 'IndodeYardsAndCargoRouting2990000000000'),
+(3000000000000, 'AddContractSuspension3000000000000'),
+(3010000000000, 'AddBookingTransitAssignee3010000000000'),
+(3020000000000, 'AddContractSubmittedAt3020000000000'),
+(3030000000000, 'AddGlExchangeDocumentFields3030000000000'),
+(3040000000000, 'AddTransitAgents3040000000000'),
+(3050000000000, 'AddCbeBillPaymentMethod3050000000000'),
+(3050000000000, 'MergeDuplicateSebetaYards3050000000000'),
+(3060000000000, 'AddExportPaymentWindow3060000000000'),
+(3070000000000, 'AddBulkTotalWeightTons3070000000000'),
+(3080000000000, 'BackfillDireDawaMilestone3080000000000'),
+(3090000000000, 'AddSavedSignatureStamp3090000000000'),
+(3100000000000, 'PromoteDraftSchedulesToScheduled3100000000000'),
+(3110000000000, 'AddYardToScheduleWagonAdjustmentLogs3110000000000'),
+(3120000000000, 'AddApprovedAtToCompanies3120000000000'),
+(3120000000000, 'AddCargoTypeItemsPerWagonMap3120000000000'),
+(3130000000000, 'CreateCompanyRevisions3130000000000'),
+(3140000000000, 'SyncBulkRateUnitsToCargoUom3140000000000'),
+(3150000000000, 'CreateUserTradeAccess3150000000000'),
+(3150000000000, 'FixFaydaAddressShape3150000000000'),
+(3160000000000, 'FixPaymentPaidAtType3160000000000'),
+(3170000000000, 'YardFacilityOriginDestination3170000000000'),
+(3180000000000, 'PortYardFacilityRecords3180000000000'),
+(3190000000000, 'AddCargoTypeTonsPerWagonMap3190000000000'),
+(3200000000000, 'AddScheduleWindowRuleCustom3200000000000'),
+(3210000000000, 'EmptyContainerReturnedBy3210000000000'),
+(3220000000000, 'EmptyContainerReturnStatusHistory3220000000000'),
+(3230000000000, 'SplitContractTemplatesByCustoms3230000000000'),
+(3240000000000, 'CreateExchangeSettings3240000000000');
diff --git a/migrations-rows-backup-20260809.dump b/migrations-rows-backup-20260809.dump
new file mode 100644
index 000000000..338cca6f7
Binary files /dev/null and b/migrations-rows-backup-20260809.dump differ
diff --git a/packages/types/src/freight/booking-window-ws.ts b/packages/types/src/freight/booking-window-ws.ts
index 3fd3c4d7b..be0dc9c13 100644
--- a/packages/types/src/freight/booking-window-ws.ts
+++ b/packages/types/src/freight/booking-window-ws.ts
@@ -29,6 +29,11 @@ export interface BookingWindowPhaseEvent {
   windowClosesAt: string | null;
   docReviewEndsAt: string | null;
   paymentPhaseEndsAt: string | null;
+  /**
+   * When the payment drain tail ends (paymentPhaseEndsAt + server drain
+   * minutes) — pending payments may still settle until then. Display only.
+   */
+  paymentDrainEndsAt: string | null;
   scheduledDepartureDate: string | null;
 }
 
diff --git a/packages/types/src/freight/index.ts b/packages/types/src/freight/index.ts
index 0eab2cfbb..7ff14721c 100644
--- a/packages/types/src/freight/index.ts
+++ b/packages/types/src/freight/index.ts
@@ -1,5 +1,9 @@
 import type { BaseEntity } from "../common";
-import { ClearanceNextAction, ContractDocPhase, IClearanceMilestone } from "./contracts";
+import {
+  ClearanceNextAction,
+  ContractDocPhase,
+  IClearanceMilestone,
+} from "./contracts";
 
 export * from "./dropdown_settings";
 export * from "./file_upload_settings";
@@ -11,6 +15,8 @@ export * from "./ethiopian-regions.catalog";
 export * from "./notifications";
 export * from "./booking-window-ws";
 export * from "./support-chat";
+export * from "./portal-content";
+export * from "./portal-content.defaults";
 
 export enum TradeDirection {
   IMPORT = "IMPORT",
@@ -181,7 +187,7 @@ export enum InvoiceSource {
   FirstMile = "firstmile",
   LastMile = "lastmile",
   /** Customs clearance service fee — billed on the booking invoice with the freight. */
-  Clearance = "clearance"
+  Clearance = "clearance",
 }
 
 export enum SchedulingStatus {
@@ -442,8 +448,6 @@ export interface ICustomer extends BaseEntity {
   email: string;
   phone: string;
   companyName: string;
-  companyEmail: string;
-  companyPhone: string;
   companyLocation: string;
   companyAddress: string;
   contactPersonName: string;
@@ -469,8 +473,6 @@ export interface CreateCustomerDto {
   email: string;
   phone: string;
   companyName: string;
-  companyEmail: string;
-  companyPhone: string;
   companyLocation: string;
   companyAddress: string;
   contactPersonName: string;
@@ -756,7 +758,10 @@ export interface IBooking extends BaseEntity {
    */
   isSplit?: boolean;
   /** What this booking carried before it was reduced by a split (bulk tons / units per size). */
-  preSplitQuantities?: { bulkTons?: number; bySize?: Record<string, number> } | null;
+  preSplitQuantities?: {
+    bulkTons?: number;
+    bySize?: Record<string, number>;
+  } | null;
 }
 
 export interface PricingBreakdownLineItem {
diff --git a/packages/types/src/freight/notifications.ts b/packages/types/src/freight/notifications.ts
index e3ca5b219..d51006c7f 100644
--- a/packages/types/src/freight/notifications.ts
+++ b/packages/types/src/freight/notifications.ts
@@ -90,13 +90,16 @@ export interface NotificationRecipients {
   companyProfileId?: string;
   /** Backoffice: all current employees of this organization. */
   organizationId?: string;
-  /** Backoffice: every current employee across all organizations. */
-  allBackoffice?: boolean;
   /**
    * Backoffice: current employees (any org) who hold ANY of these permission
-   * keys — e.g. notify only marketing, not every employee. Super/org admins
-   * are not implicitly included; add `allBackoffice`/explicit userIds too if
-   * admins should also see it.
+   * keys. Resolution mirrors the request-time guard `hasFreightPermission` —
+   * IAM role grants, direct position grants, position TYPE grants, delegated
+   * positions, and the `super_admin` bypass. `organization_admin` is NOT
+   * implicitly included (it only bypasses approval steps, not permission
+   * checks); grant it a key explicitly if it should be notified.
+   *
+   * Prefer the dedicated `<module>:get_notification` keys over reusing a domain
+   * key: they let ops tune who gets pinged without touching who has access.
    */
   permissionKeys?: string[];
 }
diff --git a/packages/types/src/freight/portal-content.defaults.ts b/packages/types/src/freight/portal-content.defaults.ts
new file mode 100644
index 000000000..bd3ffe204
--- /dev/null
+++ b/packages/types/src/freight/portal-content.defaults.ts
@@ -0,0 +1,364 @@
+import type { SupportDocPayloadMap } from "./portal-content";
+
+/**
+ * The copy the portal shipped with, transcribed from what used to be
+ * `edr-freight-web/portal/src/pages/support/content.ts` and the inline blocks
+ * of `HelpPage.tsx`.
+ *
+ * Two mechanical changes from the original:
+ *
+ * 1. `Section { body: string[]; bullets: string[] }` collapses to one markdown
+ *    string — paragraphs separated by a blank line, bullets as `- ` lines.
+ * 2. The support email/phone/office, previously string-interpolated into the
+ *    privacy and terms prose at build time, are now `{{supportEmail}}`-style
+ *    placeholders resolved against the CONTACT document at read time. That is
+ *    what stops the legal text keeping a stale phone number after an edit.
+ *
+ * It lives in the shared package because three consumers need the same bytes
+ * and any drift between them would only surface during an outage: the API
+ * seeds the database from it and serves it for any row still missing, and the
+ * portal renders it while the request is in flight or if the API is down.
+ * Once seeded, the database is authoritative and this is only a floor.
+ */
+export const SUPPORT_CONTENT_DEFAULTS: SupportDocPayloadMap = {
+  CONTACT: {
+    email: "support@edrfreight.com",
+    phone: "+251 11 000 0000",
+    office: "Addis Ababa, Ethiopia",
+    hours: "Monday – Saturday, 8:30 AM – 5:30 PM (EAT)",
+  },
+
+  HELP: {
+    title: "Help & Support",
+    subtitle:
+      "Get answers fast — watch the walkthrough, browse the common topics, check the FAQ, or reach our team directly.",
+    sections: [
+      {
+        id: "help-walkthrough",
+        heading: "Portal walkthrough",
+        // The video ships with the app rather than MinIO, so its path is used
+        // verbatim; the renderer picks <video> from the extension.
+        body: "A guided tour of the portal — registering your company, raising a booking against a contract, and settling an invoice.\n\n![](/assets/edr-portal-guide.webm)",
+      },
+      {
+        id: "help-chat",
+        heading: "Chat with our team",
+        body: "Signed-in customers can open a support conversation from the headset button at the bottom right of every portal page. You can send screenshots and documents in the chat, and replies appear there and as a notification.\n\n[Open the portal](/portal)",
+      },
+      {
+        id: "help-contact",
+        heading: "Contact us",
+        body: "- **Email** — [{{supportEmail}}](mailto:{{supportEmail}}). Best for document issues and anything needing an attachment.\n- **Phone** — [{{supportPhone}}](tel:{{supportPhoneTel}}). Best for urgent problems with cargo already in transit.\n- **Head office** — {{supportOffice}}. Walk-in support during working hours.\n- **Support hours** — {{supportHours}}. Outside these hours, email us and we reply the next working day.",
+      },
+      {
+        id: "help-topics",
+        heading: "Common topics",
+        body: "- **[Account & onboarding](/faq)** — registering your company, uploading your trade licence and TIN, and getting an operational profile approved.\n- **[Contracts](/faq)** — requesting a freight contract, reviewing its terms and signing it with your saved signature and stamp.\n- **[Bookings & tracking](/faq)** — raising a booking against a contract, adding last-mile transport and following the consignment along the corridor.\n- **[Invoices & payments](/faq)** — finding invoices, paying through the bank channels and confirming a payment that has not yet settled.",
+      },
+      {
+        id: "help-checklist",
+        heading: "What to include when you contact us",
+        body: "- Your company name and the email you sign in with.\n- The reference of the contract, booking or invoice involved.\n- What you expected to happen and what happened instead.\n- A screenshot of any error message the portal showed.",
+      },
+    ],
+  },
+
+  FAQ: {
+    title: "Frequently Asked Questions",
+    subtitle:
+      "Answers to the questions customers ask most about registering, booking cargo and settling invoices on EDR Freight.",
+    groups: [
+      {
+        id: "faq-getting-started",
+        title: "Getting started",
+        items: [
+          {
+            id: "faq-open-account",
+            question: "How do I open an account on EDR Freight?",
+            answer:
+              "Sign up with your work email and verify the one-time code we send you. After you set a password, the onboarding wizard collects your company details, trade licence, TIN certificate and the operational services you need (importer, exporter, freight forwarder or transporter). Submit the wizard and our team reviews the application.",
+          },
+          {
+            id: "faq-approval-time",
+            question: "How long does account approval take?",
+            answer:
+              "Most complete applications are reviewed within two working days. You will see the status on your dashboard, and we email you when a profile is approved or when a document needs to be re-uploaded.",
+          },
+          {
+            id: "faq-rejected",
+            question: "My profile was rejected. What now?",
+            answer:
+              "The rejection notice states the reason. Open Settings, correct the details or replace the document that was flagged, and re-apply — you do not need to create a new account.",
+          },
+          {
+            id: "faq-multiple-services",
+            question: "Can one company hold several operational services?",
+            answer:
+              "Yes. A company can hold importer, exporter, freight forwarder and transporter profiles at the same time. Each is approved separately, and the header lets you switch between the ones you hold.",
+          },
+        ],
+      },
+      {
+        id: "faq-contracts-bookings",
+        title: "Contracts and bookings",
+        items: [
+          {
+            id: "faq-contract-vs-booking",
+            question: "What is the difference between a contract and a booking?",
+            answer:
+              "A contract is the commercial agreement covering a cargo movement — route, commodity, volume and rates. A booking is a single shipment executed under that contract. You create the contract once, then raise bookings against it for each consignment.",
+          },
+          {
+            id: "faq-create-booking",
+            question: "How do I create a booking?",
+            answer:
+              "Open the contract from the Contracts list and choose New Booking. Provide the consignment details, containers or tonnage, and the last-mile requirement if you need one. Bookings can also be started from the Bookings page, which routes you through contract selection first.",
+          },
+          {
+            id: "faq-sign-contract",
+            question: "Why do I have to sign a contract before shipping?",
+            answer:
+              "The contract document is the binding agreement for the movement. You must scroll to the end, accept the terms, and sign it with your saved signature and stamp before EDR schedules any wagon against it.",
+          },
+          {
+            id: "faq-signature-setup",
+            question: "Where do I set up my signature and stamp?",
+            answer:
+              "Under Signature & Stamp in the portal. It is saved once and reused for every contract you sign, so you do not have to upload it per document.",
+          },
+          {
+            id: "faq-change-booking",
+            question: "Can I change a booking after submitting it?",
+            answer:
+              "You can edit a booking while it is still pending review. Once EDR has confirmed it and allocated capacity, changes go through our operations team — contact support with the booking reference.",
+          },
+          {
+            id: "faq-track-consignment",
+            question: "How do I track a consignment?",
+            answer:
+              "Open the booking and use the tracking panel, which shows the current milestone, the wagon or container assigned, and the timestamps recorded at each corridor point.",
+          },
+        ],
+      },
+      {
+        id: "faq-invoices-payments",
+        title: "Invoices and payments",
+        items: [
+          {
+            id: "faq-find-invoices",
+            question: "Where do I find my invoices?",
+            answer:
+              "The Invoices page lists every invoice raised against your company, with its status, due date and outstanding balance. Open any invoice to see its line items and download a PDF copy.",
+          },
+          {
+            id: "faq-payment-methods",
+            question: "Which payment methods are supported?",
+            answer:
+              "Payments are made through the integrated bank channels shown at checkout. After you complete the payment on the bank's page you are returned to the portal, and the invoice status updates once the bank confirms the transaction.",
+          },
+          {
+            id: "faq-payment-not-settled",
+            question:
+              "My payment was deducted but the invoice still shows unpaid.",
+            answer:
+              "Bank confirmations can lag by a few minutes. Use the Check Payment Status page linked from your receipt; if it still has not settled after an hour, email support with the invoice number and the bank reference and we will reconcile it.",
+          },
+          {
+            id: "faq-rounding",
+            question: "Why is my invoice amount rounded?",
+            answer:
+              "Some bank channels only accept whole-birr amounts, so invoices routed through them are rounded up to the nearest birr. The rounding is shown on the invoice detail page.",
+          },
+        ],
+      },
+      {
+        id: "faq-account-security",
+        title: "Account and security",
+        items: [
+          {
+            id: "faq-reset-password",
+            question: "How do I reset my password?",
+            answer:
+              "Use Forgot Password on the sign-in page. We email you a reset link that is valid for a limited time. If a member of our staff issued the link, it works the same way even if you are already signed in.",
+          },
+          {
+            id: "faq-add-colleagues",
+            question: "Can I add colleagues to my company account?",
+            answer:
+              "Yes. Company administrators can invite additional users from Settings. Each user signs in with their own credentials, and actions are recorded against the individual who performed them.",
+          },
+          {
+            id: "faq-update-company",
+            question: "How do I update company details after approval?",
+            answer:
+              "Edit them in Settings. Changes to regulated fields — trade licence, TIN, legal name — are re-verified by our team before they take effect.",
+          },
+        ],
+      },
+    ],
+    footer: {
+      heading: "Still need a hand?",
+      body: "Our team is on {{supportEmail}} and {{supportPhone}}, or you can start a chat from the support button inside the portal.",
+      ctaLabel: "Go to Help & Support",
+      ctaTo: "/help",
+    },
+  },
+
+  PRIVACY: {
+    title: "Privacy Policy",
+    subtitle:
+      "How EDR Freight collects, uses, shares and protects the information you provide when you use the platform.",
+    lastUpdated: "6 August 2026",
+    sections: [
+      {
+        id: "privacy-1",
+        heading: "1. Introduction",
+        body: 'The Ethio-Djibouti Standard Gauge Rail Share Company ("EDR", "we", "us") operates the EDR Freight platform, which lets customers register their business, agree freight contracts, raise bookings, track consignments and settle invoices online.\n\nThis policy explains what personal and business information we collect through the platform, why we collect it, how long we keep it and what rights you have over it. It applies to the EDR Freight customer portal and the services reached through it.',
+      },
+      {
+        id: "privacy-2",
+        heading: "2. Information we collect",
+        body: "We collect information you give us, information generated by your use of the platform, and information we receive from the regulators and financial institutions we work with.\n\n- Account details — name, work email address, phone number and the credentials used to sign in.\n- Company and compliance records — legal name, trade licence, TIN certificate, VAT registration, ownership and manager details, and the operational services you apply for.\n- Identity verification data — where you verify through a national identity service, the verification result and the attributes that service returns to us.\n- Operational data — contracts, bookings, consignment and cargo details, container and wagon assignments, tracking events and delivery confirmations.\n- Financial data — invoices, payment references, transaction status and settlement confirmations received from banks. We do not store your card numbers or online banking credentials.\n- Support data — the messages and files you send us through the in-app support chat or by email.\n- Technical data — IP address, device and browser information, and event logs generated when you use the platform.",
+      },
+      {
+        id: "privacy-3",
+        heading: "3. How we use your information",
+        body: "- To create and administer your account and verify that your company is entitled to the services it applies for.\n- To perform the freight contracts and bookings you place, including allocating capacity and coordinating rail and last-mile movements.\n- To issue invoices, process payments and keep the accounting records the law requires us to keep.\n- To provide customer support and respond to the questions and complaints you raise.\n- To keep the platform secure, detect misuse and investigate incidents.\n- To meet our legal, tax, customs and regulatory obligations in Ethiopia and Djibouti.\n- To improve the platform — measuring which features are used and where users encounter errors, using aggregated and pseudonymised data wherever that is sufficient.",
+      },
+      {
+        id: "privacy-4",
+        heading: "4. Legal basis for processing",
+        body: "We process your information because it is necessary to perform the contract between you and EDR, because we have a legal obligation to do so (customs, tax and transport regulation), or because we have a legitimate interest in operating and securing the platform. Where we rely on your consent — for example, optional marketing messages — you can withdraw it at any time.",
+      },
+      {
+        id: "privacy-5",
+        heading: "5. Sharing your information",
+        body: "We do not sell your information. We share it only where it is necessary to deliver the service or where the law requires it.\n\n- Government and regulatory bodies — customs, revenue and transport authorities in Ethiopia and Djibouti, to the extent required for the movement of your cargo.\n- Ports, terminals and last-mile transporters involved in executing your bookings.\n- Banks and payment providers, to initiate and reconcile the payments you make.\n- Technology suppliers who host and maintain the platform on our behalf, under contracts that restrict them to processing data on our instructions.\n- Courts, law enforcement and other authorities where we are legally compelled to disclose.",
+      },
+      {
+        id: "privacy-6",
+        heading: "6. International transfers",
+        body: "Cross-border freight inherently involves parties in more than one country, so consignment and clearance information is shared with counterparties and authorities in Djibouti as well as Ethiopia. Where we transfer information outside Ethiopia, we do so only as far as the movement requires or the law permits, and we require recipients to protect it to a comparable standard.",
+      },
+      {
+        id: "privacy-7",
+        heading: "7. Data retention",
+        body: "We keep account and company records for as long as your account is active. Contract, booking, customs and financial records are kept for the period required by Ethiopian commercial, tax and customs law after the relevant transaction, because we are obliged to be able to produce them. Support conversations and technical logs are kept for a shorter period, sufficient to resolve disputes and investigate security incidents.",
+      },
+      {
+        id: "privacy-8",
+        heading: "8. Security",
+        body: "Access to the platform requires authentication, and staff access to customer records is limited to what each role needs. Data is transmitted over encrypted connections and stored on systems protected by access controls and logging. No system is perfectly secure, so please keep your credentials confidential and tell us immediately if you believe your account has been compromised.",
+      },
+      {
+        id: "privacy-9",
+        heading: "9. Your rights",
+        body: "Subject to Ethiopian law, you may ask us to give you a copy of the personal information we hold about you, correct it if it is inaccurate, restrict or object to certain processing, or delete it where we are not required to keep it. Requests are handled through the contact details below; we may need to verify your identity before acting.",
+      },
+      {
+        id: "privacy-10",
+        heading: "10. Cookies and similar technologies",
+        body: "The platform uses cookies and browser storage to keep you signed in, remember your interface preferences and measure how the product is used so we can fix problems. Essential cookies cannot be turned off without breaking sign-in. You can clear or block the rest through your browser settings.",
+      },
+      {
+        id: "privacy-11",
+        heading: "11. Children",
+        body: "The platform is a business service and is not directed at children. We do not knowingly collect information from anyone under 18.",
+      },
+      {
+        id: "privacy-12",
+        heading: "12. Changes to this policy",
+        body: "We may update this policy as the platform and the law change. Material changes are announced in the portal before they take effect, and the date at the top of this page always reflects the current version.",
+      },
+      {
+        id: "privacy-13",
+        heading: "13. Contact us",
+        body: "Questions about this policy or about how we handle your information can be sent to {{supportEmail}}, called in on {{supportPhone}}, or addressed to our head office in {{supportOffice}}.",
+      },
+    ],
+  },
+
+  TERMS: {
+    title: "Terms of Service",
+    subtitle:
+      "The terms on which EDR provides the EDR Freight platform and the freight services you request through it.",
+    lastUpdated: "6 August 2026",
+    sections: [
+      {
+        id: "terms-1",
+        heading: "1. These terms",
+        body: 'These terms govern your use of the EDR Freight platform operated by the Ethio-Djibouti Standard Gauge Rail Share Company ("EDR"). By creating an account or using the platform, the company you represent agrees to them.\n\nThe platform is the channel through which you register, request and manage freight services. The commercial terms of each movement — routes, rates, volumes and payment terms — are set out in the freight contract you sign in the platform. Where a signed contract and these terms conflict, the signed contract governs that movement.',
+      },
+      {
+        id: "terms-2",
+        heading: "2. Eligibility and accounts",
+        body: "- The platform is for registered businesses. You confirm that you are authorised to act for the company you register and to bind it to these terms.\n- The information and documents you submit — trade licence, TIN, VAT registration, ownership details — must be accurate, current and genuine.\n- Accounts and operational profiles are activated only after EDR has reviewed and approved them, and approval may be refused or withdrawn.\n- You are responsible for keeping credentials confidential and for everything done under your account. Tell us at once if you suspect unauthorised use.",
+      },
+      {
+        id: "terms-3",
+        heading: "3. Contracts and bookings",
+        body: "- A freight contract takes effect when it is signed in the platform by you and countersigned by EDR.\n- A booking is a request for a specific movement under a contract. It becomes binding when EDR confirms it and allocates capacity — submission alone does not reserve a wagon or container.\n- You are responsible for the accuracy of consignment data: commodity description, weight, dimensions, container numbers, hazardous classification and consignee details.\n- Capacity is finite. EDR may decline, defer or reschedule a booking where capacity, safety, operating conditions or regulatory direction require it.",
+      },
+      {
+        id: "terms-4",
+        heading: "4. Cargo, documents and compliance",
+        body: "- You must obtain and provide every permit, customs declaration and clearance document the movement requires, and you warrant that the cargo may lawfully be carried.\n- Prohibited and restricted goods may not be tendered without EDR's prior written agreement and any licence the law requires.\n- Cargo must be packed, secured and, where applicable, labelled to the standard the mode of carriage requires. EDR may inspect, refuse or offload cargo that is misdeclared or unsafe.\n- You are liable for fines, demurrage, storage charges and losses arising from misdeclared cargo, missing documents or delays attributable to you.",
+      },
+      {
+        id: "terms-5",
+        heading: "5. Rates, invoicing and payment",
+        body: "- Charges are calculated from the rates in your contract, the tariffs published in the platform, and any accessorial services actually rendered.\n- Invoices are issued in the platform and are payable by the due date shown on them, through the payment channels the platform offers.\n- Payment is confirmed when the funds are confirmed by the bank, not when payment is initiated.\n- Overdue amounts may attract interest and may result in suspension of new bookings or of the account until the balance is cleared.\n- Taxes and statutory duties are your responsibility unless the contract expressly says otherwise.",
+      },
+      {
+        id: "terms-6",
+        heading: "6. Delivery, delay and liability",
+        body: "Transit times shown in the platform are estimates based on planned schedules. They are not guarantees, and EDR is not liable for indirect or consequential loss, loss of profit or loss of market arising from delay.\n\nEDR's liability for loss of or damage to cargo is limited to the extent set out in the applicable freight contract and in the transport law governing the carriage. Claims must be notified in writing within the period the contract specifies; late claims may be rejected.\n\nNeither party is liable for failure to perform caused by events beyond its reasonable control, including natural disasters, industrial action, civil unrest, infrastructure failure, or acts of government and regulatory authorities.",
+      },
+      {
+        id: "terms-7",
+        heading: "7. Acceptable use of the platform",
+        body: "- Use the platform only for its intended purpose and in accordance with applicable law.\n- Do not attempt to gain unauthorised access, probe or disrupt the service, or interfere with other customers' data.\n- Do not scrape, resell or redistribute platform content, rates or data without written permission.\n- Do not upload malware or content that infringes the rights of others.",
+      },
+      {
+        id: "terms-8",
+        heading: "8. Electronic signatures and records",
+        body: "You agree that contracts signed in the platform using your stored signature and stamp are validly executed, that the records the platform keeps of those signatures are admissible evidence of them, and that they carry the same effect as signatures on paper.",
+      },
+      {
+        id: "terms-9",
+        heading: "9. Availability and changes to the service",
+        body: "We aim to keep the platform available, but it may be interrupted for maintenance, upgrades or reasons outside our control. We may add, change or withdraw features. Where a change materially affects how you use the platform, we will give reasonable notice in the portal.",
+      },
+      {
+        id: "terms-10",
+        heading: "10. Suspension and termination",
+        body: "We may suspend or terminate access where these terms are breached, where documents prove to be false, where amounts remain unpaid, or where the law or a regulator requires it. You may stop using the platform at any time. Termination does not affect obligations already incurred — cargo in transit, invoices outstanding, or records we are required to retain.",
+      },
+      {
+        id: "terms-11",
+        heading: "11. Intellectual property",
+        body: "The platform, its software, design and content belong to EDR or its licensors. You are granted a non-exclusive, non-transferable right to use it for your own freight operations. Your commercial and consignment data remains yours; you grant us the right to process it as needed to deliver the service and as described in the Privacy Policy.",
+      },
+      {
+        id: "terms-12",
+        heading: "12. Confidentiality and data protection",
+        body: "Each party will keep the other's non-public commercial information confidential and use it only for the purposes of the services. Our handling of personal information is described in the Privacy Policy, which forms part of these terms.",
+      },
+      {
+        id: "terms-13",
+        heading: "13. Governing law and disputes",
+        body: "These terms are governed by the laws of the Federal Democratic Republic of Ethiopia. The parties will first attempt to resolve any dispute amicably; failing that, the dispute is subject to the jurisdiction of the competent courts of Ethiopia, without prejudice to any arbitration clause agreed in a specific freight contract.",
+      },
+      {
+        id: "terms-14",
+        heading: "14. Changes to these terms",
+        body: "We may update these terms as the service and the law change. Updates are published here and announced in the portal. Continuing to use the platform after an update takes effect means you accept the revised terms.",
+      },
+      {
+        id: "terms-15",
+        heading: "15. Contact",
+        body: "For questions about these terms, write to {{supportEmail}} or call {{supportPhone}}.",
+      },
+    ],
+  },
+};
diff --git a/packages/types/src/freight/portal-content.ts b/packages/types/src/freight/portal-content.ts
new file mode 100644
index 000000000..104236133
--- /dev/null
+++ b/packages/types/src/freight/portal-content.ts
@@ -0,0 +1,204 @@
+/**
+ * Customer-facing copy for the freight portal's public pages — /help, /faq,
+ * /terms and /privacy. Edited in the backoffice, served to the portal by one
+ * public endpoint, and versioned so a bad edit can be rolled back.
+ *
+ * Body copy is **markdown**. It is rendered with `react-markdown` and no
+ * `rehype-raw`, so raw HTML inside it is inert — the fields that actually need
+ * validating are the structured ones that land in `href`/`src` attributes.
+ */
+
+/** One editable document. Each is a row in `freight.support_documents`. */
+export const SUPPORT_DOC_SLUGS = [
+  "CONTACT",
+  "HELP",
+  "FAQ",
+  "PRIVACY",
+  "TERMS",
+] as const;
+
+export type SupportDocSlug = (typeof SUPPORT_DOC_SLUGS)[number];
+
+/** MinIO key prefix every uploaded help attachment is stored under. */
+export const SUPPORT_MEDIA_PREFIX = "support-content/";
+
+/**
+ * Marks a MinIO object reference inside markdown, e.g.
+ * `![Wagon](minio:support-content/abc.png)`.
+ *
+ * Stored copy always holds the *key*, never a signed URL: a presigned URL
+ * expires, so writing one into the saved markdown would silently rot every
+ * embedded image a few hours later. The API swaps these for freshly signed
+ * URLs on each read instead.
+ */
+export const PORTAL_MEDIA_URI_SCHEME = "minio:";
+
+/** 50 MB — walkthrough videos are the large case. */
+export const SUPPORT_MEDIA_MAX_BYTES = 50 * 1024 * 1024;
+
+export type PortalMediaKind = "image" | "video";
+
+/**
+ * Extensions the portal renders as a `<video>` rather than an `<img>`.
+ *
+ * Images and videos are both inserted with markdown's image syntax —
+ * `![caption](minio:support-content/clip.mp4)` — so an author drops media into
+ * the text in one flow and it stays where they put it. The renderer picks the
+ * element from the extension; nothing extra is stored.
+ */
+export const PORTAL_VIDEO_EXTENSIONS = [
+  ".mp4",
+  ".webm",
+  ".ogg",
+  ".ogv",
+  ".mov",
+  ".m4v",
+] as const;
+
+/** True when a media URL or key should render as a video. */
+export function isPortalVideoSrc(src: string): boolean {
+  const path = src.split(/[?#]/)[0].toLowerCase();
+  return PORTAL_VIDEO_EXTENSIONS.some((ext) => path.endsWith(ext));
+}
+
+/**
+ * Placeholders usable inside any markdown or link field. They are substituted
+ * against the CONTACT document when the portal reads the bundle, which is what
+ * keeps the support address in the privacy/terms prose from drifting out of
+ * sync with the contact cards.
+ *
+ * `supportPhoneTel` is the whitespace-stripped phone, for `tel:` hrefs.
+ */
+export const PORTAL_CONTENT_VARS = [
+  "supportEmail",
+  "supportPhone",
+  "supportPhoneTel",
+  "supportOffice",
+  "supportHours",
+] as const;
+
+export type PortalContentVar = (typeof PORTAL_CONTENT_VARS)[number];
+
+/** Slug `CONTACT`. The one place support contact details are edited. */
+export interface PortalSupportContact {
+  email: string;
+  phone: string;
+  office: string;
+  hours: string;
+}
+
+/** One numbered section of a legal document. `body` is markdown. */
+export interface PortalDocSection {
+  /** Stable per-section id — the React key, since headings can collide. */
+  id: string;
+  heading: string;
+  body: string;
+}
+
+/** Slugs `PRIVACY` and `TERMS` — same shape, separate documents. */
+export interface PortalLegalContent {
+  title: string;
+  subtitle: string;
+  /** Free text, e.g. "6 August 2026". Shown as "Last updated …". */
+  lastUpdated: string;
+  sections: PortalDocSection[];
+}
+
+export interface PortalFaqItem {
+  id: string;
+  question: string;
+  /** Markdown. */
+  answer: string;
+}
+
+export interface PortalFaqGroup {
+  id: string;
+  title: string;
+  items: PortalFaqItem[];
+}
+
+/** A call-to-action card closing a page. `body` is markdown. */
+export interface PortalCtaCard {
+  heading: string;
+  body: string;
+  ctaLabel: string;
+  /** In-app route (`/help`) or absolute URL. */
+  ctaTo: string;
+}
+
+/** Slug `FAQ`. */
+export interface PortalFaqContent {
+  title: string;
+  subtitle: string;
+  groups: PortalFaqGroup[];
+  /** The "Still need a hand?" card. Null hides it. */
+  footer: PortalCtaCard | null;
+}
+
+/**
+ * Slug `HELP`. Free-form: an ordered list of sections, each a heading plus a
+ * markdown body, with images and videos embedded in the body itself.
+ *
+ * Deliberately not a fixed set of typed blocks (video / channels / topics /
+ * checklist, as this once was). The help page is the one document whose shape
+ * genuinely changes with what support needs to explain that quarter, so it is
+ * built rather than filled in — and it shares {@link PortalDocSection} with the
+ * legal documents, so every tab is edited the same way.
+ */
+export interface PortalHelpContent {
+  title: string;
+  subtitle: string;
+  sections: PortalDocSection[];
+}
+
+/** Payload shape per slug — the jsonb column's type, keyed by document. */
+export interface SupportDocPayloadMap {
+  CONTACT: PortalSupportContact;
+  HELP: PortalHelpContent;
+  FAQ: PortalFaqContent;
+  PRIVACY: PortalLegalContent;
+  TERMS: PortalLegalContent;
+}
+
+export type SupportDocPayload = SupportDocPayloadMap[SupportDocSlug];
+
+/** What `GET /api/support-content` returns — everything the portal needs. */
+export interface PortalContentBundle {
+  contact: PortalSupportContact;
+  help: PortalHelpContent;
+  faq: PortalFaqContent;
+  privacy: PortalLegalContent;
+  terms: PortalLegalContent;
+}
+
+// ── Backoffice (staff) projections ─────────────────────────────────────────
+
+/** A document row without its payload — the admin list. */
+export interface SupportDocumentSummary {
+  id: string;
+  slug: SupportDocSlug;
+  version: number;
+  updatedAt: string;
+  updatedById: string | null;
+}
+
+export interface SupportDocumentDetail<
+  S extends SupportDocSlug = SupportDocSlug,
+> extends SupportDocumentSummary {
+  slug: S;
+  payload: SupportDocPayloadMap[S];
+}
+
+/** A history row without its payload — the version list. */
+export interface SupportDocVersionSummary {
+  id: string;
+  version: number;
+  actorId: string | null;
+  note: string | null;
+  createdAt: string;
+}
+
+/** A history row with its payload — fetched when a version is previewed. */
+export interface SupportDocVersionDetail extends SupportDocVersionSummary {
+  payload: SupportDocPayload;
+}
diff --git a/packages/ui-common/postcss.config.js b/packages/ui-common/postcss.config.js
index 6d2dcb075..1e8e9dbf9 100644
--- a/packages/ui-common/postcss.config.js
+++ b/packages/ui-common/postcss.config.js
@@ -1,7 +1,3 @@
-import { createRequire } from 'module';
-
-const require = createRequire(import.meta.url);
-
 // Optional PostCSS configuration for applications that need it
 export const postcssConfig = {
   plugins: {
diff --git a/packages/ui-common/src/components/CountdownTimer/CountdownTimer.tsx b/packages/ui-common/src/components/CountdownTimer/CountdownTimer.tsx
index faadb0adf..1a906d96e 100644
--- a/packages/ui-common/src/components/CountdownTimer/CountdownTimer.tsx
+++ b/packages/ui-common/src/components/CountdownTimer/CountdownTimer.tsx
@@ -1,4 +1,4 @@
-import { Group, Text } from "@mantine/core";
+import { Group, Loader, Text } from "@mantine/core";
 import { Clock } from "lucide-react";
 import { useEffect, useState } from "react";
 
@@ -9,6 +9,14 @@ export interface CountdownTimerProps {
   label?: string;
   /** Text shown once the deadline has passed. */
   expiredText?: string;
+  /**
+   * Optional grace stage: once `deadline` passes, count down to this later
+   * ISO timestamp instead (e.g. the payment drain tail). `expiredText` then
+   * only shows after the grace deadline has also passed.
+   */
+  graceDeadline?: string | null;
+  /** Label shown while counting down the grace stage (e.g. "Payment processing — closes in"). */
+  graceLabel?: string;
   /** Visual size of the time text. */
   size?: "xs" | "sm" | "md" | "lg";
   /** Colour once under this many seconds remain (urgency). Default 300 (5 min). */
@@ -35,37 +43,56 @@ function formatRemaining(ms: number): string {
 /**
  * Live countdown to an ISO deadline. Ticks once a second, shows the remaining
  * time (d/h/m/s), turns red when under `urgentUnderSeconds`, and shows
- * `expiredText` once the deadline is in the past. Display only — enforcement
- * lives server-side.
+ * `expiredText` once the deadline is in the past. When `graceDeadline` is set,
+ * a lapsed main deadline rolls into a calm second-stage countdown (spinner,
+ * no urgency colours) toward it before `expiredText` takes over. Display only
+ * — enforcement lives server-side.
  */
 export function CountdownTimer({
   deadline,
   label,
   expiredText = "Expired",
+  graceDeadline,
+  graceLabel,
   size = "sm",
   urgentUnderSeconds = 300,
 }: CountdownTimerProps) {
-  const [remaining, setRemaining] = useState<number | null>(() =>
-    deadline ? new Date(deadline).getTime() - Date.now() : null,
-  );
+  const [now, setNow] = useState(() => Date.now());
 
   useEffect(() => {
-    if (!deadline) {
-      setRemaining(null);
-      return;
-    }
-    const target = new Date(deadline).getTime();
-    const tick = () => setRemaining(target - Date.now());
-    tick();
-    const id = setInterval(tick, 1000);
+    if (!deadline) return;
+    setNow(Date.now());
+    const id = setInterval(() => setNow(Date.now()), 1000);
     return () => clearInterval(id);
-  }, [deadline]);
+  }, [deadline, graceDeadline]);
 
-  if (!deadline || remaining == null || Number.isNaN(remaining)) {
-    return null;
+  if (!deadline) return null;
+  const target = new Date(deadline).getTime();
+  if (Number.isNaN(target)) return null;
+
+  const remaining = target - now;
+  const expired = remaining <= 0;
+
+  const graceTarget = graceDeadline ? new Date(graceDeadline).getTime() : NaN;
+  const graceRemaining = Number.isNaN(graceTarget) ? 0 : graceTarget - now;
+  const inGrace = expired && graceRemaining > 0;
+
+  if (inGrace) {
+    return (
+      <Group gap={6} align="center" wrap="nowrap">
+        <Loader size={size === "lg" ? 18 : 14} color="blue.7" />
+        {graceLabel && (
+          <Text size={size} c="dimmed">
+            {graceLabel}
+          </Text>
+        )}
+        <Text size={size} fw={600} c="blue.7">
+          {formatRemaining(graceRemaining)}
+        </Text>
+      </Group>
+    );
   }
 
-  const expired = remaining <= 0;
   const urgent = !expired && remaining <= urgentUnderSeconds * 1000;
   const color = expired ? "red.7" : urgent ? "orange.7" : "dimmed";
 
diff --git a/packages/ui-common/src/components/CurrencySelector/CurrencySelector.tsx b/packages/ui-common/src/components/CurrencySelector/CurrencySelector.tsx
index 4d310efc0..f25a7b015 100644
--- a/packages/ui-common/src/components/CurrencySelector/CurrencySelector.tsx
+++ b/packages/ui-common/src/components/CurrencySelector/CurrencySelector.tsx
@@ -8,22 +8,27 @@ export interface CurrencySelectorProps {
   disabled?: boolean;
   /** Validation error shown under the cards. */
   error?: string;
+  /**
+   * Offer USD alongside ETB. Import shipments only — export and domestic
+   * traffic is invoiced in ETB, so the option stays hidden everywhere else.
+   * USD is settled by bank transfer, never through the online gateway.
+   */
+  allowUsd?: boolean;
 }
 
-const OPTIONS = [
-  {
-    code: "USD",
-    symbol: "$",
-    name: "US Dollar",
-    hint: "As quoted on the contract",
-  },
-  {
-    code: "ETB",
-    symbol: "Br",
-    name: "Ethiopian Birr",
-    hint: "Converted from the USD total",
-  },
-] as const;
+const ETB_OPTION = {
+  code: "ETB",
+  symbol: "Br",
+  name: "Ethiopian Birr",
+  hint: "Pay online through the payment gateway",
+} as const;
+
+const USD_OPTION = {
+  code: "USD",
+  symbol: "$",
+  name: "US Dollar",
+  hint: "Paid by bank transfer — send the slip to Finance",
+} as const;
 
 /**
  * Card-style USD/ETB billing-currency picker. Renders unselected when `value`
@@ -34,7 +39,9 @@ export function CurrencySelector({
   onChange,
   disabled = false,
   error,
+  allowUsd = false,
 }: CurrencySelectorProps) {
+  const options = allowUsd ? [ETB_OPTION, USD_OPTION] : [ETB_OPTION];
   return (
     <Box>
       <Box
@@ -44,7 +51,7 @@ export function CurrencySelector({
           gap: 10,
         }}
       >
-        {OPTIONS.map((o) => {
+        {options.map((o) => {
           const selected = value === o.code;
           return (
             <button
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8e1d47c20..68573264b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -250,6 +250,9 @@ importers:
       '@mantine/hooks':
         specifier: ^9.3.0
         version: 9.3.0(react@19.2.6)
+      '@mdxeditor/editor':
+        specifier: ^4.2.0
+        version: 4.2.0(@codemirror/language@6.12.4)(@lezer/highlight@1.2.3)(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)(yjs@13.6.32)
       '@posthog/react':
         specifier: ^1.10.3
         version: 1.10.3(@types/react@18.3.31)(posthog-js@1.400.1)(react@19.2.6)
@@ -469,6 +472,9 @@ importers:
       react-intersection-observer:
         specifier: ^9.16.0
         version: 9.16.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-markdown:
+        specifier: ^9.1.0
+        version: 9.1.0(@types/react@18.3.31)(react@19.2.6)
       react-pdf:
         specifier: ^10.4.1
         version: 10.4.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -598,7 +604,7 @@ importers:
         version: 5.101.0(react@19.2.6)
       '@tria-plc/iamui':
         specifier: file:../../../local-packages/tria-plc-iamui-0.1.1.tgz
-        version: file:local-packages/tria-plc-iamui-0.1.1.tgz(0ce39b7e349029277dcd938d06eeb0f7)
+        version: file:local-packages/tria-plc-iamui-0.1.1.tgz(a5d0bdee55164ae56064fb273b530e00)
       '@vis.gl/react-google-maps':
         specifier: ^1.8.3
         version: 1.8.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -635,6 +641,9 @@ importers:
       react-hot-toast:
         specifier: ^2.6.0
         version: 2.6.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-markdown:
+        specifier: ^9.1.0
+        version: 9.1.0(@types/react@18.3.31)(react@19.2.6)
       react-phone-number-input:
         specifier: ^3.4.17
         version: 3.4.17(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -1744,6 +1753,99 @@ packages:
   '@borewit/text-codec@0.2.2':
     resolution: {integrity: sha512-DDaRehssg1aNrH4+2hnj1B7vnUGEjU6OIlyRdkMd0aUdIUvKXrJfXsy8LVtXAy7DRvYVluWbMspsRhz2lcW0mQ==}
 
+  '@codemirror/autocomplete@6.20.3':
+    resolution: {integrity: sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g==}
+
+  '@codemirror/commands@6.10.4':
+    resolution: {integrity: sha512-Ryk9y9T0FFVF0cUGhAknveAyUOl/A1qReTFi+qPKtOh2Z9F4AUBz3XOrYD4ZEgZirdugVzHvd/2/Wcwy5OliTg==}
+
+  '@codemirror/lang-angular@0.1.4':
+    resolution: {integrity: sha512-oap+gsltb/fzdlTQWD6BFF4bSLKcDnlxDsLdePiJpCVNKWXSTAbiiQeYI3UmES+BLAdkmIC1WjyztC1pi/bX4g==}
+
+  '@codemirror/lang-cpp@6.0.3':
+    resolution: {integrity: sha512-URM26M3vunFFn9/sm6rzqrBzDgfWuDixp85uTY49wKudToc2jTHUrKIGGKs+QWND+YLofNNZpxcNGRynFJfvgA==}
+
+  '@codemirror/lang-css@6.3.1':
+    resolution: {integrity: sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==}
+
+  '@codemirror/lang-go@6.0.1':
+    resolution: {integrity: sha512-7fNvbyNylvqCphW9HD6WFnRpcDjr+KXX/FgqXy5H5ZS0eC5edDljukm/yNgYkwTsgp2busdod50AOTIy6Jikfg==}
+
+  '@codemirror/lang-html@6.4.12':
+    resolution: {integrity: sha512-pw2ReWKUqSkbvh76RAT4NYxiogRu+PWkR2ukAwO9uOgrm8uipkzjtKKtNpyeAQwHOqxEeSvAXZ6vr3AfyB9y/w==}
+
+  '@codemirror/lang-java@6.0.2':
+    resolution: {integrity: sha512-m5Nt1mQ/cznJY7tMfQTJchmrjdjQ71IDs+55d1GAa8DGaB8JXWsVCkVT284C3RTASaY43YknrK2X3hPO/J3MOQ==}
+
+  '@codemirror/lang-javascript@6.2.5':
+    resolution: {integrity: sha512-zD4e5mS+50htS7F+TYjBPsiIFGanfVqg4HyUz6WNFikgOPf2BgKlx+TQedI1w6n/IqRBVBbBWmGFdLB/7uxO4A==}
+
+  '@codemirror/lang-jinja@6.0.1':
+    resolution: {integrity: sha512-P5kyHLObzjtbGj16h+hyvZTxJhSjBEeSx4wMjbnAf3b0uwTy2+F0zGjMZL4PQOm/mh2eGZ5xUDVZXgwP783Nsw==}
+
+  '@codemirror/lang-json@6.0.2':
+    resolution: {integrity: sha512-x2OtO+AvwEHrEwR0FyyPtfDUiloG3rnVTSZV1W8UteaLL8/MajQd8DpvUb2YVzC+/T18aSDv0H9mu+xw0EStoQ==}
+
+  '@codemirror/lang-less@6.0.2':
+    resolution: {integrity: sha512-EYdQTG22V+KUUk8Qq582g7FMnCZeEHsyuOJisHRft/mQ+ZSZ2w51NupvDUHiqtsOy7It5cHLPGfHQLpMh9bqpQ==}
+
+  '@codemirror/lang-liquid@6.3.2':
+    resolution: {integrity: sha512-6PDVU3ZnfeYyz1at1E/ttorErZvZFXXt1OPhtfe1EZJ2V2iDFa0CwPqPgG5F7NXN0yONGoBogKmFAafKTqlwIw==}
+
+  '@codemirror/lang-markdown@6.5.2':
+    resolution: {integrity: sha512-AwBOdkWYuA//WcM0xO5PfHPUcmz/O2i5o0Nsg1U69SII/loCJlFI1Romd9xp2HYb1kYJRGZotyqRghuHH5n8Kw==}
+
+  '@codemirror/lang-php@6.0.2':
+    resolution: {integrity: sha512-ZKy2v1n8Fc8oEXj0Th0PUMXzQJ0AIR6TaZU+PbDHExFwdu+guzOA4jmCHS1Nz4vbFezwD7LyBdDnddSJeScMCA==}
+
+  '@codemirror/lang-python@6.2.1':
+    resolution: {integrity: sha512-IRjC8RUBhn9mGR9ywecNhB51yePWCGgvHfY1lWN/Mrp3cKuHr0isDKia+9HnvhiWNnMpbGhWrkhuWOc09exRyw==}
+
+  '@codemirror/lang-rust@6.0.2':
+    resolution: {integrity: sha512-EZaGjCUegtiU7kSMvOfEZpaCReowEf3yNidYu7+vfuGTm9ow4mthAparY5hisJqOHmJowVH3Upu+eJlUji6qqA==}
+
+  '@codemirror/lang-sass@6.0.2':
+    resolution: {integrity: sha512-l/bdzIABvnTo1nzdY6U+kPAC51czYQcOErfzQ9zSm9D8GmNPD0WTW8st/CJwBTPLO8jlrbyvlSEcN20dc4iL0Q==}
+
+  '@codemirror/lang-sql@6.10.0':
+    resolution: {integrity: sha512-6ayPkEd/yRw0XKBx5uAiToSgGECo/GY2NoJIHXIIQh1EVwLuKoU8BP/qK0qH5NLXAbtJRLuT73hx7P9X34iO4w==}
+
+  '@codemirror/lang-vue@0.1.3':
+    resolution: {integrity: sha512-QSKdtYTDRhEHCfo5zOShzxCmqKJvgGrZwDQSdbvCRJ5pRLWBS7pD/8e/tH44aVQT6FKm0t6RVNoSUWHOI5vNug==}
+
+  '@codemirror/lang-wast@6.0.2':
+    resolution: {integrity: sha512-Imi2KTpVGm7TKuUkqyJ5NRmeFWF7aMpNiwHnLQe0x9kmrxElndyH0K6H/gXtWwY6UshMRAhpENsgfpSwsgmC6Q==}
+
+  '@codemirror/lang-xml@6.1.0':
+    resolution: {integrity: sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==}
+
+  '@codemirror/lang-yaml@6.1.3':
+    resolution: {integrity: sha512-AZ8DJBuXGVHybpBQhmZtgew5//4hv3tdkXnr3vDmOUMJRuB6vn/uuwtmTOTlqEaQFg3hQSVeA90NmvIQyUV6FQ==}
+
+  '@codemirror/language-data@6.5.2':
+    resolution: {integrity: sha512-CPkWBKrNS8stYbEU5kwBwTf3JB1kghlbh4FSAwzGW2TEscdeHHH4FGysREW86Mqnj3Qn09s0/6Ea/TutmoTobg==}
+
+  '@codemirror/language@6.12.4':
+    resolution: {integrity: sha512-1q4PaT+o6PbgpkJt4Q8Fv5XJxTy4FUZ4MWETtyiDw3J0Pyr9E2vqcKL+k9wcvjNTIsauxvE7OfmWj3FRPHQ76A==}
+
+  '@codemirror/legacy-modes@6.5.3':
+    resolution: {integrity: sha512-xCsmIzH78MyWkib9jlPaaun57XNkfbMIhagfaZVd0iLTqlpw3jXaIcbZm72MTmmn64eTZpBVNjbyYh+QXnxRsg==}
+
+  '@codemirror/lint@6.9.7':
+    resolution: {integrity: sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg==}
+
+  '@codemirror/merge@6.12.2':
+    resolution: {integrity: sha512-V8JvyAPjHbPupqP7BeMcsdsYCbyPij74jxIbaIJDORI+VZzW44zFmon8bF+oxGWvOKhcRmkiUMXd8MxHr3YA2w==}
+
+  '@codemirror/search@6.7.1':
+    resolution: {integrity: sha512-uMe5UO6PamJtSHrXhhHOzSX3ReWtiJrva6GnPMwSOrZtiExb5X5eExhr2OUZQVvdxPsKpY3Ro2mFbQadpPWmHA==}
+
+  '@codemirror/state@6.7.1':
+    resolution: {integrity: sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==}
+
+  '@codemirror/view@6.43.8':
+    resolution: {integrity: sha512-qtItTDssZ/5GFfi94hrILu9j/VUeFPDPkhovEfmWFj2ipTxnzPB8DdHgfbb8HYTzLTYhrndKmyQxXUz/PDLenw==}
+
   '@colors/colors@1.5.0':
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
@@ -2551,6 +2653,249 @@ packages:
   '@jridgewell/trace-mapping@0.3.9':
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
 
+  '@lexical/a11y@0.48.0':
+    resolution: {integrity: sha512-18W4ehyipkUim4YVoDZitoH63Om3j6iCN4c84zdqE9RgkWf/PE4rvI/8BHTm6Ni7NkVE14nimXgkpaP5ok15zA==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/clipboard@0.48.0':
+    resolution: {integrity: sha512-xO2trk6+yBl8XXa/VNe20kXczmPxFoWtUHjidbBLEtlGBj+mo63pJj6H5o/WlZsoMKmIOJxwxsn2ejrS8G0/7A==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/code-core@0.48.0':
+    resolution: {integrity: sha512-+O1Ge06AuSo6+r8R2Xk6SkWG07H5/e4K/Scw9aqCM/BRjITxgvFTHTNvgQbaobCsP0uBJiwW1+ZGeWAWcBCY4w==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/devtools-core@0.48.0':
+    resolution: {integrity: sha512-4kvKWW6ebgQnJNLXPLmw7dqgSChvzYIBNYtfuR6c48Sw+V/QXQTWqfIUbCIe5X4uG8EEXd5O/udXaJx7GBuP+w==}
+    peerDependencies:
+      react: '>=18.x'
+      react-dom: '>=18.x'
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/dragon@0.48.0':
+    resolution: {integrity: sha512-uPuu7fVca9vmL/Oz30CRZ7FIPIodwMrTgNsRmV8jE6Qd6a7RNiTW7r3+EhbhIdkLb/sjcWsYyOMyUR1TJAB0wQ==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/extension@0.48.0':
+    resolution: {integrity: sha512-4uBObgz84mVbQWiumndmIhkuJL0ojHiMwFSvSUM/FCo1YMVIZvpI56blI0y+2Vix/oLui9EgVQSJjjWV4NAszw==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/hashtag@0.48.0':
+    resolution: {integrity: sha512-hPQtdnbVoNAFsmfnCGfgY7mDbvk6mIznlCRmIR7tLeQKXqz/0Tb6eH3W24EESk9hAF8wFUYNKWE1/Kb3Hl2vEQ==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/history@0.48.0':
+    resolution: {integrity: sha512-NllvUfO+u3mfi5uC8k2CodwdzeeopFFVtMZ/NMifzFbZFysdWi9m9mqfO46NrEA1rSFOydyefv6oMzC8ULXInA==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/html@0.48.0':
+    resolution: {integrity: sha512-uBxlgKl4YgSNEgHJSshdBqtGDzruWdx1ewop+u6faT67qHUdP3P0cUXIrG6NToDWvsL6fzCstAbN76PMER1Pnw==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/internal@0.48.0':
+    resolution: {integrity: sha512-sRwg53K7N0ZQ7KNAvcCY38LSwGizbXP1zlR1lIojZp0GoqHWNvR+vL49t1wYXu1nXx3Osf4ilHHm+aGcwq5hTw==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/link@0.48.0':
+    resolution: {integrity: sha512-E0UDmNLUXs/yMCnnE7hbFO0CvhWghmqa+qqPksFfzLkpMHdPpdS1yg59YEbYoNHLi/DXIu4cFRvpHIEuooxwNg==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/list@0.48.0':
+    resolution: {integrity: sha512-9Qe/Vur44v9F9enj55SUzf79FVsijcGOQug7SpiIU8ekLr7JNzcilKYBYcZ6etGEo7bqQHsYMHXeJcSBbCI2zA==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/mark@0.48.0':
+    resolution: {integrity: sha512-DTtypWvnYSXyNUxEmsUnh4y0xXkmdk8Y72EZl8WDHcCwjqaLJlUakH7p/TuSJczs3uVSaoJzu0yh7oGkP1Vsvw==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/markdown@0.48.0':
+    resolution: {integrity: sha512-1WasBenW4bEsa5xtnycVo8G2hcxIqyYLn3/r98yD2Y+54ZyeFuIQfOeJYhIgCh4YkKpfqyrFwkMQwAOsQDqZjA==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/overflow@0.48.0':
+    resolution: {integrity: sha512-1YEvMz2tW3EbwrON9mjrkjMVl/vdTcPYSn9P1j6mf5gj0LOoLDNI4TbvSD4SViy+TDghxNdG8YdCISyU2b4YKA==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/plain-text@0.48.0':
+    resolution: {integrity: sha512-q4f/4VZKVgCrIW2FhDFR2RII1BU0ljedPgEmJ8XQn1zc+JOFPom8Lp0lV5nyEvZaAJYwM/TfoJ9g2V7ESFKznA==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/react@0.48.0':
+    resolution: {integrity: sha512-uVh9/QSrbtjLjVbxfJ+sfiMyhUq/rv7H6uBEVDDIw1rkZJSDY1fvf/CX+dyKgwcDFjKQZ8/9i5f9UCVPeQ01hA==}
+    peerDependencies:
+      react: '>=18.x'
+      react-dom: '>=18.x'
+      typescript: '>=5.2'
+      yjs: '>=13.5.22'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+      yjs:
+        optional: true
+
+  '@lexical/rich-text@0.48.0':
+    resolution: {integrity: sha512-QMXFnwCKAQ4yzxvx5FwmANcx3K+NaBkGTxAVD8s8pOKDD/U5rzDS1iIvhH6TLWaFp7VzvLmLB+Sl1Ie/RnkaDQ==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/selection@0.48.0':
+    resolution: {integrity: sha512-Uc0wTrEtHcYK6z/aHHjkgH3vX/R4Bf8mO+qH3VbxfSAKYzNYktM0j+ZGdq5kIEL4frnw/9SulNCXlH7xpjuDgA==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/table@0.48.0':
+    resolution: {integrity: sha512-t9Mz7q6ODLUz0lG5Xn9EY/5YiVpTHCqlPQP4EtFXlnBQT3DuKeDS3cC0Cn8sGSZc11YY5OLDfWpB64Frs9BL3g==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/text@0.48.0':
+    resolution: {integrity: sha512-ktTMRbsX4wKxdG2OpZCkrqtt8k9Vg/ZpWdukOQ0r1xPRtCuL1T+q91l7cy2ywIuCfMGYS0aoZGB4LdpUMe/H1g==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/utils@0.48.0':
+    resolution: {integrity: sha512-W4k4P+y6jmRfna8+ad4X+iMd5h8es5PC3bUw5tbi7MRApxaaFG/0w+uJiZVSwbT2Q6JnA2xhBaqzPgt/Gn6djg==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lexical/yjs@0.48.0':
+    resolution: {integrity: sha512-fFsE8EnPM/2KK9rMJ0z6T+Da5UW5V4P+XiAA03LoHTY5YQ/Oy8Q0i7Wcmocv/B/SpsY2o8g07euZEfudl9MVKA==}
+    peerDependencies:
+      typescript: '>=5.2'
+      yjs: '>=13.5.22'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@lezer/common@1.5.2':
+    resolution: {integrity: sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ==}
+
+  '@lezer/cpp@1.1.6':
+    resolution: {integrity: sha512-vh9gWWJOXFVY8HBHK3Twzq8MgwG2iN4GSyzBP9sCGTe37P15x2R14VaBQk0VA0ezTRN1KHYBBsHhvpGZ2Xy/pA==}
+
+  '@lezer/css@1.3.6':
+    resolution: {integrity: sha512-YJE78Wcg+zX8f10hiHWQ4Az48Qr/c13eId0VtRQYLBpxHDmDeSrXIlkbl+fJGW42rWC/uoUco9mhBZeVWP/A1g==}
+
+  '@lezer/go@1.0.1':
+    resolution: {integrity: sha512-xToRsYxwsgJNHTgNdStpcvmbVuKxTapV0dM0wey1geMMRc9aggoVyKgzYp41D2/vVOx+Ii4hmE206kvxIXBVXQ==}
+
+  '@lezer/highlight@1.2.3':
+    resolution: {integrity: sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==}
+
+  '@lezer/html@1.3.13':
+    resolution: {integrity: sha512-oI7n6NJml729m7pjm9lvLvmXbdoMoi2f+1pwSDJkl9d68zGr7a9Btz8NdHTGQZtW2DA25ybeuv/SyDb9D5tseg==}
+
+  '@lezer/java@1.1.3':
+    resolution: {integrity: sha512-yHquUfujwg6Yu4Fd1GNHCvidIvJwi/1Xu2DaKl/pfWIA2c1oXkVvawH3NyXhCaFx4OdlYBVX5wvz2f7Aoa/4Xw==}
+
+  '@lezer/javascript@1.5.4':
+    resolution: {integrity: sha512-vvYx3MhWqeZtGPwDStM2dwgljd5smolYD2lR2UyFcHfxbBQebqx8yjmFmxtJ/E6nN6u1D9srOiVWm3Rb4tmcUA==}
+
+  '@lezer/json@1.0.3':
+    resolution: {integrity: sha512-BP9KzdF9Y35PDpv04r0VeSTKDeox5vVr3efE7eBbx3r4s3oNLfunchejZhjArmeieBH+nVOpgIiBJpEAv8ilqQ==}
+
+  '@lezer/lr@1.4.10':
+    resolution: {integrity: sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==}
+
+  '@lezer/markdown@1.7.2':
+    resolution: {integrity: sha512-iTkYvoVcKt3WkeL7qUDyXHONZEwLio4wj8KTNi2dnjQEXBZKMV63BpQrPqfsM+OkvuRbiSTAcycYAsQzLhRNoQ==}
+
+  '@lezer/php@1.0.5':
+    resolution: {integrity: sha512-W7asp9DhM6q0W6DYNwIkLSKOvxlXRrif+UXBMxzsJUuqmhE7oVU+gS3THO4S/Puh7Xzgm858UNaFi6dxTP8dJA==}
+
+  '@lezer/python@1.1.19':
+    resolution: {integrity: sha512-MhQIURHRytsNzP/YXnqpYKW6la6voAH3kyplTOOiCdjyFY6cWWGFVmYVdHIPrElqSDf4iCDktQCockB9FxuhzQ==}
+
+  '@lezer/rust@1.0.2':
+    resolution: {integrity: sha512-Lz5sIPBdF2FUXcWeCu1//ojFAZqzTQNRga0aYv6dYXqJqPfMdCAI0NzajWUd4Xijj1IKJLtjoXRPMvTKWBcqKg==}
+
+  '@lezer/sass@1.1.0':
+    resolution: {integrity: sha512-3mMGdCTUZ/84ArHOuXWQr37pnf7f+Nw9ycPUeKX+wu19b7pSMcZGLbaXwvD2APMBDOGxPmpK/O6S1v1EvLoqgQ==}
+
+  '@lezer/xml@1.0.6':
+    resolution: {integrity: sha512-CdDwirL0OEaStFue/66ZmFSeppuL6Dwjlk8qk153mSQwiSH/Dlri4GNymrNWnUmPl2Um7QfV1FO9KFUyX3Twww==}
+
+  '@lezer/yaml@1.0.4':
+    resolution: {integrity: sha512-2lrrHqxalACEbxIbsjhqGpSW8kWpUKuY6RHgnSAFZa6qK62wvnPxA8hGOwOoDbwHcOFs5M4o27mjGu+P7TvBmw==}
+
   '@lottiefiles/react-lottie-player@3.6.0':
     resolution: {integrity: sha512-WK5TriLJT93VF3w4IjSVyveiedraZCnDhKzCPhpbeLgQeMi6zufxa3dXNc4HmAFRXq+LULPAy+Idv1rAfkReMA==}
     peerDependencies:
@@ -2636,6 +2981,23 @@ packages:
     peerDependencies:
       react: ^18.x || ^19.x
 
+  '@marijn/find-cluster-break@1.0.3':
+    resolution: {integrity: sha512-FY+MKLBoTsLNJF/eLWaOsXGdz6uh3Iu1axjPf6TUq92IYumcTcXWHoS747JARLkcdlJ/Waiaxc5wQfFO8jC6NA==}
+
+  '@mdxeditor/editor@4.2.0':
+    resolution: {integrity: sha512-S/IPY8AjWTV2v1TGbEy5lsbQ5w+J2M2j2QDeswxP4FpNh2B49OPkpSqHbbX5GbV0YBlhfXJxtzwBJv/sQACufw==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      react: '>= 18 || >= 19'
+      react-dom: '>= 18 || >= 19'
+
+  '@mdxeditor/gurx@1.2.4':
+    resolution: {integrity: sha512-9ZykIFYhKaXaaSPCs1cuI+FvYDegJjbKwmA4ASE/zY+hJY6EYqvoye4esiO85CjhOw9aoD/izD/CU78/egVqmg==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      react: '>= 18 || >= 19'
+      react-dom: '>= 18 || >= 19'
+
   '@microsoft/tsdoc@0.15.1':
     resolution: {integrity: sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==}
 
@@ -3361,6 +3723,9 @@ packages:
   '@posthog/types@1.394.0':
     resolution: {integrity: sha512-ifQ7p8o8hoHErlJmpzCFzHQcuRam0vXk8LBVhBu4BlPYP6S0tog4FSAFItnI/nwN6cHZI0WFQilr7sIqQa7Flg==}
 
+  '@preact/signals-core@1.14.4':
+    resolution: {integrity: sha512-HNB6HYeYKhQbJ1aKl+YRjrS4+QWHLKX6qKoUsfS/m0vqzsVaEBiZiaKbG/e+NKk2ch5ALQr/ihWaMHxiCuuWHA==}
+
   '@prisma/client@6.19.3':
     resolution: {integrity: sha512-mKq3jQFhjvko5LTJFHGilsuQs+W+T3Gm451NzuTDGQxwCzwXHYnIu2zGkRoW+Exq3Rob7yp2MfzSrdIiZVhrBg==}
     engines: {node: '>=18.18'}
@@ -3396,6 +3761,9 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  '@radix-ui/colors@3.0.0':
+    resolution: {integrity: sha512-FUOsGBkHrYJwCSEtWRCIfQbZG7q1e6DgxCIOe1SUQzDe/7rXXeA47s8yCn6fuTNQAj1Zq4oTFi9Yjp3wzElcxg==}
+
   '@radix-ui/number@1.1.2':
     resolution: {integrity: sha512-ceTwaxc4I5IOi97DgCotl3pqiyRGvffcc0oOsE2dQYaJOFIDsDt4VWG6xEbg1QePv9QWausCEIppud/tJ1wNig==}
 
@@ -3646,6 +4014,11 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-icons@1.3.2':
+    resolution: {integrity: sha512-fyQIhGDhzfc9pK2kH6Pl9c4BDJGfMkPqkyIgYDthyNYoNg3wVhoJMMh19WS4Up/1KMPFVpNsT2q3WmXn2N1m6g==}
+    peerDependencies:
+      react: ^16.x || ^17.x || ^18.x || ^19.0.0 || ^19.0.0-rc
+
   '@radix-ui/react-id@1.1.2':
     resolution: {integrity: sha512-orBC88futVpqCmhX1p4cvquNHsELQ+w+vBJnuj3ftETI5bJb0bZn3Tqu3SWN2IOcPycTnMGnhwoermvISt72sA==}
     peerDependencies:
@@ -4804,6 +5177,9 @@ packages:
   '@types/d3-timer@3.0.2':
     resolution: {integrity: sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==}
 
+  '@types/debug@4.1.13':
+    resolution: {integrity: sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==}
+
   '@types/dompurify@3.2.0':
     resolution: {integrity: sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==}
     deprecated: This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.
@@ -4814,6 +5190,9 @@ packages:
   '@types/eslint@9.6.1':
     resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==}
 
+  '@types/estree-jsx@1.0.5':
+    resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==}
+
   '@types/estree@1.0.9':
     resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
 
@@ -4835,6 +5214,9 @@ packages:
   '@types/graceful-fs@4.1.9':
     resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
 
+  '@types/hast@3.0.5':
+    resolution: {integrity: sha512-rp/ezSWaD1m44dPKICGhiskI13nVr7qTloFwDa/IYkhhf5nzwP+zIQcIJh3WIFSBOy/H1PzB40jPjMDksN4F+g==}
+
   '@types/hoist-non-react-statics@3.3.7':
     resolution: {integrity: sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==}
     peerDependencies:
@@ -4879,6 +5261,9 @@ packages:
   '@types/luxon@3.7.1':
     resolution: {integrity: sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==}
 
+  '@types/mdast@4.0.4':
+    resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
+
   '@types/methods@1.1.4':
     resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==}
 
@@ -4991,6 +5376,12 @@ packages:
   '@types/trusted-types@2.0.7':
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
+  '@types/unist@2.0.11':
+    resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
+
+  '@types/unist@3.0.3':
+    resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
+
   '@types/use-sync-external-store@0.0.6':
     resolution: {integrity: sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==}
 
@@ -5814,6 +6205,9 @@ packages:
   babel-runtime@6.26.0:
     resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==}
 
+  bail@2.0.2:
+    resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
+
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
@@ -6075,6 +6469,9 @@ packages:
   caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
+  ccount@2.0.1:
+    resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
+
   cfb@1.2.2:
     resolution: {integrity: sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==}
     engines: {node: '>=0.8'}
@@ -6105,6 +6502,18 @@ packages:
     resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
     engines: {node: '>=10'}
 
+  character-entities-html4@2.1.0:
+    resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}
+
+  character-entities-legacy@3.0.0:
+    resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==}
+
+  character-entities@2.0.2:
+    resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
+
+  character-reference-invalid@2.0.1:
+    resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
+
   chardet@2.1.1:
     resolution: {integrity: sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==}
 
@@ -6227,6 +6636,14 @@ packages:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
 
+  cm6-theme-basic-light@0.2.0:
+    resolution: {integrity: sha512-1prg2gv44sYfpHscP26uLT/ePrh0mlmVwMSoSd3zYKQ92Ab3jPRLzyCnpyOCQLJbK+YdNs4HvMRqMNYdy4pMhA==}
+    peerDependencies:
+      '@codemirror/language': ^6.0.0
+      '@codemirror/state': ^6.0.0
+      '@codemirror/view': ^6.0.0
+      '@lezer/highlight': ^1.0.0
+
   cmdk@1.1.1:
     resolution: {integrity: sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==}
     peerDependencies:
@@ -6244,6 +6661,9 @@ packages:
     resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==}
     engines: {node: '>=0.10.0'}
 
+  codemirror@6.0.2:
+    resolution: {integrity: sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==}
+
   codepage@1.15.0:
     resolution: {integrity: sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==}
     engines: {node: '>=0.8'}
@@ -6281,6 +6701,9 @@ packages:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
 
+  comma-separated-tokens@2.0.3:
+    resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
+
   commander@11.1.0:
     resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
     engines: {node: '>=16'}
@@ -6322,6 +6745,9 @@ packages:
     resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
     engines: {node: '>= 10'}
 
+  compute-scroll-into-view@2.0.4:
+    resolution: {integrity: sha512-y/ZA3BGnxoM/QHHQ2Uy49CLtnWPbt4tTPpEEZiEmmiWBFKjej7nEyH8Ryz54jH0MLXflUYA3Er2zUxPSJu5R+g==}
+
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
@@ -6467,6 +6893,9 @@ packages:
   create-require@1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
+  crelt@1.0.7:
+    resolution: {integrity: sha512-aK6BbWfhf4U/wCcLHKPJl/xa6VkVstRaPywWtMKGwuOLc/wZTyQYuoxgvZnNsBvv7Kg3YTBQYYBCggcviQczuA==}
+
   cron@4.4.0:
     resolution: {integrity: sha512-fkdfq+b+AHI4cKdhZlppHveI/mgz2qpiYxcm+t5E5TsxX7QrLS1VE0+7GENEk9z0EeGPcpSciGv6ez24duWhwQ==}
     engines: {node: '>=18.x'}
@@ -6658,6 +7087,9 @@ packages:
   decimal.js@10.6.0:
     resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
 
+  decode-named-character-reference@1.3.0:
+    resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
+
   decode-uri-component@0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
     engines: {node: '>=0.10'}
@@ -6765,6 +7197,9 @@ packages:
   detect-node-es@1.1.0:
     resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
 
+  devlop@1.1.0:
+    resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
+
   devtools-protocol@0.0.1608973:
     resolution: {integrity: sha512-Tpm17fxYzt+J7VrGdc1k8YdRqS3YV7se/M6KeemEqvUbq/n7At1rWVuXMxQgpWkdwSdIEKYbU//Bve+Shm4YNQ==}
 
@@ -6785,6 +7220,10 @@ packages:
     resolution: {integrity: sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==}
     engines: {node: '>=0.3.1'}
 
+  diff@5.2.2:
+    resolution: {integrity: sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==}
+    engines: {node: '>=0.3.1'}
+
   diff@8.0.4:
     resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==}
     engines: {node: '>=0.3.1'}
@@ -6846,6 +7285,11 @@ packages:
     resolution: {integrity: sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==}
     engines: {node: '>=12'}
 
+  downshift@7.6.2:
+    resolution: {integrity: sha512-iOv+E1Hyt3JDdL9yYcOgW7nZ7GQ2Uz6YbggwXvKUSleetYhU2nXD482Rz6CzvM4lvI1At34BYruKAL4swRGxaA==}
+    peerDependencies:
+      react: '>=16.12.0'
+
   dunder-proto@1.0.1:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
@@ -7023,6 +7467,10 @@ packages:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
 
+  escape-string-regexp@5.0.0:
+    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
+    engines: {node: '>=12'}
+
   escodegen@2.1.0:
     resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
     engines: {node: '>=6.0'}
@@ -7160,6 +7608,12 @@ packages:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
 
+  estree-util-is-identifier-name@3.0.0:
+    resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
+
+  estree-util-visit@2.0.0:
+    resolution: {integrity: sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==}
+
   estree-walker@3.0.3:
     resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
 
@@ -7357,6 +7811,9 @@ packages:
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
 
+  fault@2.0.1:
+    resolution: {integrity: sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==}
+
   fb-watchman@2.0.2:
     resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
 
@@ -7494,6 +7951,10 @@ packages:
     resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
     engines: {node: '>= 6'}
 
+  format@0.2.2:
+    resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==}
+    engines: {node: '>=0.4.x'}
+
   formdata-polyfill@4.0.10:
     resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
     engines: {node: '>=12.20.0'}
@@ -7817,6 +8278,12 @@ packages:
     resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
     engines: {node: '>= 0.4'}
 
+  hast-util-to-jsx-runtime@2.3.6:
+    resolution: {integrity: sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==}
+
+  hast-util-whitespace@3.0.0:
+    resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
+
   he@1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
@@ -7871,6 +8338,9 @@ packages:
     resolution: {integrity: sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==}
     engines: {node: '>=0.10.0'}
 
+  html-url-attributes@3.0.1:
+    resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
+
   html2canvas@1.4.1:
     resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==}
     engines: {node: '>=8.0.0'}
@@ -8012,6 +8482,9 @@ packages:
     resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
+  inline-style-parser@0.2.7:
+    resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==}
+
   input-format@0.3.14:
     resolution: {integrity: sha512-gHMrgrbCgmT4uK5Um5eVDUohuV9lcs95ZUUN9Px2Y0VIfjTzT2wF8Q3Z4fwLFm7c5Z2OXCm53FHoovj6SlOKdg==}
     peerDependencies:
@@ -8053,6 +8526,12 @@ packages:
     resolution: {integrity: sha512-AIbwAcazqP3R65dGvqk1V+a+vE5Fg1yu/ZKMOiBWSUIXXiwQkYmXQcVa2O0nh0tSDKDFKxG2mY7dB1Sr4hEP1g==}
     engines: {node: '>= 0.4'}
 
+  is-alphabetical@2.0.1:
+    resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==}
+
+  is-alphanumerical@2.0.1:
+    resolution: {integrity: sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==}
+
   is-arguments@1.2.0:
     resolution: {integrity: sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==}
     engines: {node: '>= 0.4'}
@@ -8106,6 +8585,9 @@ packages:
     resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==}
     engines: {node: '>= 0.4'}
 
+  is-decimal@2.0.1:
+    resolution: {integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==}
+
   is-descriptor@0.1.8:
     resolution: {integrity: sha512-SceYGWXvdqlWa/OnQ5FQuV+NxvNmMRhMw/w9AHkH71hTzveND4BTYgvp16g+oITK47qbOl/3D0bl0iygehWAWQ==}
     engines: {node: '>= 0.4'}
@@ -8172,6 +8654,9 @@ packages:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
 
+  is-hexadecimal@2.0.1:
+    resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
+
   is-in-ssh@1.0.0:
     resolution: {integrity: sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==}
     engines: {node: '>=20'}
@@ -8369,6 +8854,9 @@ packages:
     resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
     engines: {node: '>=0.10.0'}
 
+  isomorphic.js@0.2.5:
+    resolution: {integrity: sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==}
+
   isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
@@ -8600,6 +9088,10 @@ packages:
     resolution: {integrity: sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==}
     hasBin: true
 
+  js-yaml@4.3.0:
+    resolution: {integrity: sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==}
+    hasBin: true
+
   jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
@@ -8745,6 +9237,19 @@ packages:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
 
+  lexical@0.48.0:
+    resolution: {integrity: sha512-KK4Tyr/cPsleoZ7XvhGRiRmcrZidSmoFUdIXK9nPubIifoC+80Dc5THyc4xtGKtsW24S1TsHzk5gmfBU+TxmEg==}
+    peerDependencies:
+      typescript: '>=5.2'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  lib0@0.2.117:
+    resolution: {integrity: sha512-DeXj9X5xDCjgKLU/7RR+/HQEVzuuEUiwldwOGsHK/sfAfELGWEyTcf0x+uOvCvK3O2zPmZePXWL85vtia6GyZw==}
+    engines: {node: '>=16'}
+    hasBin: true
+
   libphonenumber-js@1.13.6:
     resolution: {integrity: sha512-NdB6O6QvlGMCoG003m0YIKG2+Xw7DjmCZhmc1RH+K6HncADUbRf8TZeLegxBBN1VFyPHcNpPTKpIhYLXzJVy1Q==}
 
@@ -9016,6 +9521,9 @@ packages:
     resolution: {integrity: sha512-qyIh2goLt1sOgQQrrIWuwkRjUx4NUcEqEGAcYqD8VOnOC6ItwkrVE8/tA4smGpjzyp4Svhc6RodDp9IO5ghpyA==}
     engines: {node: '>=0.10.0'}
 
+  longest-streak@3.1.0:
+    resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
+
   loose-envify@1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
@@ -9105,10 +9613,58 @@ packages:
     resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
     engines: {node: '>=0.10.0'}
 
+  markdown-table@3.0.4:
+    resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
+
   math-intrinsics@1.1.0:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
+  mdast-util-directive@3.1.0:
+    resolution: {integrity: sha512-I3fNFt+DHmpWCYAT7quoM6lHf9wuqtI+oCOfvILnoicNIqjh5E3dEJWiXuYME2gNe8vl1iMQwyUHa7bgFmak6Q==}
+
+  mdast-util-from-markdown@2.0.3:
+    resolution: {integrity: sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==}
+
+  mdast-util-frontmatter@2.0.1:
+    resolution: {integrity: sha512-LRqI9+wdgC25P0URIJY9vwocIzCcksduHQ9OF2joxQoyTNVduwLAFUzjoopuRJbJAReaKrNQKAZKL3uCMugWJA==}
+
+  mdast-util-gfm-strikethrough@2.0.0:
+    resolution: {integrity: sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==}
+
+  mdast-util-gfm-table@2.0.0:
+    resolution: {integrity: sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==}
+
+  mdast-util-gfm-task-list-item@2.0.0:
+    resolution: {integrity: sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==}
+
+  mdast-util-highlight-mark@1.2.2:
+    resolution: {integrity: sha512-OYumVoytj+B9YgwzBhBcYUCLYHIPvJtAvwnMyKhUXbfUFuER5S+FDZyu9fadUxm2TCT5fRYK3jQXh2ioWAxrMw==}
+
+  mdast-util-mdx-expression@2.0.1:
+    resolution: {integrity: sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==}
+
+  mdast-util-mdx-jsx@3.2.0:
+    resolution: {integrity: sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==}
+
+  mdast-util-mdx@3.0.0:
+    resolution: {integrity: sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==}
+
+  mdast-util-mdxjs-esm@2.0.1:
+    resolution: {integrity: sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==}
+
+  mdast-util-phrasing@4.1.0:
+    resolution: {integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==}
+
+  mdast-util-to-hast@13.2.1:
+    resolution: {integrity: sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==}
+
+  mdast-util-to-markdown@2.1.2:
+    resolution: {integrity: sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==}
+
+  mdast-util-to-string@4.0.0:
+    resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
+
   mdn-data@2.0.14:
     resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
 
@@ -9160,6 +9716,108 @@ packages:
     resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
     engines: {node: '>= 0.6'}
 
+  micromark-core-commonmark@2.0.3:
+    resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
+
+  micromark-extension-directive@3.0.2:
+    resolution: {integrity: sha512-wjcXHgk+PPdmvR58Le9d7zQYWy+vKEU9Se44p2CrCDPiLr2FMyiT4Fyb5UFKFC66wGB3kPlgD7q3TnoqPS7SZA==}
+
+  micromark-extension-frontmatter@2.0.0:
+    resolution: {integrity: sha512-C4AkuM3dA58cgZha7zVnuVxBhDsbttIMiytjgsM2XbHAB2faRVaHRle40558FBN+DJcrLNCoqG5mlrpdU4cRtg==}
+
+  micromark-extension-gfm-strikethrough@2.1.0:
+    resolution: {integrity: sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==}
+
+  micromark-extension-gfm-table@2.1.1:
+    resolution: {integrity: sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==}
+
+  micromark-extension-gfm-task-list-item@2.1.0:
+    resolution: {integrity: sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==}
+
+  micromark-extension-highlight-mark@1.2.0:
+    resolution: {integrity: sha512-huGtbd/9kQsMk8u7nrVMaS5qH/47yDG6ZADggo5Owz5JoY8wdfQjfuy118/QiYNCvdFuFDbzT0A7K7Hp2cBsXA==}
+
+  micromark-extension-mdx-expression@3.0.1:
+    resolution: {integrity: sha512-dD/ADLJ1AeMvSAKBwO22zG22N4ybhe7kFIZ3LsDI0GlsNr2A3KYxb0LdC1u5rj4Nw+CHKY0RVdnHX8vj8ejm4Q==}
+
+  micromark-extension-mdx-jsx@3.0.2:
+    resolution: {integrity: sha512-e5+q1DjMh62LZAJOnDraSSbDMvGJ8x3cbjygy2qFEi7HCeUT4BDKCvMozPozcD6WmOt6sVvYDNBKhFSz3kjOVQ==}
+
+  micromark-extension-mdx-md@2.0.0:
+    resolution: {integrity: sha512-EpAiszsB3blw4Rpba7xTOUptcFeBFi+6PY8VnJ2hhimH+vCQDirWgsMpz7w1XcZE7LVrSAUGb9VJpG9ghlYvYQ==}
+
+  micromark-extension-mdxjs-esm@3.0.0:
+    resolution: {integrity: sha512-DJFl4ZqkErRpq/dAPyeWp15tGrcrrJho1hKK5uBS70BCtfrIFg81sqcTVu3Ta+KD1Tk5vAtBNElWxtAa+m8K9A==}
+
+  micromark-extension-mdxjs@3.0.0:
+    resolution: {integrity: sha512-A873fJfhnJ2siZyUrJ31l34Uqwy4xIFmvPY1oj+Ean5PHcPBYzEsvqvWGaWcfEIr11O5Dlw3p2y0tZWpKHDejQ==}
+
+  micromark-factory-destination@2.0.1:
+    resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==}
+
+  micromark-factory-label@2.0.1:
+    resolution: {integrity: sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==}
+
+  micromark-factory-mdx-expression@2.0.3:
+    resolution: {integrity: sha512-kQnEtA3vzucU2BkrIa8/VaSAsP+EJ3CKOvhMuJgOEGg9KDC6OAY6nSnNDVRiVNRqj7Y4SlSzcStaH/5jge8JdQ==}
+
+  micromark-factory-space@2.0.1:
+    resolution: {integrity: sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==}
+
+  micromark-factory-title@2.0.1:
+    resolution: {integrity: sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==}
+
+  micromark-factory-whitespace@2.0.1:
+    resolution: {integrity: sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==}
+
+  micromark-util-character@2.1.1:
+    resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
+
+  micromark-util-chunked@2.0.1:
+    resolution: {integrity: sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==}
+
+  micromark-util-classify-character@2.0.1:
+    resolution: {integrity: sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==}
+
+  micromark-util-combine-extensions@2.0.1:
+    resolution: {integrity: sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==}
+
+  micromark-util-decode-numeric-character-reference@2.0.2:
+    resolution: {integrity: sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==}
+
+  micromark-util-decode-string@2.0.1:
+    resolution: {integrity: sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==}
+
+  micromark-util-encode@2.0.1:
+    resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}
+
+  micromark-util-events-to-acorn@2.0.3:
+    resolution: {integrity: sha512-jmsiEIiZ1n7X1Rr5k8wVExBQCg5jy4UXVADItHmNk1zkwEVhBuIUKRu3fqv+hs4nxLISi2DQGlqIOGiFxgbfHg==}
+
+  micromark-util-html-tag-name@2.0.1:
+    resolution: {integrity: sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==}
+
+  micromark-util-normalize-identifier@2.0.1:
+    resolution: {integrity: sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==}
+
+  micromark-util-resolve-all@2.0.1:
+    resolution: {integrity: sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==}
+
+  micromark-util-sanitize-uri@2.0.1:
+    resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==}
+
+  micromark-util-subtokenize@2.1.0:
+    resolution: {integrity: sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==}
+
+  micromark-util-symbol@2.0.1:
+    resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==}
+
+  micromark-util-types@2.0.2:
+    resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==}
+
+  micromark@4.0.2:
+    resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==}
+
   micromatch@3.1.10:
     resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
     engines: {node: '>=0.10.0'}
@@ -9611,6 +10269,9 @@ packages:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
 
+  parse-entities@4.0.2:
+    resolution: {integrity: sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==}
+
   parse-json@5.2.0:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
@@ -9969,6 +10630,9 @@ packages:
   prop-types@15.8.1:
     resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
 
+  property-information@7.2.0:
+    resolution: {integrity: sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==}
+
   proxy-addr@2.0.7:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
@@ -10190,12 +10854,21 @@ packages:
   react-is@16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
   react-is@18.3.1:
     resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
 
   react-is@19.2.7:
     resolution: {integrity: sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==}
 
+  react-markdown@9.1.0:
+    resolution: {integrity: sha512-xaijuJB0kzGiUdG7nc2MOMDUDBWPyGAjZtUrow9XxUeua8IqeP+VlIfAZ3bphpcLTnSZXz6z9jcVC/TCwbfgdw==}
+    peerDependencies:
+      '@types/react': '>=18'
+      react: '>=18'
+
   react-number-format@5.4.5:
     resolution: {integrity: sha512-y8O2yHHj3w0aE9XO8d2BCcUOOdQTRSVq+WIuMlLVucAm5XNjJAy+BoOJiuQMldVYVOKTMyvVNfnbl2Oqp+YxGw==}
     peerDependencies:
@@ -10453,6 +11126,12 @@ packages:
     resolution: {integrity: sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==}
     engines: {node: '>= 0.8.0'}
 
+  remark-parse@11.0.0:
+    resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==}
+
+  remark-rehype@11.1.2:
+    resolution: {integrity: sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==}
+
   remarkable@1.7.4:
     resolution: {integrity: sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==}
     engines: {node: '>= 0.10.0'}
@@ -10615,6 +11294,10 @@ packages:
   rxjs@7.8.2:
     resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
 
+  sade@1.8.1:
+    resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
+    engines: {node: '>=6'}
+
   safe-array-concat@1.1.4:
     resolution: {integrity: sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==}
     engines: {node: '>=0.4'}
@@ -10883,6 +11566,9 @@ packages:
     resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
     engines: {node: '>= 12'}
 
+  space-separated-tokens@2.0.2:
+    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
+
   split-on-first@1.1.0:
     resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
     engines: {node: '>=6'}
@@ -11018,6 +11704,9 @@ packages:
   string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
 
+  stringify-entities@4.0.4:
+    resolution: {integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==}
+
   stringify-object@5.0.0:
     resolution: {integrity: sha512-zaJYxz2FtcMb4f+g60KsRNFOpVMUyuJgA51Zi5Z1DOTC3S59+OQiVOzE9GZt0x72uBGWKsQIuBKeF9iusmKFsg==}
     engines: {node: '>=14.16'}
@@ -11072,9 +11761,18 @@ packages:
     resolution: {integrity: sha512-mKX8HA/cdBqMKUr0MMZAFssCkIGoZeSCMXgnt79yKxNFguMLVFgRe6wB+fsL0NmoHDbeyZXczy7vEPSoo3rkzg==}
     engines: {node: '>=16'}
 
+  style-mod@4.1.3:
+    resolution: {integrity: sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==}
+
   style-object-to-css-string@1.1.3:
     resolution: {integrity: sha512-bISQoUsir/qGfo7vY8rw00ia9nnyE1jvYt3zZ2jhdkcXZ6dAEi74inMzQ6On57vFI+I4Fck6wOv5UI9BEwJDgw==}
 
+  style-to-js@1.1.21:
+    resolution: {integrity: sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==}
+
+  style-to-object@1.0.14:
+    resolution: {integrity: sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==}
+
   styled-components@5.3.11:
     resolution: {integrity: sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==}
     engines: {node: '>=10'}
@@ -11421,6 +12119,12 @@ packages:
   trim-canvas@0.1.2:
     resolution: {integrity: sha512-nd4Ga3iLFV94mdhW9JFMLpQbHUyCQuhFOD71PEAt1NjtMD5wbZctzhX8c3agHNybMR5zXD1XTGoIEWk995E6pQ==}
 
+  trim-lines@3.0.1:
+    resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
+
+  trough@2.2.0:
+    resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==}
+
   ts-api-utils@2.5.0:
     resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
     engines: {node: '>=18.12'}
@@ -11682,10 +12386,34 @@ packages:
     resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
     engines: {node: '>=18'}
 
+  unidiff@1.0.4:
+    resolution: {integrity: sha512-ynU0vsAXw0ir8roa+xPCUHmnJ5goc5BTM2Kuc3IJd8UwgaeRs7VSD5+eeaQL+xp1JtB92hu/Zy/Lgy7RZcr1pQ==}
+
+  unified@11.0.5:
+    resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
+
   union-value@1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
 
+  unist-util-is@6.0.1:
+    resolution: {integrity: sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==}
+
+  unist-util-position-from-estree@2.0.0:
+    resolution: {integrity: sha512-KaFVRjoqLyF6YXCbVLNad/eS4+OfPQQn2yOd7zF/h5T/CSL2v8NpN6a5TPvtbXthAGw5nG+PuTtq+DdIZr+cRQ==}
+
+  unist-util-position@5.0.0:
+    resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
+
+  unist-util-stringify-position@4.0.0:
+    resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
+
+  unist-util-visit-parents@6.0.2:
+    resolution: {integrity: sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==}
+
+  unist-util-visit@5.1.0:
+    resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==}
+
   universal-cookie@8.1.2:
     resolution: {integrity: sha512-kcKzTGNsxVytujrYOvQbvh//QyFrA53HrzCGyzh6i9ujCww5gfPrLK0tG+jJD40SIIldiEjBNPPSR8fBMS21GA==}
 
@@ -11826,6 +12554,11 @@ packages:
     deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
+  uvu@0.5.6:
+    resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
@@ -11855,6 +12588,12 @@ packages:
     resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
     engines: {'0': node >=0.6.0}
 
+  vfile-message@4.0.3:
+    resolution: {integrity: sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==}
+
+  vfile@6.0.3:
+    resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
+
   victory-vendor@36.9.2:
     resolution: {integrity: sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==}
 
@@ -11934,6 +12673,9 @@ packages:
     resolution: {integrity: sha512-lYEhd75l75P3D1LKpm4KqdOSpNyNdDJ9ixEZmC5ZAZUKGy6JNexfMdQ9SNaT5pCHuzuXXRJQedJ+CdqNg/D4Kw==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.10.0'}
 
+  w3c-keyname@2.2.8:
+    resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
+
   w3c-xmlserializer@5.0.0:
     resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
     engines: {node: '>=18'}
@@ -12192,6 +12934,10 @@ packages:
     resolution: {integrity: sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==}
     engines: {node: '>=0.8'}
 
+  yjs@13.6.32:
+    resolution: {integrity: sha512-lfiJIIC4Xayt5ItynE407ehlE03pCjeOc4hkR4yxxvvNJ4kuiN25B0g+Qp8XagYz361LLL7DCzR5bvFJ81QKtQ==}
+    engines: {node: '>=16.0.0', npm: '>=8.0.0'}
+
   yn@3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
@@ -12252,6 +12998,9 @@ packages:
       use-sync-external-store:
         optional: true
 
+  zwitch@2.0.4:
+    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
+
 snapshots:
 
   '@alloc/quick-lru@5.2.0': {}
@@ -12314,11 +13063,11 @@ snapshots:
       '@babel/helpers': 7.29.7
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
       '@babel/types': 7.29.7
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -12353,7 +13102,7 @@ snapshots:
       '@babel/helper-optimise-call-expression': 7.29.7
       '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7)
       '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
@@ -12362,7 +13111,14 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.29.7':
     dependencies:
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
       '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
@@ -12377,9 +13133,9 @@ snapshots:
   '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.29.7
       '@babel/helper-validator-identifier': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
@@ -12394,13 +13150,13 @@ snapshots:
       '@babel/core': 7.29.7
       '@babel/helper-member-expression-to-functions': 7.29.7
       '@babel/helper-optimise-call-expression': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-skip-transparent-expression-wrappers@7.29.7':
     dependencies:
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
       '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
@@ -12553,6 +13309,18 @@ snapshots:
       '@babel/parser': 7.29.7
       '@babel/types': 7.29.7
 
+  '@babel/traverse@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/traverse@7.29.7(supports-color@5.5.0)':
     dependencies:
       '@babel/code-frame': 7.29.7
@@ -12574,6 +13342,265 @@ snapshots:
 
   '@borewit/text-codec@0.2.2': {}
 
+  '@codemirror/autocomplete@6.20.3':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+
+  '@codemirror/commands@6.10.4':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+
+  '@codemirror/lang-angular@0.1.4':
+    dependencies:
+      '@codemirror/lang-html': 6.4.12
+      '@codemirror/lang-javascript': 6.2.5
+      '@codemirror/language': 6.12.4
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@codemirror/lang-cpp@6.0.3':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@lezer/cpp': 1.1.6
+
+  '@codemirror/lang-css@6.3.1':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@lezer/common': 1.5.2
+      '@lezer/css': 1.3.6
+
+  '@codemirror/lang-go@6.0.1':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@lezer/common': 1.5.2
+      '@lezer/go': 1.0.1
+
+  '@codemirror/lang-html@6.4.12':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/lang-css': 6.3.1
+      '@codemirror/lang-javascript': 6.2.5
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+      '@lezer/css': 1.3.6
+      '@lezer/html': 1.3.13
+
+  '@codemirror/lang-java@6.0.2':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@lezer/java': 1.1.3
+
+  '@codemirror/lang-javascript@6.2.5':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/lint': 6.9.7
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+      '@lezer/javascript': 1.5.4
+
+  '@codemirror/lang-jinja@6.0.1':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/lang-html': 6.4.12
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@codemirror/lang-json@6.0.2':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@lezer/json': 1.0.3
+
+  '@codemirror/lang-less@6.0.2':
+    dependencies:
+      '@codemirror/lang-css': 6.3.1
+      '@codemirror/language': 6.12.4
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@codemirror/lang-liquid@6.3.2':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/lang-html': 6.4.12
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@codemirror/lang-markdown@6.5.2':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/lang-html': 6.4.12
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+      '@lezer/markdown': 1.7.2
+
+  '@codemirror/lang-php@6.0.2':
+    dependencies:
+      '@codemirror/lang-html': 6.4.12
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@lezer/common': 1.5.2
+      '@lezer/php': 1.0.5
+
+  '@codemirror/lang-python@6.2.1':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@lezer/common': 1.5.2
+      '@lezer/python': 1.1.19
+
+  '@codemirror/lang-rust@6.0.2':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@lezer/rust': 1.0.2
+
+  '@codemirror/lang-sass@6.0.2':
+    dependencies:
+      '@codemirror/lang-css': 6.3.1
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@lezer/common': 1.5.2
+      '@lezer/sass': 1.1.0
+
+  '@codemirror/lang-sql@6.10.0':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@codemirror/lang-vue@0.1.3':
+    dependencies:
+      '@codemirror/lang-html': 6.4.12
+      '@codemirror/lang-javascript': 6.2.5
+      '@codemirror/language': 6.12.4
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@codemirror/lang-wast@6.0.2':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@codemirror/lang-xml@6.1.0':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+      '@lezer/xml': 1.0.6
+
+  '@codemirror/lang-yaml@6.1.3':
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+      '@lezer/yaml': 1.0.4
+
+  '@codemirror/language-data@6.5.2':
+    dependencies:
+      '@codemirror/lang-angular': 0.1.4
+      '@codemirror/lang-cpp': 6.0.3
+      '@codemirror/lang-css': 6.3.1
+      '@codemirror/lang-go': 6.0.1
+      '@codemirror/lang-html': 6.4.12
+      '@codemirror/lang-java': 6.0.2
+      '@codemirror/lang-javascript': 6.2.5
+      '@codemirror/lang-jinja': 6.0.1
+      '@codemirror/lang-json': 6.0.2
+      '@codemirror/lang-less': 6.0.2
+      '@codemirror/lang-liquid': 6.3.2
+      '@codemirror/lang-markdown': 6.5.2
+      '@codemirror/lang-php': 6.0.2
+      '@codemirror/lang-python': 6.2.1
+      '@codemirror/lang-rust': 6.0.2
+      '@codemirror/lang-sass': 6.0.2
+      '@codemirror/lang-sql': 6.10.0
+      '@codemirror/lang-vue': 0.1.3
+      '@codemirror/lang-wast': 6.0.2
+      '@codemirror/lang-xml': 6.1.0
+      '@codemirror/lang-yaml': 6.1.3
+      '@codemirror/language': 6.12.4
+      '@codemirror/legacy-modes': 6.5.3
+
+  '@codemirror/language@6.12.4':
+    dependencies:
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+      style-mod: 4.1.3
+
+  '@codemirror/legacy-modes@6.5.3':
+    dependencies:
+      '@codemirror/language': 6.12.4
+
+  '@codemirror/lint@6.9.7':
+    dependencies:
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      crelt: 1.0.7
+
+  '@codemirror/merge@6.12.2':
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/highlight': 1.2.3
+      style-mod: 4.1.3
+
+  '@codemirror/search@6.7.1':
+    dependencies:
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      crelt: 1.0.7
+
+  '@codemirror/state@6.7.1':
+    dependencies:
+      '@marijn/find-cluster-break': 1.0.3
+
+  '@codemirror/view@6.43.8':
+    dependencies:
+      '@codemirror/state': 6.7.1
+      crelt: 1.0.7
+      style-mod: 4.1.3
+      w3c-keyname: 2.2.8
+
   '@colors/colors@1.5.0':
     optional: true
 
@@ -12778,7 +13805,7 @@ snapshots:
 
   '@emotion/babel-plugin@11.13.5':
     dependencies:
-      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.29.7
       '@babel/runtime': 7.29.7
       '@emotion/hash': 0.9.2
       '@emotion/memoize': 0.9.0
@@ -12944,7 +13971,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.15.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.2
@@ -13104,7 +14131,7 @@ snapshots:
   '@humanwhocodes/config-array@0.13.0':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       minimatch: 3.1.5
     transitivePeerDependencies:
       - supports-color
@@ -13516,6 +14543,329 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
+  '@lexical/a11y@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/clipboard@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/html': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/list': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      '@types/trusted-types': 2.0.7
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/code-core@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/html': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/devtools-core@0.48.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)':
+    dependencies:
+      '@lexical/html': 0.48.0(typescript@5.9.3)
+      '@lexical/link': 0.48.0(typescript@5.9.3)
+      '@lexical/mark': 0.48.0(typescript@5.9.3)
+      '@lexical/table': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/dragon@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/extension@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      '@preact/signals-core': 1.14.4
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/hashtag@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/text': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/history@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/html@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/internal@0.48.0(typescript@5.9.3)':
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/link@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/html': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/list@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/html': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/mark@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/markdown@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/code-core': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/link': 0.48.0(typescript@5.9.3)
+      '@lexical/list': 0.48.0(typescript@5.9.3)
+      '@lexical/rich-text': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      '@lexical/text': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/overflow@0.48.0(typescript@5.9.3)':
+    dependencies:
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/plain-text@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/clipboard': 0.48.0(typescript@5.9.3)
+      '@lexical/dragon': 0.48.0(typescript@5.9.3)
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/react@0.48.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)(yjs@13.6.32)':
+    dependencies:
+      '@floating-ui/react': 0.27.19(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@lexical/a11y': 0.48.0(typescript@5.9.3)
+      '@lexical/devtools-core': 0.48.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)
+      '@lexical/dragon': 0.48.0(typescript@5.9.3)
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/hashtag': 0.48.0(typescript@5.9.3)
+      '@lexical/history': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/link': 0.48.0(typescript@5.9.3)
+      '@lexical/list': 0.48.0(typescript@5.9.3)
+      '@lexical/mark': 0.48.0(typescript@5.9.3)
+      '@lexical/markdown': 0.48.0(typescript@5.9.3)
+      '@lexical/overflow': 0.48.0(typescript@5.9.3)
+      '@lexical/plain-text': 0.48.0(typescript@5.9.3)
+      '@lexical/rich-text': 0.48.0(typescript@5.9.3)
+      '@lexical/table': 0.48.0(typescript@5.9.3)
+      '@lexical/text': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      '@lexical/yjs': 0.48.0(typescript@5.9.3)(yjs@13.6.32)
+      lexical: 0.48.0(typescript@5.9.3)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+    optionalDependencies:
+      typescript: 5.9.3
+      yjs: 13.6.32
+
+  '@lexical/rich-text@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/clipboard': 0.48.0(typescript@5.9.3)
+      '@lexical/dragon': 0.48.0(typescript@5.9.3)
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/html': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/selection@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/table@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/clipboard': 0.48.0(typescript@5.9.3)
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/html': 0.48.0(typescript@5.9.3)
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/text@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/utils@0.48.0(typescript@5.9.3)':
+    dependencies:
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lexical/yjs@0.48.0(typescript@5.9.3)(yjs@13.6.32)':
+    dependencies:
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      lexical: 0.48.0(typescript@5.9.3)
+      yjs: 13.6.32
+    optionalDependencies:
+      typescript: 5.9.3
+
+  '@lezer/common@1.5.2': {}
+
+  '@lezer/cpp@1.1.6':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/css@1.3.6':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/go@1.0.1':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/highlight@1.2.3':
+    dependencies:
+      '@lezer/common': 1.5.2
+
+  '@lezer/html@1.3.13':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/java@1.1.3':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/javascript@1.5.4':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/json@1.0.3':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/lr@1.4.10':
+    dependencies:
+      '@lezer/common': 1.5.2
+
+  '@lezer/markdown@1.7.2':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+
+  '@lezer/php@1.0.5':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/python@1.1.19':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/rust@1.0.2':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/sass@1.1.0':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/xml@1.0.6':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
+  '@lezer/yaml@1.0.4':
+    dependencies:
+      '@lezer/common': 1.5.2
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.10
+
   '@lottiefiles/react-lottie-player@3.6.0(react@19.2.6)':
     dependencies:
       lottie-web: 5.13.0
@@ -13640,6 +14990,83 @@ snapshots:
     dependencies:
       react: 19.2.6
 
+  '@marijn/find-cluster-break@1.0.3': {}
+
+  '@mdxeditor/editor@4.2.0(@codemirror/language@6.12.4)(@lezer/highlight@1.2.3)(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)(yjs@13.6.32)':
+    dependencies:
+      '@codemirror/commands': 6.10.4
+      '@codemirror/lang-markdown': 6.5.2
+      '@codemirror/language-data': 6.5.2
+      '@codemirror/merge': 6.12.2
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lexical/clipboard': 0.48.0(typescript@5.9.3)
+      '@lexical/extension': 0.48.0(typescript@5.9.3)
+      '@lexical/history': 0.48.0(typescript@5.9.3)
+      '@lexical/link': 0.48.0(typescript@5.9.3)
+      '@lexical/list': 0.48.0(typescript@5.9.3)
+      '@lexical/markdown': 0.48.0(typescript@5.9.3)
+      '@lexical/plain-text': 0.48.0(typescript@5.9.3)
+      '@lexical/react': 0.48.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)(yjs@13.6.32)
+      '@lexical/rich-text': 0.48.0(typescript@5.9.3)
+      '@lexical/selection': 0.48.0(typescript@5.9.3)
+      '@lexical/utils': 0.48.0(typescript@5.9.3)
+      '@mdxeditor/gurx': 1.2.4(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/colors': 3.0.0
+      '@radix-ui/react-dialog': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-icons': 1.3.2(react@19.2.6)
+      '@radix-ui/react-popover': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-popper': 1.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-select': 2.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-toggle-group': 1.1.12(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-toolbar': 1.1.12(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-tooltip': 1.2.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      classnames: 2.5.1
+      cm6-theme-basic-light: 0.2.0(@codemirror/language@6.12.4)(@codemirror/state@6.7.1)(@codemirror/view@6.43.8)(@lezer/highlight@1.2.3)
+      codemirror: 6.0.2
+      downshift: 7.6.2(react@19.2.6)
+      js-yaml: 4.3.0
+      lexical: 0.48.0(typescript@5.9.3)
+      mdast-util-directive: 3.1.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-frontmatter: 2.0.1
+      mdast-util-gfm-strikethrough: 2.0.0
+      mdast-util-gfm-table: 2.0.0
+      mdast-util-gfm-task-list-item: 2.0.0
+      mdast-util-highlight-mark: 1.2.2
+      mdast-util-mdx: 3.0.0
+      mdast-util-mdx-jsx: 3.2.0
+      mdast-util-to-markdown: 2.1.2
+      micromark-extension-directive: 3.0.2
+      micromark-extension-frontmatter: 2.0.0
+      micromark-extension-gfm-strikethrough: 2.1.0
+      micromark-extension-gfm-table: 2.1.1
+      micromark-extension-gfm-task-list-item: 2.1.0
+      micromark-extension-highlight-mark: 1.2.0
+      micromark-extension-mdx-jsx: 3.0.2
+      micromark-extension-mdx-md: 2.0.0
+      micromark-extension-mdxjs: 3.0.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      react-hook-form: 7.77.0(react@19.2.6)
+      unidiff: 1.0.4
+    transitivePeerDependencies:
+      - '@codemirror/language'
+      - '@lezer/highlight'
+      - '@types/react'
+      - '@types/react-dom'
+      - supports-color
+      - typescript
+      - yjs
+
+  '@mdxeditor/gurx@1.2.4(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+    dependencies:
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+
   '@microsoft/tsdoc@0.15.1': {}
 
   '@microsoft/tsdoc@0.16.0': {}
@@ -14264,6 +15691,8 @@ snapshots:
 
   '@posthog/types@1.394.0': {}
 
+  '@preact/signals-core@1.14.4': {}
+
   '@prisma/client@6.19.3(prisma@6.19.3(typescript@5.9.3))(typescript@5.9.3)':
     optionalDependencies:
       prisma: 6.19.3(typescript@5.9.3)
@@ -14301,7 +15730,7 @@ snapshots:
 
   '@puppeteer/browsers@2.13.2':
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       extract-zip: 2.0.1
       progress: 2.0.3
       proxy-agent: 6.5.0
@@ -14314,6 +15743,8 @@ snapshots:
       - react-native-b4a
       - supports-color
 
+  '@radix-ui/colors@3.0.0': {}
+
   '@radix-ui/number@1.1.2': {}
 
   '@radix-ui/primitive@1.1.4': {}
@@ -14806,6 +16237,10 @@ snapshots:
       '@types/react': 18.3.31
       '@types/react-dom': 18.3.7(@types/react@18.3.31)
 
+  '@radix-ui/react-icons@1.3.2(react@19.2.6)':
+    dependencies:
+      react: 19.2.6
+
   '@radix-ui/react-id@1.1.2(@types/react@18.3.31)(react@18.3.1)':
     dependencies:
       '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@18.3.31)(react@18.3.1)
@@ -16369,7 +17804,7 @@ snapshots:
 
   '@tokenizer/inflate@0.4.1':
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       token-types: 6.1.2
     transitivePeerDependencies:
       - supports-color
@@ -16668,6 +18103,130 @@ snapshots:
       - utf-8-validate
       - vite
 
+  '@tria-plc/iamui@file:local-packages/tria-plc-iamui-0.1.1.tgz(a5d0bdee55164ae56064fb273b530e00)':
+    dependencies:
+      '@emotion/react': 11.14.0(@types/react@18.3.31)(react@19.2.6)
+      '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@18.3.31)(react@19.2.6))(@types/react@18.3.31)(react@19.2.6)
+      '@hookform/resolvers': 5.4.0(react-hook-form@7.77.0(react@19.2.6))
+      '@lottiefiles/react-lottie-player': 3.6.0(react@19.2.6)
+      '@mantine/charts': 7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(recharts@3.8.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)(redux@5.0.1))
+      '@mantine/core': 7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@mantine/dates': 7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(dayjs@1.11.21)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@mantine/hooks': 7.17.8(react@19.2.6)
+      '@mantine/notifications': 7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-accordion': 1.2.13(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-alert-dialog': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-avatar': 1.1.12(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-checkbox': 1.3.4(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-collapsible': 1.1.13(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-context-menu': 2.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-dialog': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-dropdown-menu': 2.1.17(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-hover-card': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-label': 2.1.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-navigation-menu': 1.2.15(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-popover': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-progress': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-radio-group': 1.4.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-scroll-area': 1.2.11(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-select': 2.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-separator': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-slot': 1.2.5(@types/react@18.3.31)(react@19.2.6)
+      '@radix-ui/react-switch': 1.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-tabs': 1.1.14(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-toast': 1.2.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-tooltip': 1.2.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@react-pdf-viewer/core': 3.12.0(pdfjs-dist@5.4.296)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@react-pdf-viewer/default-layout': 3.12.0(pdfjs-dist@5.4.296)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@react-pdf/renderer': 4.5.1(react@19.2.6)
+      '@reduxjs/toolkit': 2.12.0(react-redux@9.3.0(@types/react@18.3.31)(react@19.2.6)(redux@5.0.1))(react@19.2.6)
+      '@tabler/icons-react': 3.44.0(react@19.2.6)
+      '@tailwindcss/vite': 4.3.0(vite@5.4.21(@types/node@24.13.1)(lightningcss@1.32.0)(terser@5.48.0))
+      '@tanstack/react-query': 5.101.0(react@19.2.6)
+      '@tanstack/react-query-devtools': 5.101.0(@tanstack/react-query@5.101.0(react@19.2.6))(react@19.2.6)
+      '@tanstack/react-table': 8.21.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@tinymce/tinymce-react': 6.3.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(tinymce@7.9.3)
+      '@types/dompurify': 3.2.0
+      '@types/node': 24.13.1
+      '@types/tinymce': 4.6.9
+      axios: 1.17.0
+      class-variance-authority: 0.7.1
+      clsx: 2.1.1
+      cmdk: 1.1.1(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      date-fns: 3.6.0
+      dayjs: 1.11.21
+      dompurify: 3.4.8
+      ethiopian-calendar-date-converter: 2.1.6
+      ethiopian-calendar-new: 1.1.0
+      file-type: 18.7.0
+      framer-motion: 12.40.0(@emotion/is-prop-valid@1.4.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      html2canvas: 1.4.1
+      i18next: 25.10.10(typescript@5.9.3)
+      i18next-browser-languagedetector: 8.2.1
+      jquery: 3.7.1
+      js-cookie: 3.0.8
+      jspdf: 3.0.4
+      lodash: 4.18.1
+      lucide-react: 0.513.0(react@19.2.6)
+      mantine-react-table: 2.0.0-beta.9(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/dates@7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(dayjs@1.11.21)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(@tabler/icons-react@3.44.0(react@19.2.6))(clsx@2.1.1)(dayjs@1.11.21)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      mui-ethiopian-datepicker: 0.3.2(4b3af212eafdf0059f009b005d7e343d)
+      next-themes: 0.4.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      path: 0.12.7
+      pdf-lib: 1.17.1
+      qs: 6.15.2
+      react: 19.2.6
+      react-cookie: 8.1.2(@types/react@18.3.31)(react@19.2.6)
+      react-css-nocode-editor: 1.0.13(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
+      react-day-picker: 8.10.2(date-fns@3.6.0)(react@19.2.6)
+      react-dom: 19.2.6(react@19.2.6)
+      react-dropzone: 14.4.1(react@19.2.6)
+      react-hook-form: 7.77.0(react@19.2.6)
+      react-i18next: 15.7.4(i18next@25.10.10(typescript@5.9.3))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)
+      react-icons: 5.6.0(react@19.2.6)
+      react-image-crop: 11.0.10(react@19.2.6)
+      react-intersection-observer: 9.16.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-pdf: 10.4.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-pdf-html: 2.1.5(@react-pdf/renderer@4.5.1(react@19.2.6))(react@19.2.6)
+      react-redux: 9.3.0(@types/react@18.3.31)(react@19.2.6)(redux@5.0.1)
+      react-resizable-panels: 3.0.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-router-dom: 7.17.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-signature-canvas: 1.1.0-alpha.2(@types/prop-types@15.7.15)(@types/react@18.3.31)(prop-types@15.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      recharts: 3.8.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)(redux@5.0.1)
+      rollup-plugin-visualizer: 7.0.1(rollup@4.61.1)
+      socket.io-client: 4.8.3
+      sonner: 2.0.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      tailwind-merge: 3.6.0
+      tailwind-scrollbar-hide: 4.0.0(tailwindcss@4.3.0)
+      tailwindcss: 4.3.0
+      tailwindcss-animate: 1.0.7(tailwindcss@4.3.0)
+      tinymce: 7.9.3
+      url: 0.11.4
+      vaul: 1.1.2(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      xlsx: 0.18.5
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@emotion/is-prop-valid'
+      - '@mui/icons-material'
+      - '@mui/material'
+      - '@mui/x-date-pickers'
+      - '@types/prop-types'
+      - '@types/react'
+      - '@types/react-dom'
+      - bufferutil
+      - debug
+      - pdfjs-dist
+      - prop-types
+      - react-is
+      - react-native
+      - redux
+      - rolldown
+      - rollup
+      - supports-color
+      - typescript
+      - utf-8-validate
+      - vite
+
   '@ts-morph/common@0.27.0':
     dependencies:
       fast-glob: 3.3.3
@@ -16779,6 +18338,10 @@ snapshots:
 
   '@types/d3-timer@3.0.2': {}
 
+  '@types/debug@4.1.13':
+    dependencies:
+      '@types/ms': 2.1.0
+
   '@types/dompurify@3.2.0':
     dependencies:
       dompurify: 3.4.8
@@ -16793,6 +18356,10 @@ snapshots:
       '@types/estree': 1.0.9
       '@types/json-schema': 7.0.15
 
+  '@types/estree-jsx@1.0.5':
+    dependencies:
+      '@types/estree': 1.0.9
+
   '@types/estree@1.0.9': {}
 
   '@types/express-serve-static-core@4.19.8':
@@ -16828,6 +18395,10 @@ snapshots:
     dependencies:
       '@types/node': 20.19.42
 
+  '@types/hast@3.0.5':
+    dependencies:
+      '@types/unist': 3.0.3
+
   '@types/hoist-non-react-statics@3.3.7(@types/react@18.3.31)':
     dependencies:
       '@types/react': 18.3.31
@@ -16871,6 +18442,10 @@ snapshots:
 
   '@types/luxon@3.7.1': {}
 
+  '@types/mdast@4.0.4':
+    dependencies:
+      '@types/unist': 3.0.3
+
   '@types/methods@1.1.4': {}
 
   '@types/mime@1.3.5': {}
@@ -16994,8 +18569,11 @@ snapshots:
 
   '@types/tmp@0.2.6': {}
 
-  '@types/trusted-types@2.0.7':
-    optional: true
+  '@types/trusted-types@2.0.7': {}
+
+  '@types/unist@2.0.11': {}
+
+  '@types/unist@3.0.3': {}
 
   '@types/use-sync-external-store@0.0.6': {}
 
@@ -17046,7 +18624,7 @@ snapshots:
       '@typescript-eslint/types': 8.60.1
       '@typescript-eslint/typescript-estree': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/visitor-keys': 8.60.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       eslint: 8.57.1
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -17056,7 +18634,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/types': 8.60.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
@@ -17075,7 +18653,7 @@ snapshots:
       '@typescript-eslint/types': 8.60.1
       '@typescript-eslint/typescript-estree': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/utils': 8.60.1(eslint@8.57.1)(typescript@5.9.3)
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       eslint: 8.57.1
       ts-api-utils: 2.5.0(typescript@5.9.3)
       typescript: 5.9.3
@@ -17090,7 +18668,7 @@ snapshots:
       '@typescript-eslint/tsconfig-utils': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/types': 8.60.1
       '@typescript-eslint/visitor-keys': 8.60.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       minimatch: 10.2.5
       semver: 7.8.2
       tinyglobby: 0.2.17
@@ -17379,7 +18957,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17893,6 +19471,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  babel-plugin-styled-components@2.3.0(styled-components@5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6))(supports-color@5.5.0):
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7)
+      picomatch: 4.0.4
+      styled-components: 5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
+    transitivePeerDependencies:
+      - supports-color
+
   babel-polyfill@6.26.0:
     dependencies:
       babel-runtime: 6.26.0
@@ -17929,6 +19517,8 @@ snapshots:
       core-js: 2.6.12
       regenerator-runtime: 0.11.1
 
+  bail@2.0.2: {}
+
   balanced-match@1.0.2: {}
 
   balanced-match@4.0.4: {}
@@ -18046,7 +19636,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       http-errors: 2.0.1
       iconv-lite: 0.7.2
       on-finished: 2.4.1
@@ -18222,6 +19812,8 @@ snapshots:
 
   caseless@0.12.0: {}
 
+  ccount@2.0.1: {}
+
   cfb@1.2.2:
     dependencies:
       adler-32: 1.3.1
@@ -18258,6 +19850,14 @@ snapshots:
 
   char-regex@1.0.2: {}
 
+  character-entities-html4@2.1.0: {}
+
+  character-entities-legacy@3.0.0: {}
+
+  character-entities@2.0.2: {}
+
+  character-reference-invalid@2.0.1: {}
+
   chardet@2.1.1: {}
 
   check-error@2.1.3: {}
@@ -18385,6 +19985,13 @@ snapshots:
 
   clsx@2.1.1: {}
 
+  cm6-theme-basic-light@0.2.0(@codemirror/language@6.12.4)(@codemirror/state@6.7.1)(@codemirror/view@6.43.8)(@lezer/highlight@1.2.3):
+    dependencies:
+      '@codemirror/language': 6.12.4
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+      '@lezer/highlight': 1.2.3
+
   cmdk@1.1.1(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.3(@types/react@18.3.31)(react@19.2.6)
@@ -18403,6 +20010,16 @@ snapshots:
 
   code-point-at@1.1.0: {}
 
+  codemirror@6.0.2:
+    dependencies:
+      '@codemirror/autocomplete': 6.20.3
+      '@codemirror/commands': 6.10.4
+      '@codemirror/language': 6.12.4
+      '@codemirror/lint': 6.9.7
+      '@codemirror/search': 6.7.1
+      '@codemirror/state': 6.7.1
+      '@codemirror/view': 6.43.8
+
   codepage@1.15.0: {}
 
   collect-v8-coverage@1.0.3: {}
@@ -18433,6 +20050,8 @@ snapshots:
     dependencies:
       delayed-stream: 1.0.0
 
+  comma-separated-tokens@2.0.3: {}
+
   commander@11.1.0: {}
 
   commander@13.1.0: {}
@@ -18466,6 +20085,8 @@ snapshots:
       normalize-path: 3.0.0
       readable-stream: 3.6.2
 
+  compute-scroll-into-view@2.0.4: {}
+
   concat-map@0.0.1: {}
 
   concat-stream@2.0.0:
@@ -18603,6 +20224,8 @@ snapshots:
 
   create-require@1.1.1: {}
 
+  crelt@1.0.7: {}
+
   cron@4.4.0:
     dependencies:
       '@types/luxon': 3.7.1
@@ -18820,6 +20443,10 @@ snapshots:
 
   decimal.js@10.6.0: {}
 
+  decode-named-character-reference@1.3.0:
+    dependencies:
+      character-entities: 2.0.2
+
   decode-uri-component@0.2.2: {}
 
   dedent@1.7.2(babel-plugin-macros@3.1.0):
@@ -18902,6 +20529,10 @@ snapshots:
 
   detect-node-es@1.1.0: {}
 
+  devlop@1.1.0:
+    dependencies:
+      dequal: 2.0.3
+
   devtools-protocol@0.0.1608973: {}
 
   dezalgo@1.0.4:
@@ -18917,6 +20548,8 @@ snapshots:
 
   diff@4.0.4: {}
 
+  diff@5.2.2: {}
+
   diff@8.0.4: {}
 
   dijkstrajs@1.0.3: {}
@@ -18979,6 +20612,15 @@ snapshots:
 
   dotenv@17.4.2: {}
 
+  downshift@7.6.2(react@19.2.6):
+    dependencies:
+      '@babel/runtime': 7.29.7
+      compute-scroll-into-view: 2.0.4
+      prop-types: 15.8.1
+      react: 19.2.6
+      react-is: 17.0.2
+      tslib: 2.8.1
+
   dunder-proto@1.0.1:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -19043,7 +20685,7 @@ snapshots:
   engine.io-client@6.6.5:
     dependencies:
       '@socket.io/component-emitter': 3.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io-parser: 5.2.3
       ws: 8.20.1
       xmlhttprequest-ssl: 2.1.2
@@ -19063,7 +20705,7 @@ snapshots:
       base64id: 2.0.0
       cookie: 0.7.2
       cors: 2.8.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io-parser: 5.2.3
       ws: 8.21.0
     transitivePeerDependencies:
@@ -19249,6 +20891,8 @@ snapshots:
 
   escape-string-regexp@4.0.0: {}
 
+  escape-string-regexp@5.0.0: {}
+
   escodegen@2.1.0:
     dependencies:
       esprima: 4.0.1
@@ -19292,7 +20936,7 @@ snapshots:
   eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.60.1(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       eslint: 8.57.1
       get-tsconfig: 4.14.0
       is-bun-module: 2.0.0
@@ -19420,7 +21064,7 @@ snapshots:
       ajv: 6.15.0
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -19470,6 +21114,13 @@ snapshots:
 
   estraverse@5.3.0: {}
 
+  estree-util-is-identifier-name@3.0.0: {}
+
+  estree-util-visit@2.0.0:
+    dependencies:
+      '@types/estree-jsx': 1.0.5
+      '@types/unist': 3.0.3
+
   estree-walker@3.0.3:
     dependencies:
       '@types/estree': 1.0.9
@@ -19650,7 +21301,7 @@ snapshots:
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -19703,7 +21354,7 @@ snapshots:
 
   extract-zip@2.0.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -19774,6 +21425,10 @@ snapshots:
     dependencies:
       reusify: 1.1.0
 
+  fault@2.0.1:
+    dependencies:
+      format: 0.2.2
+
   fb-watchman@2.0.2:
     dependencies:
       bser: 2.1.1
@@ -19854,7 +21509,7 @@ snapshots:
 
   finalhandler@2.1.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -19947,6 +21602,8 @@ snapshots:
       hasown: 2.0.4
       mime-types: 2.1.35
 
+  format@0.2.2: {}
+
   formdata-polyfill@4.0.10:
     dependencies:
       fetch-blob: 3.2.0
@@ -20100,7 +21757,7 @@ snapshots:
     dependencies:
       basic-ftp: 5.3.1
       data-uri-to-buffer: 6.0.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -20306,6 +21963,30 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
+  hast-util-to-jsx-runtime@2.3.6:
+    dependencies:
+      '@types/estree': 1.0.9
+      '@types/hast': 3.0.5
+      '@types/unist': 3.0.3
+      comma-separated-tokens: 2.0.3
+      devlop: 1.1.0
+      estree-util-is-identifier-name: 3.0.0
+      hast-util-whitespace: 3.0.0
+      mdast-util-mdx-expression: 2.0.1
+      mdast-util-mdx-jsx: 3.2.0
+      mdast-util-mdxjs-esm: 2.0.1
+      property-information: 7.2.0
+      space-separated-tokens: 2.0.2
+      style-to-js: 1.1.21
+      unist-util-position: 5.0.0
+      vfile-message: 4.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  hast-util-whitespace@3.0.0:
+    dependencies:
+      '@types/hast': 3.0.5
+
   he@1.2.0: {}
 
   headers-polyfill@5.0.1:
@@ -20365,6 +22046,8 @@ snapshots:
       is-self-closing: 1.0.1
       kind-of: 6.0.3
 
+  html-url-attributes@3.0.1: {}
+
   html2canvas@1.4.1:
     dependencies:
       css-line-break: 2.1.0
@@ -20381,7 +22064,7 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -20394,14 +22077,14 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -20486,6 +22169,8 @@ snapshots:
 
   ini@4.1.1: {}
 
+  inline-style-parser@0.2.7: {}
+
   input-format@0.3.14(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       prop-types: 15.8.1
@@ -20528,6 +22213,13 @@ snapshots:
     dependencies:
       hasown: 2.0.4
 
+  is-alphabetical@2.0.1: {}
+
+  is-alphanumerical@2.0.1:
+    dependencies:
+      is-alphabetical: 2.0.1
+      is-decimal: 2.0.1
+
   is-arguments@1.2.0:
     dependencies:
       call-bound: 1.0.4
@@ -20589,6 +22281,8 @@ snapshots:
       call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
+  is-decimal@2.0.1: {}
+
   is-descriptor@0.1.8:
     dependencies:
       is-accessor-descriptor: 1.0.2
@@ -20645,6 +22339,8 @@ snapshots:
     dependencies:
       is-extglob: 2.1.1
 
+  is-hexadecimal@2.0.1: {}
+
   is-in-ssh@1.0.0: {}
 
   is-inside-container@1.0.0:
@@ -20794,6 +22490,8 @@ snapshots:
 
   isobject@3.0.1: {}
 
+  isomorphic.js@0.2.5: {}
+
   isstream@0.1.2: {}
 
   istanbul-lib-coverage@3.2.2: {}
@@ -20826,7 +22524,7 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -21221,6 +22919,10 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  js-yaml@4.3.0:
+    dependencies:
+      argparse: 2.0.1
+
   jsbn@0.1.1: {}
 
   jsdom@25.0.1:
@@ -21399,6 +23101,16 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
+  lexical@0.48.0(typescript@5.9.3):
+    dependencies:
+      '@lexical/internal': 0.48.0(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+
+  lib0@0.2.117:
+    dependencies:
+      isomorphic.js: 0.2.5
+
   libphonenumber-js@1.13.6: {}
 
   libreoffice-convert@1.8.1:
@@ -21472,7 +23184,7 @@ snapshots:
     dependencies:
       chalk: 5.6.2
       commander: 13.1.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       execa: 8.0.1
       lilconfig: 3.1.3
       listr2: 8.3.3
@@ -21648,6 +23360,8 @@ snapshots:
       isobject: 3.0.1
       log-utils: 0.2.1
 
+  longest-streak@3.1.0: {}
+
   loose-envify@1.4.0:
     dependencies:
       js-tokens: 4.0.0
@@ -21730,8 +23444,165 @@ snapshots:
     dependencies:
       object-visit: 1.0.1
 
+  markdown-table@3.0.4: {}
+
   math-intrinsics@1.1.0: {}
 
+  mdast-util-directive@3.1.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
+      ccount: 2.0.1
+      devlop: 1.1.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+      parse-entities: 4.0.2
+      stringify-entities: 4.0.4
+      unist-util-visit-parents: 6.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-from-markdown@2.0.3:
+    dependencies:
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
+      decode-named-character-reference: 1.3.0
+      devlop: 1.1.0
+      mdast-util-to-string: 4.0.0
+      micromark: 4.0.2
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-decode-string: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      unist-util-stringify-position: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-frontmatter@2.0.1:
+    dependencies:
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      escape-string-regexp: 5.0.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+      micromark-extension-frontmatter: 2.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-gfm-strikethrough@2.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-gfm-table@2.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      markdown-table: 3.0.4
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-gfm-task-list-item@2.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-highlight-mark@1.2.2:
+    dependencies:
+      micromark-extension-highlight-mark: 1.2.0
+
+  mdast-util-mdx-expression@2.0.1:
+    dependencies:
+      '@types/estree-jsx': 1.0.5
+      '@types/hast': 3.0.5
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-mdx-jsx@3.2.0:
+    dependencies:
+      '@types/estree-jsx': 1.0.5
+      '@types/hast': 3.0.5
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
+      ccount: 2.0.1
+      devlop: 1.1.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+      parse-entities: 4.0.2
+      stringify-entities: 4.0.4
+      unist-util-stringify-position: 4.0.0
+      vfile-message: 4.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-mdx@3.0.0:
+    dependencies:
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-mdx-expression: 2.0.1
+      mdast-util-mdx-jsx: 3.2.0
+      mdast-util-mdxjs-esm: 2.0.1
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-mdxjs-esm@2.0.1:
+    dependencies:
+      '@types/estree-jsx': 1.0.5
+      '@types/hast': 3.0.5
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-phrasing@4.1.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      unist-util-is: 6.0.1
+
+  mdast-util-to-hast@13.2.1:
+    dependencies:
+      '@types/hast': 3.0.5
+      '@types/mdast': 4.0.4
+      '@ungap/structured-clone': 1.3.1
+      devlop: 1.1.0
+      micromark-util-sanitize-uri: 2.0.1
+      trim-lines: 3.0.1
+      unist-util-position: 5.0.0
+      unist-util-visit: 5.1.0
+      vfile: 6.0.3
+
+  mdast-util-to-markdown@2.1.2:
+    dependencies:
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
+      longest-streak: 3.1.0
+      mdast-util-phrasing: 4.1.0
+      mdast-util-to-string: 4.0.0
+      micromark-util-classify-character: 2.0.1
+      micromark-util-decode-string: 2.0.1
+      unist-util-visit: 5.1.0
+      zwitch: 2.0.4
+
+  mdast-util-to-string@4.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+
   mdn-data@2.0.14: {}
 
   media-engine@1.0.3: {}
@@ -21762,6 +23633,263 @@ snapshots:
 
   methods@1.1.2: {}
 
+  micromark-core-commonmark@2.0.3:
+    dependencies:
+      decode-named-character-reference: 1.3.0
+      devlop: 1.1.0
+      micromark-factory-destination: 2.0.1
+      micromark-factory-label: 2.0.1
+      micromark-factory-space: 2.0.1
+      micromark-factory-title: 2.0.1
+      micromark-factory-whitespace: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-chunked: 2.0.1
+      micromark-util-classify-character: 2.0.1
+      micromark-util-html-tag-name: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-resolve-all: 2.0.1
+      micromark-util-subtokenize: 2.1.0
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-directive@3.0.2:
+    dependencies:
+      devlop: 1.1.0
+      micromark-factory-space: 2.0.1
+      micromark-factory-whitespace: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      parse-entities: 4.0.2
+
+  micromark-extension-frontmatter@2.0.0:
+    dependencies:
+      fault: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-strikethrough@2.1.0:
+    dependencies:
+      devlop: 1.1.0
+      micromark-util-chunked: 2.0.1
+      micromark-util-classify-character: 2.0.1
+      micromark-util-resolve-all: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-table@2.1.1:
+    dependencies:
+      devlop: 1.1.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-task-list-item@2.1.0:
+    dependencies:
+      devlop: 1.1.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-highlight-mark@1.2.0:
+    dependencies:
+      micromark-util-chunked: 2.0.1
+      micromark-util-classify-character: 2.0.1
+      micromark-util-resolve-all: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      uvu: 0.5.6
+
+  micromark-extension-mdx-expression@3.0.1:
+    dependencies:
+      '@types/estree': 1.0.9
+      devlop: 1.1.0
+      micromark-factory-mdx-expression: 2.0.3
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-events-to-acorn: 2.0.3
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-mdx-jsx@3.0.2:
+    dependencies:
+      '@types/estree': 1.0.9
+      devlop: 1.1.0
+      estree-util-is-identifier-name: 3.0.0
+      micromark-factory-mdx-expression: 2.0.3
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-events-to-acorn: 2.0.3
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      vfile-message: 4.0.3
+
+  micromark-extension-mdx-md@2.0.0:
+    dependencies:
+      micromark-util-types: 2.0.2
+
+  micromark-extension-mdxjs-esm@3.0.0:
+    dependencies:
+      '@types/estree': 1.0.9
+      devlop: 1.1.0
+      micromark-core-commonmark: 2.0.3
+      micromark-util-character: 2.1.1
+      micromark-util-events-to-acorn: 2.0.3
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      unist-util-position-from-estree: 2.0.0
+      vfile-message: 4.0.3
+
+  micromark-extension-mdxjs@3.0.0:
+    dependencies:
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
+      micromark-extension-mdx-expression: 3.0.1
+      micromark-extension-mdx-jsx: 3.0.2
+      micromark-extension-mdx-md: 2.0.0
+      micromark-extension-mdxjs-esm: 3.0.0
+      micromark-util-combine-extensions: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-factory-destination@2.0.1:
+    dependencies:
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-factory-label@2.0.1:
+    dependencies:
+      devlop: 1.1.0
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-factory-mdx-expression@2.0.3:
+    dependencies:
+      '@types/estree': 1.0.9
+      devlop: 1.1.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-events-to-acorn: 2.0.3
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      unist-util-position-from-estree: 2.0.0
+      vfile-message: 4.0.3
+
+  micromark-factory-space@2.0.1:
+    dependencies:
+      micromark-util-character: 2.1.1
+      micromark-util-types: 2.0.2
+
+  micromark-factory-title@2.0.1:
+    dependencies:
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-factory-whitespace@2.0.1:
+    dependencies:
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-util-character@2.1.1:
+    dependencies:
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-util-chunked@2.0.1:
+    dependencies:
+      micromark-util-symbol: 2.0.1
+
+  micromark-util-classify-character@2.0.1:
+    dependencies:
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-util-combine-extensions@2.0.1:
+    dependencies:
+      micromark-util-chunked: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-util-decode-numeric-character-reference@2.0.2:
+    dependencies:
+      micromark-util-symbol: 2.0.1
+
+  micromark-util-decode-string@2.0.1:
+    dependencies:
+      decode-named-character-reference: 1.3.0
+      micromark-util-character: 2.1.1
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-symbol: 2.0.1
+
+  micromark-util-encode@2.0.1: {}
+
+  micromark-util-events-to-acorn@2.0.3:
+    dependencies:
+      '@types/estree': 1.0.9
+      '@types/unist': 3.0.3
+      devlop: 1.1.0
+      estree-util-visit: 2.0.0
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      vfile-message: 4.0.3
+
+  micromark-util-html-tag-name@2.0.1: {}
+
+  micromark-util-normalize-identifier@2.0.1:
+    dependencies:
+      micromark-util-symbol: 2.0.1
+
+  micromark-util-resolve-all@2.0.1:
+    dependencies:
+      micromark-util-types: 2.0.2
+
+  micromark-util-sanitize-uri@2.0.1:
+    dependencies:
+      micromark-util-character: 2.1.1
+      micromark-util-encode: 2.0.1
+      micromark-util-symbol: 2.0.1
+
+  micromark-util-subtokenize@2.1.0:
+    dependencies:
+      devlop: 1.1.0
+      micromark-util-chunked: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-util-symbol@2.0.1: {}
+
+  micromark-util-types@2.0.2: {}
+
+  micromark@4.0.2:
+    dependencies:
+      '@types/debug': 4.1.13
+      debug: 4.4.3(supports-color@8.1.1)
+      decode-named-character-reference: 1.3.0
+      devlop: 1.1.0
+      micromark-core-commonmark: 2.0.3
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-chunked: 2.0.1
+      micromark-util-combine-extensions: 2.0.1
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-encode: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-resolve-all: 2.0.1
+      micromark-util-sanitize-uri: 2.0.1
+      micromark-util-subtokenize: 2.1.0
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
+
   micromatch@3.1.10:
     dependencies:
       arr-diff: 4.0.0
@@ -22269,7 +24397,7 @@ snapshots:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       get-uri: 6.0.5
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
@@ -22297,6 +24425,16 @@ snapshots:
     dependencies:
       callsites: 3.1.0
 
+  parse-entities@4.0.2:
+    dependencies:
+      '@types/unist': 2.0.11
+      character-entities-legacy: 3.0.0
+      character-reference-invalid: 2.0.1
+      decode-named-character-reference: 1.3.0
+      is-alphanumerical: 2.0.1
+      is-decimal: 2.0.1
+      is-hexadecimal: 2.0.1
+
   parse-json@5.2.0:
     dependencies:
       '@babel/code-frame': 7.29.7
@@ -22599,6 +24737,8 @@ snapshots:
       object-assign: 4.1.1
       react-is: 16.13.1
 
+  property-information@7.2.0: {}
+
   proxy-addr@2.0.7:
     dependencies:
       forwarded: 0.2.0
@@ -22607,7 +24747,7 @@ snapshots:
   proxy-agent@6.5.0:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
       lru-cache: 7.18.3
@@ -22636,7 +24776,7 @@ snapshots:
     dependencies:
       '@puppeteer/browsers': 2.13.2
       chromium-bidi: 14.0.0(devtools-protocol@0.0.1608973)
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       devtools-protocol: 0.0.1608973
       typed-query-selector: 2.12.2
       webdriver-bidi-protocol: 0.4.1
@@ -22889,6 +25029,15 @@ snapshots:
       - '@babel/core'
       - react-is
 
+  react-css-nocode-editor@1.0.13(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6):
+    dependencies:
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      styled-components: 5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - react-is
+
   react-day-picker@8.10.2(date-fns@3.6.0)(react@19.2.6):
     dependencies:
       date-fns: 3.6.0
@@ -22980,10 +25129,30 @@ snapshots:
 
   react-is@16.13.1: {}
 
+  react-is@17.0.2: {}
+
   react-is@18.3.1: {}
 
   react-is@19.2.7: {}
 
+  react-markdown@9.1.0(@types/react@18.3.31)(react@19.2.6):
+    dependencies:
+      '@types/hast': 3.0.5
+      '@types/mdast': 4.0.4
+      '@types/react': 18.3.31
+      devlop: 1.1.0
+      hast-util-to-jsx-runtime: 2.3.6
+      html-url-attributes: 3.0.1
+      mdast-util-to-hast: 13.2.1
+      react: 19.2.6
+      remark-parse: 11.0.0
+      remark-rehype: 11.1.2
+      unified: 11.0.5
+      unist-util-visit: 5.1.0
+      vfile: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
   react-number-format@5.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       react: 18.3.1
@@ -23327,6 +25496,23 @@ snapshots:
     dependencies:
       isobject: 2.1.0
 
+  remark-parse@11.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      mdast-util-from-markdown: 2.0.3
+      micromark-util-types: 2.0.2
+      unified: 11.0.5
+    transitivePeerDependencies:
+      - supports-color
+
+  remark-rehype@11.1.2:
+    dependencies:
+      '@types/hast': 3.0.5
+      '@types/mdast': 4.0.4
+      mdast-util-to-hast: 13.2.1
+      unified: 11.0.5
+      vfile: 6.0.3
+
   remarkable@1.7.4:
     dependencies:
       argparse: 1.0.10
@@ -23462,7 +25648,7 @@ snapshots:
 
   router@2.2.0:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -23494,6 +25680,10 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  sade@1.8.1:
+    dependencies:
+      mri: 1.2.0
+
   safe-array-concat@1.1.4:
     dependencies:
       call-bind: 1.0.9
@@ -23580,7 +25770,7 @@ snapshots:
 
   send@1.2.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -23796,7 +25986,7 @@ snapshots:
 
   socket.io-adapter@2.5.8:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       ws: 8.21.0
     transitivePeerDependencies:
       - bufferutil
@@ -23806,7 +25996,7 @@ snapshots:
   socket.io-client@4.8.3:
     dependencies:
       '@socket.io/component-emitter': 3.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io-client: 6.6.5
       socket.io-parser: 4.2.6
     transitivePeerDependencies:
@@ -23817,7 +26007,7 @@ snapshots:
   socket.io-parser@4.2.6:
     dependencies:
       '@socket.io/component-emitter': 3.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -23826,7 +26016,7 @@ snapshots:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io: 6.6.9
       socket.io-adapter: 2.5.8
       socket.io-parser: 4.2.6
@@ -23838,7 +26028,7 @@ snapshots:
   socks-proxy-agent@8.0.5:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       socks: 2.8.9
     transitivePeerDependencies:
       - supports-color
@@ -23883,6 +26073,8 @@ snapshots:
 
   source-map@0.7.6: {}
 
+  space-separated-tokens@2.0.2: {}
+
   split-on-first@1.1.0: {}
 
   split-string@3.1.0:
@@ -24053,6 +26245,11 @@ snapshots:
     dependencies:
       safe-buffer: 5.2.1
 
+  stringify-entities@4.0.4:
+    dependencies:
+      character-entities-html4: 2.1.0
+      character-entities-legacy: 3.0.0
+
   stringify-object@5.0.0:
     dependencies:
       get-own-enumerable-keys: 1.0.0
@@ -24096,8 +26293,18 @@ snapshots:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.4.2
 
+  style-mod@4.1.3: {}
+
   style-object-to-css-string@1.1.3: {}
 
+  style-to-js@1.1.21:
+    dependencies:
+      style-to-object: 1.0.14
+
+  style-to-object@1.0.14:
+    dependencies:
+      inline-style-parser: 0.2.7
+
   styled-components@5.3.11(@babel/core@7.29.7)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6):
     dependencies:
       '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
@@ -24116,6 +26323,24 @@ snapshots:
     transitivePeerDependencies:
       - '@babel/core'
 
+  styled-components@5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6):
+    dependencies:
+      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@emotion/is-prop-valid': 1.4.0
+      '@emotion/stylis': 0.8.5
+      '@emotion/unitless': 0.7.5
+      babel-plugin-styled-components: 2.3.0(styled-components@5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6))(supports-color@5.5.0)
+      css-to-react-native: 3.2.0
+      hoist-non-react-statics: 3.3.2
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      react-is: 19.2.7
+      shallowequal: 1.1.0
+      supports-color: 5.5.0
+    transitivePeerDependencies:
+      - '@babel/core'
+
   styled-jsx@5.1.1(babel-plugin-macros@3.1.0)(react@18.3.1):
     dependencies:
       client-only: 0.0.1
@@ -24141,7 +26366,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.1
       cookiejar: 2.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       fast-safe-stringify: 2.1.1
       form-data: 4.0.5
       formidable: 3.5.4
@@ -24441,6 +26666,10 @@ snapshots:
 
   trim-canvas@0.1.2: {}
 
+  trim-lines@3.0.1: {}
+
+  trough@2.2.0: {}
+
   ts-api-utils@2.5.0(typescript@5.9.3):
     dependencies:
       typescript: 5.9.3
@@ -24650,7 +26879,7 @@ snapshots:
       app-root-path: 3.1.0
       buffer: 6.0.3
       dayjs: 1.11.21
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       dedent: 1.7.2(babel-plugin-macros@3.1.0)
       dotenv: 16.6.1
       glob: 10.5.0
@@ -24674,7 +26903,7 @@ snapshots:
       app-root-path: 3.1.0
       buffer: 6.0.3
       dayjs: 1.11.21
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       dedent: 1.7.2(babel-plugin-macros@3.1.0)
       dotenv: 16.6.1
       glob: 10.5.0
@@ -24727,6 +26956,20 @@ snapshots:
 
   unicorn-magic@0.3.0: {}
 
+  unidiff@1.0.4:
+    dependencies:
+      diff: 5.2.2
+
+  unified@11.0.5:
+    dependencies:
+      '@types/unist': 3.0.3
+      bail: 2.0.2
+      devlop: 1.1.0
+      extend: 3.0.2
+      is-plain-obj: 4.1.0
+      trough: 2.2.0
+      vfile: 6.0.3
+
   union-value@1.0.1:
     dependencies:
       arr-union: 3.1.0
@@ -24734,6 +26977,33 @@ snapshots:
       is-extendable: 0.1.1
       set-value: 2.0.1
 
+  unist-util-is@6.0.1:
+    dependencies:
+      '@types/unist': 3.0.3
+
+  unist-util-position-from-estree@2.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+
+  unist-util-position@5.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+
+  unist-util-stringify-position@4.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+
+  unist-util-visit-parents@6.0.2:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-is: 6.0.1
+
+  unist-util-visit@5.1.0:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-is: 6.0.1
+      unist-util-visit-parents: 6.0.2
+
   universal-cookie@8.1.2:
     dependencies:
       cookie: 1.1.1
@@ -24905,6 +27175,13 @@ snapshots:
 
   uuid@8.3.2: {}
 
+  uvu@0.5.6:
+    dependencies:
+      dequal: 2.0.3
+      diff: 5.2.2
+      kleur: 4.1.5
+      sade: 1.8.1
+
   v8-compile-cache-lib@3.0.1: {}
 
   v8-to-istanbul@9.3.0:
@@ -24934,6 +27211,16 @@ snapshots:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
+  vfile-message@4.0.3:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-stringify-position: 4.0.0
+
+  vfile@6.0.3:
+    dependencies:
+      '@types/unist': 3.0.3
+      vfile-message: 4.0.3
+
   victory-vendor@36.9.2:
     dependencies:
       '@types/d3-array': 3.2.2
@@ -24977,7 +27264,7 @@ snapshots:
   vite-node@2.1.9(@types/node@22.20.1)(lightningcss@1.32.0)(terser@5.48.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       es-module-lexer: 1.7.0
       pathe: 1.1.2
       vite: 5.4.21(@types/node@22.20.1)(lightningcss@1.32.0)(terser@5.48.0)
@@ -24995,7 +27282,7 @@ snapshots:
   vite-node@2.1.9(@types/node@24.13.1)(lightningcss@1.32.0)(terser@5.48.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       es-module-lexer: 1.7.0
       pathe: 1.1.2
       vite: 5.4.21(@types/node@24.13.1)(lightningcss@1.32.0)(terser@5.48.0)
@@ -25042,7 +27329,7 @@ snapshots:
       '@vitest/spy': 2.1.9
       '@vitest/utils': 2.1.9
       chai: 5.3.3
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       expect-type: 1.3.0
       magic-string: 0.30.21
       pathe: 1.1.2
@@ -25078,7 +27365,7 @@ snapshots:
       '@vitest/spy': 2.1.9
       '@vitest/utils': 2.1.9
       chai: 5.3.3
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       expect-type: 1.3.0
       magic-string: 0.30.21
       pathe: 1.1.2
@@ -25119,6 +27406,8 @@ snapshots:
       strip-ansi: 3.0.1
       wrap-ansi: 2.1.0
 
+  w3c-keyname@2.2.8: {}
+
   w3c-xmlserializer@5.0.0:
     dependencies:
       xml-name-validator: 5.0.0
@@ -25411,6 +27700,10 @@ snapshots:
 
   year@0.2.1: {}
 
+  yjs@13.6.32:
+    dependencies:
+      lib0: 0.2.117
+
   yn@3.1.1: {}
 
   yocto-queue@0.1.0: {}
@@ -25454,3 +27747,5 @@ snapshots:
       immer: 11.1.8
       react: 19.2.6
       use-sync-external-store: 1.6.0(react@19.2.6)
+
+  zwitch@2.0.4: {}
diff --git a/portal-content-contact.png b/portal-content-contact.png
new file mode 100644
index 000000000..dfbf73fc5
Binary files /dev/null and b/portal-content-contact.png differ
diff --git a/scripts/deploy/sync-env-from-env-manager.sh b/scripts/deploy/sync-env-from-env-manager.sh
new file mode 100644
index 000000000..6a405ab28
--- /dev/null
+++ b/scripts/deploy/sync-env-from-env-manager.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+# Sync .env files from the Env Manager API into the repo.
+#
+# Usage:
+#   ENV_MANAGER_TOKEN=xxx ./scripts/deploy/sync-env-from-server.sh freight-api freight-portal freight-backoffice
+#
+# You normally only need to pass the token via the action secret, and BRANCH
+# via the job-level env (e.g. `BRANCH: ${{ github.ref_name }}` in the workflow):
+#   env:
+#     BRANCH: ${{ github.ref_name }}
+#     ENV_MANAGER_TOKEN: ${{ secrets.ENV_MANAGER_TOKEN }}
+#
+# API layout (one endpoint per service):
+#   GET https://env.smart.aaca.gov.et/api/env/edr/<branch>/<service>?format=dotenv
+#   Header: Authorization: Bearer <ENV_MANAGER_TOKEN>
+set -euo pipefail
+
+PROJECT="edr"
+ENV_MANAGER_URL="https://env.smart.aaca.gov.et"
+BRANCH="${BRANCH:?BRANCH is required}"
+ENV_MANAGER_TOKEN="${ENV_MANAGER_TOKEN:?ENV_MANAGER_TOKEN is required}"
+
+declare -A SERVICE_ENV_TARGET=(
+  ["freight_api"]="apps/edr-freight-api/.env"
+  ["freight_portal"]="apps/edr-freight-web/portal/.env"
+  ["freight_backoffice"]="apps/edr-freight-web/backoffice/.env"
+  ["gps_tracker"]="apps/edr-gps-tracker/.env"
+  ["passenger_api"]="apps/edr-passenger-api/.env"
+  ["passenger_portal"]="apps/edr-passenger-web/portal/.env"
+  ["passenger_backoffice"]="apps/edr-passenger-web/backoffice/.env"
+  ["payment_api"]="apps/edr-payment-api/.env"
+)
+
+for service in "$@"; do
+  branch_api_name="${BRANCH//-/_}"
+  service_api_name="${service//-/_}"
+  dest="${SERVICE_ENV_TARGET[${service_api_name}]:-}"
+  if [[ -z "${dest}" ]]; then
+    echo "Unknown service: ${service}" >&2
+    exit 1
+  fi
+
+  url="${ENV_MANAGER_URL}/api/env/${PROJECT}/${branch_api_name}/${service_api_name}?format=dotenv"
+  mkdir -p "$(dirname "${dest}")"
+
+  tmp_file="$(mktemp)"
+  trap 'rm -f "${tmp_file}"' RETURN 2>/dev/null || true
+
+  http_status=$(curl -fsS -o "${tmp_file}" -w "%{http_code}" \
+    -H "Authorization: Bearer ${ENV_MANAGER_TOKEN}" \
+    "${url}") || {
+      echo "Failed to fetch env for '${service}' from ${url}" >&2
+      rm -f "${tmp_file}"
+      exit 1
+    }
+
+  if [[ "${http_status}" != "200" ]]; then
+    echo "Env Manager returned HTTP ${http_status} for '${service}' (${url})" >&2
+    rm -f "${tmp_file}"
+    exit 1
+  fi
+
+  if [[ ! -s "${tmp_file}" ]]; then
+    echo "Env Manager returned an empty response for '${service}' (${url})" >&2
+    rm -f "${tmp_file}"
+    exit 1
+  fi
+
+  mv "${tmp_file}" "${dest}"
+  echo "Synced ${url} -> ${dest}"
+
+  port_value=$(sed -n -E 's/^[[:space:]]*PORT[[:space:]]*=[[:space:]]*"?([^"#]+)"?[[:space:]]*(#.*)?$/\1/p' "${dest}" | head -n1 | tr -d '[:space:]')
+  if [[ -z "${port_value}" ]]; then
+    echo "Missing required PORT in env file for '${service}' (${dest})" >&2
+    exit 1
+  fi
+
+  if [[ -n "${GITHUB_ENV:-}" ]]; then
+    service_var=$(echo "${service}" | tr '[:lower:]-' '[:upper:]_')
+    echo "${service_var}_PORT=${port_value}" >> "${GITHUB_ENV}"
+    echo "Exported ${service_var}_PORT from ${dest}"
+    # Forward NEXT_PUBLIC_* and VITE_* vars so docker compose build can inject them as build args.
+    grep -E '^[[:space:]]*(NEXT_PUBLIC_|VITE_)[A-Za-z0-9_]+=' "${dest}" \
+      | sed -E 's/^[[:space:]]*//' >> "${GITHUB_ENV}" || true
+  fi
+done