Merge branch 'dev'

apps/edr-freight-api/src/seed/approved-first-lastmile-demo-bookings.seeder.ts

@@ -247,9 +247,6 @@ export class ApprovedFirstLastMileDemoBookingsSeeder {
           website: null,
           contactPersonName: 'First Last Mile Demo',
           contactPersonPhone: '251900000101',
-          generalManagerName: 'Demo Manager',
-          generalManagerEmail: COMPANY_EMAIL,
-          generalManagerPhone: '251900000101',
         },
         { conflictPaths: { tin: true } },
       );

apps/edr-freight-api/src/seed/demo-bookings.seeder.ts

@@ -324,9 +324,6 @@ export class DemoBookingsSeeder {
           website: null,
           contactPersonName: "Train Scheduling",
           contactPersonPhone: "251900000001",
-          generalManagerName: "Demo Manager",
-          generalManagerEmail: COMPANY_EMAIL,
-          generalManagerPhone: "251900000001",
         },
         { conflictPaths: { tin: true } },
       );

apps/edr-freight-api/src/seed/file-upload-settings.seeder.ts

@@ -154,6 +154,31 @@ const FOREIGN_ONBOARDING_FIELDS: OnboardingField[] = [
 //   },
 // ];
 
+/**
+ * Extra documents a co-operative union or farm provides, merged on top of its
+ * nationality set. It has a TIN but no business licence, so the papers that
+ * evidence the co-operative itself stand in for the trade licence every other
+ * company uploads.
+ *
+ * Only the registration certificate is seeded, and the set is admin-managed
+ * like every other onboarding set — what these members must actually produce
+ * is a backoffice decision, edited in the file-settings editor.
+ */
+const COOPERATIVE_ONBOARDING_FIELDS: OnboardingField[] = [
+  {
+    fileKey: "cooperative_registration_certificate",
+    fileLabel: "Co-operative Union / Farm Registration Certificate",
+    helpText:
+      "Certificate issued by the co-operative promotion agency that registered the union or farm.",
+    isRequired: true,
+    isMultiple: false,
+    maxFiles: 1,
+    allowedExtensions: DOC_EXTENSIONS,
+    maxSizeMb: 50,
+    displayOrder: 1,
+  },
+];
+
 interface OnboardingDocumentSetting {
   code: string;
   label: string;
@@ -176,6 +201,14 @@ const COMPANY_ONBOARDING_DOCUMENTS: OnboardingDocumentSetting[] = [
     entity: "customer",
     fields: FOREIGN_ONBOARDING_FIELDS,
   },
+  // Additive, not a nationality of its own: a union or farm still uploads
+  // everything its nationality set demands, and these on top.
+  {
+    code: "company_onboarding_documents_cooperative",
+    label: "Co-operative union / farm onboarding documents (additional)",
+    entity: "customer",
+    fields: COOPERATIVE_ONBOARDING_FIELDS,
+  },
   // Legacy per-company-type codes — removed, unused by any resolver or portal
   // lookup (only `company_onboarding_documents_ethiopian`/`_foreign` are live).
   // {

apps/edr-freight-api/src/seed/freight-permissions.registry.ts

@@ -1187,6 +1187,31 @@ export const CONFIG_SETTINGS_PERMISSIONS: FreightPermissionSeed[] = [
     "edr_freight_app:settings:dropdown:manage",
     "Manage dropdown settings",
   ),
+  perm(
+    "b4b00002-0001-4000-8000-000000000001",
+    "edr_freight_app:settings:stamp:view",
+    "View stamp settings",
+  ),
+  perm(
+    "b4b00002-0001-4000-8000-000000000002",
+    "edr_freight_app:settings:stamp:manage",
+    "Manage stamp settings",
+  ),
+  perm(
+    "b4b00003-0001-4000-8000-000000000001",
+    "edr_freight_app:settings:invoice_stamp:view",
+    "View invoice stamp settings",
+  ),
+  perm(
+    "b4b00003-0001-4000-8000-000000000002",
+    "edr_freight_app:settings:invoice_stamp:manage",
+    "Manage invoice stamp 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
@@ -1299,7 +1324,10 @@ export const GRANULAR_SPLIT_PERMISSIONS: FreightPermissionSeed[] = [
     "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.
+  // `read` is API-read-only for other pages that display template data — and is
+  // NOT written out here: deriveReadPermissions mints the `:read` twin of every
+  // `:view` key, so a hand-written one duplicates the key (Postgres 21000 on the
+  // seeder's ON CONFLICT (key) insert) and carries a v4 id where twins are v5.
   perm(
     "b4e00001-0001-4000-8000-000000000003",
     "edr_freight_app:settings:contract_templates:create",
@@ -1315,11 +1343,6 @@ export const GRANULAR_SPLIT_PERMISSIONS: FreightPermissionSeed[] = [
     "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",
@@ -1884,6 +1907,16 @@ export const FREIGHT_PERMS = {
       view: "edr_freight_app:settings:dropdown:view",
       manage: "edr_freight_app:settings:dropdown:manage",
     },
+    stamp: {
+      view: "edr_freight_app:settings:stamp:view",
+      manage: "edr_freight_app:settings:stamp:manage",
+    },
+    // Company stamp/seal image stamped onto invoice/receipt PDFs — separate
+    // from `stamp` above, which is the per-employee approval-record teeter.
+    invoiceStamp: {
+      view: "edr_freight_app:settings:invoice_stamp:view",
+      manage: "edr_freight_app:settings:invoice_stamp:manage",
+    },
     exchangeRate: {
       view: "edr_freight_app:settings:exchange_rate:view",
       manage: "edr_freight_app:settings:exchange_rate:manage",
@@ -2293,7 +2326,8 @@ export const POSITION_PERMISSION_PRESETS = {
     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.
+  // operation officer/chief hold), on top of the approval-chain role preset,
+  // and carries the same full warehouse authority the chief tier holds.
   director: dedupe([
     ...ROLE_PERMISSION_PRESETS.director,
     FREIGHT_PERMS.trainScheduling.view,
@@ -2306,6 +2340,18 @@ export const POSITION_PERMISSION_PRESETS = {
     FREIGHT_PERMS.fleet.view,
     FREIGHT_PERMS.fleet.manage,
     ...FLEET_GRANULAR_KEYS,
+    // Warehouse — full CRUD, matching the chief tier. Unlike the dispatcher,
+    // the director also owns the allocation and fee rules themselves.
+    FREIGHT_PERMS.warehouseDashboard.view,
+    ...Object.values(FREIGHT_PERMS.warehouses),
+    ...Object.values(FREIGHT_PERMS.warehouseYards),
+    ...Object.values(FREIGHT_PERMS.warehouseZones),
+    ...Object.values(FREIGHT_PERMS.warehouseAllocationRules),
+    ...Object.values(FREIGHT_PERMS.warehouseFeeRules),
+    ...Object.values(FREIGHT_PERMS.warehouseInventory),
+    ...Object.values(FREIGHT_PERMS.warehouseInspectionReports),
+    ...Object.values(FREIGHT_PERMS.interchangeDocuments),
+    ...Object.values(FREIGHT_PERMS.warehouseFeeInvoices),
   ]),
   ceo: dedupe([...ROLE_PERMISSION_PRESETS.ceo]),
   ethiopianGl: dedupe([...ROLE_PERMISSION_PRESETS.glEthiopia]),

apps/edr-freight-api/src/seed/paid-import-export-mile-demo.seeder.ts

@@ -175,9 +175,6 @@ export class PaidImportExportMileDemoSeeder {
           website: null,
           contactPersonName: 'Paid Mile Demo',
           contactPersonPhone: '251900000202',
-          generalManagerName: 'Demo Manager',
-          generalManagerEmail: COMPANY_EMAIL,
-          generalManagerPhone: '251900000202',
         },
         { conflictPaths: { tin: true } },
       );