` form.
*
* Shared so a GRN raised at a load/unload facility is indistinguishable from one
* raised in a warehouse — the two live in different tables
* (facility_handling_events vs warehouse_inventory), and a second generator would
* eventually let their formats drift apart.
*/
-export function generateGrnNumber(direction: string, referenceId: string, date: Date): string {
+export function generateGrnNumber(
+ direction: string,
+ referenceId: string,
+ date: Date,
+ ownerName?: string | null,
+): string {
const stamp = date.toISOString().slice(0, 10).replace(/-/g, '');
const suffix = referenceId.replace(/-/g, '').slice(0, 8).toUpperCase();
- return `GRN-${direction.toUpperCase()}-${stamp}-${suffix}`;
+ const owner = grnOwnerSlug(ownerName);
+ const base = `GRN-${direction.toUpperCase()}-${stamp}`;
+ return owner ? `${base}-${owner}-${suffix}` : `${base}-${suffix}`;
+}
+
+/**
+ * Owner name → GRN-safe token: letters/digits only, upper-cased, capped so a
+ * long company name can't run away with the number. Null when there is nothing
+ * usable, which drops the segment rather than emitting an empty `--`.
+ */
+export function grnOwnerSlug(ownerName?: string | null): string | null {
+ const slug = (ownerName ?? '')
+ .normalize('NFKD')
+ .replace(/[^a-zA-Z0-9]+/g, '')
+ .toUpperCase()
+ .slice(0, 12);
+ return slug || null;
}
diff --git a/apps/edr-freight-api/src/common/mile-financials.util.ts b/apps/edr-freight-api/src/common/mile-financials.util.ts
index 2f5288048..f22e86925 100644
--- a/apps/edr-freight-api/src/common/mile-financials.util.ts
+++ b/apps/edr-freight-api/src/common/mile-financials.util.ts
@@ -8,6 +8,8 @@ type MileRecord = {
bookingContainers?: Array<{
units?: Array<{ vgmTons?: number | string | null }> | null;
}> | null;
+ /** Attached here: the train schedule the booking rides, for mile alignment. */
+ trainSchedule?: { trainNumber: string | null; departureDate: string | null } | null;
} | null;
};
@@ -36,6 +38,38 @@ export async function attachMileFinancials(
if (unitTons > 0) b.cargoTotalWeightVgm = Number(unitTons.toFixed(3));
}
+ // Train alignment: which schedule each booking rides (mile pickups/deliveries
+ // are planned against the train's departure).
+ const bookingIds = [...new Set(records.map((r) => r.bookingId).filter(Boolean))] as string[];
+ if (bookingIds.length) {
+ const schedules: Array<{
+ bookingId: string;
+ trainNumber: string | null;
+ departureDate: string | null;
+ }> = await dataSource.query(
+ `SELECT DISTINCT ON (tsb.booking_id)
+ tsb.booking_id AS "bookingId",
+ ts.train_number AS "trainNumber",
+ COALESCE(ts.actual_departure_at, ts.scheduled_departure_date)::text AS "departureDate"
+ FROM freight.train_schedule_bookings tsb
+ JOIN freight.train_schedules ts
+ ON ts.id = tsb.train_schedule_id AND ts.deleted_at IS NULL
+ WHERE tsb.booking_id = ANY($1::uuid[]) AND tsb.deleted_at IS NULL
+ ORDER BY tsb.booking_id, tsb.created_at DESC`,
+ [bookingIds],
+ );
+ const byBookingSchedule = new Map(schedules.map((s) => [s.bookingId, s]));
+ for (const r of records) {
+ const s = r.bookingId ? byBookingSchedule.get(r.bookingId) : undefined;
+ if (r.booking && s) {
+ r.booking.trainSchedule = {
+ trainNumber: s.trainNumber,
+ departureDate: s.departureDate,
+ };
+ }
+ }
+ }
+
const needAdvance = records.filter(
(r) => r.bookingId && !(Number(r.advancedPayment) > 0),
);
diff --git a/apps/edr-freight-api/src/common/rule-engine-guards.ts b/apps/edr-freight-api/src/common/rule-engine-guards.ts
index 14c0385ee..ba8096b5b 100644
--- a/apps/edr-freight-api/src/common/rule-engine-guards.ts
+++ b/apps/edr-freight-api/src/common/rule-engine-guards.ts
@@ -13,9 +13,22 @@ export const RuleEngineView = (slug: RuleEngineResourceSlug) =>
UseGuards(JwtGuard, FreightPermissionGuard([FREIGHT_PERMS.ruleEngine.view(slug)])),
);
-export const RuleEngineManage = (slug: RuleEngineResourceSlug) =>
+// Granular CRUD replaces the retired coarse RuleEngineManage. Each write
+// endpoint carries the specific action it performs — create on POST-new,
+// update on PATCH / reorder / move-order, delete on DELETE.
+export const RuleEngineCreate = (slug: RuleEngineResourceSlug) =>
applyDecorators(
- UseGuards(JwtGuard, FreightPermissionGuard([FREIGHT_PERMS.ruleEngine.manage(slug)])),
+ UseGuards(JwtGuard, FreightPermissionGuard([FREIGHT_PERMS.ruleEngine.create(slug)])),
+ );
+
+export const RuleEngineUpdate = (slug: RuleEngineResourceSlug) =>
+ applyDecorators(
+ UseGuards(JwtGuard, FreightPermissionGuard([FREIGHT_PERMS.ruleEngine.update(slug)])),
+ );
+
+export const RuleEngineDelete = (slug: RuleEngineResourceSlug) =>
+ applyDecorators(
+ UseGuards(JwtGuard, FreightPermissionGuard([FREIGHT_PERMS.ruleEngine.delete(slug)])),
);
/**
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 363008660..eb9541d8e 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
@@ -1,4 +1,5 @@
import { Injectable, NotFoundException } from '@nestjs/common';
+import { hazardClassLabel } from '@edr/types';
import { ContractsRepository } from '../modules/contracts/contracts.repository';
import {
@@ -30,6 +31,8 @@ export interface ContractDocumentSignatureView {
signerDisplayName: string;
signedAt: string;
signatureImageUrl?: string | null;
+ /** Company stamp/seal; rendered next to the signature when present. */
+ stampImageUrl?: string | null;
}
/** A single unit-rate row on the contract PDF — price per unit, NO total. */
@@ -141,6 +144,11 @@ export class ContractDocumentViewModelBuilder {
const hasCustomer = signatures.some((s) => s.role === 'CUSTOMER');
const hasStaff = signatures.some((s) => s.role === 'STAFF');
+ // Signed before company stamps were required — the customer has to sign
+ // again to attach one, otherwise EDR can never counter-sign the contract.
+ const customerStampMissing = signatures.some(
+ (s) => s.role === 'CUSTOMER' && !s.stampImageUrl,
+ );
const hasContractFile = Boolean(
contract.files?.some((f) => f.code === 'contract'),
);
@@ -183,7 +191,9 @@ export class ContractDocumentViewModelBuilder {
// Cast: contract signers (CUSTOMER|STAFF|DIRECTOR|CEO) widen the booking
// view-model's narrower CUSTOMER|STAFF role union.
signatures: signatures as unknown as ContractViewModel['signatures'],
- canSignCustomer: contract.status === 'CONTRACT_READY' && !hasCustomer,
+ canSignCustomer:
+ (contract.status === 'CONTRACT_READY' && !hasCustomer) ||
+ (contract.status === 'SIGNED_CUSTOMER' && customerStampMissing),
canSignStaff:
contract.status === 'SIGNED_CUSTOMER' && hasCustomer && !hasStaff,
hasContractDocument: hasContractFile,
@@ -208,6 +218,7 @@ export class ContractDocumentViewModelBuilder {
signerDisplayName: row.signerDisplayName,
signedAt: this.formatDate(row.signedAt),
signatureImageUrl: row.signatureFile?.url ?? null,
+ stampImageUrl: row.stampFile?.url ?? null,
};
}
@@ -292,7 +303,16 @@ export class ContractDocumentViewModelBuilder {
cargoDescription: this.valueOrDash(cargoName),
totalWeightVgm: '—',
equipmentReturn: this.valueOrDash(contract.equipmentReturn),
- hazardousLabel: contract.isHazardous ? 'Yes' : 'No',
+ // A hazardous contract names the declared class + UN number on the
+ // schedule — the flag alone is not a dangerous-goods declaration.
+ hazardousLabel: contract.isHazardous
+ ? [
+ hazardClassLabel(contract.hazardClass) ?? 'Yes',
+ contract.unNumber ? `UN ${contract.unNumber}` : null,
+ ]
+ .filter(Boolean)
+ .join(' · ')
+ : 'No',
firstMilePickupAddress: this.valueOrDash(contract.firstMilePickupAddress),
lastMileDeliveryAddress: this.valueOrDash(contract.lastMileDeliveryAddress),
};
diff --git a/apps/edr-freight-api/src/contracts/templates/_partials/signatures_block.hbs b/apps/edr-freight-api/src/contracts/templates/_partials/signatures_block.hbs
index 05dd450e4..59cfceb0b 100644
--- a/apps/edr-freight-api/src/contracts/templates/_partials/signatures_block.hbs
+++ b/apps/edr-freight-api/src/contracts/templates/_partials/signatures_block.hbs
@@ -11,6 +11,12 @@
Name: {{signerDisplayName}}
Role: Authorized EDR representative
Date: {{signedAt}}
+ {{#if stampImageUrl}}
+
+ {{/if}}
{{/if}}
{{/each}}
{{else}}
@@ -32,6 +38,12 @@
Name: {{signerDisplayName}}
Role: Authorized client representative
Date: {{signedAt}}
+ {{#if stampImageUrl}}
+
+ {{/if}}
{{/if}}
{{/each}}
{{else}}
diff --git a/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs b/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs
index 118606065..d9bc9927f 100644
--- a/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs
+++ b/apps/edr-freight-api/src/contracts/templates/_partials/styles.hbs
@@ -372,25 +372,30 @@
font-size: 9pt;
margin: 4px 0;
}
-
- /* ── Witnesses ────────────────────────────────────────────────────────── */
- .witnesses { margin-top: 20px; }
- .witness-table {
- font-size: 9.5pt;
- margin-top: 6px;
+ .sig-stamp {
+ margin-top: 12px;
}
- .witness-table th,
- .witness-table td {
- border-bottom: 1px solid #c9e4d9;
- padding: 9px 8px;
- text-align: left;
- }
- .witness-table th {
+ .sig-stamp-label {
color: #0e5b45;
font-family: Arial, sans-serif;
- font-size: 8.5pt;
+ font-size: 7.5pt;
+ font-weight: 700;
+ letter-spacing: 0.4pt;
text-transform: uppercase;
}
+ .sig-stamp-box {
+ align-items: center;
+ display: flex;
+ height: 30mm;
+ justify-content: center;
+ margin-top: 5px;
+ }
+ .sig-stamp-box img {
+ display: block;
+ max-height: 30mm;
+ max-width: 45mm;
+ mix-blend-mode: multiply;
+ }
@media print {
body { background: #fff; }
diff --git a/apps/edr-freight-api/src/contracts/templates/edr-dynamic.hbs b/apps/edr-freight-api/src/contracts/templates/edr-dynamic.hbs
index 0e06d9f7b..9c4957b2b 100644
--- a/apps/edr-freight-api/src/contracts/templates/edr-dynamic.hbs
+++ b/apps/edr-freight-api/src/contracts/templates/edr-dynamic.hbs
@@ -147,19 +147,6 @@
authorized to sign and execute this Contract Agreement.
{{> signatures_block}}
-
-
-
Witnesses
-
-
- | Name | Signature | Date |
|---|
-
-
- | 1. | | | |
- | 2. | | | |
-
-
-
+