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 1cef9528c..3809dc086 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 @@ -157,13 +157,13 @@ export class BookingLifecycleNotifierService { }); } - /** Clearance finalized → customer can proceed to request operation. */ + /** Document approval finalized → customer can proceed to request operation. */ clearanceReady(b: Booking): void { const msg = - `Clearance for booking ${b.reference} is complete. ` + + `Document approval for booking ${b.reference} is finalized. ` + `You can now proceed to request operation from the portal.`; - void this.notifyContact(b, msg, 'CLEARANCE READY'); - this.inApp(b, 'Clearance complete', msg, { + void this.notifyContact(b, msg, 'DOCUMENT APPROVAL FINALIZED'); + this.inApp(b, 'Document approval finalized', msg, { type: NotificationType.CLEARANCE_DECISION, }); } diff --git a/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts index d752d071a..029952f45 100644 --- a/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts +++ b/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts @@ -456,7 +456,7 @@ export class ContractClearanceService { const allowed = ['CLEARANCE_UNDER_REVIEW', 'AWAITING_CLEARANCE_DOCUMENTS']; if (!allowed.includes(contract.status)) { throw new ConflictException( - `Cannot finalize clearance on status "${contract.status}".`, + `Cannot finalize document approval on status "${contract.status}".`, ); } } diff --git a/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx b/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx index 3dcf1ea9e..501e074e2 100644 --- a/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx +++ b/apps/edr-freight-web/backoffice/src/components/bookings/detail/ClearanceReviewSection.tsx @@ -135,12 +135,14 @@ export function ClearanceReviewSection({ const finalizeMutation = useMutation({ mutationFn: () => bookingsService.finalizeClearance(bookingId), onSuccess: () => { - toast.success("Clearance finalized"); + toast.success("Document approval finalized"); refresh(); }, onError: (e) => toast.error( - e instanceof Error ? e.message : "Could not finalize clearance", + e instanceof Error + ? e.message + : "Could not finalize document approval", ), }); @@ -366,7 +368,7 @@ export function ClearanceReviewSection({ }> {finalizeMutation.error instanceof Error ? finalizeMutation.error.message - : "Could not finalize clearance."} + : "Could not finalize document approval."} )} @@ -445,7 +447,7 @@ export function ClearanceReviewSection({ loading={finalizeMutation.isPending} onClick={() => finalizeMutation.mutate()} > - Finalize clearance + Finalize document approval 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 c85dc0b07..c7d668ade 100644 --- a/apps/edr-freight-web/backoffice/src/components/contracts/ContractClearanceReviewSection.tsx +++ b/apps/edr-freight-web/backoffice/src/components/contracts/ContractClearanceReviewSection.tsx @@ -68,7 +68,7 @@ export interface ContractClearanceReviewSectionProps { queriesLocked?: boolean; /** * ONE_TIME customs contracts use the phased milestone workflow. Hides the - * legacy "Finalize clearance" shortcut; booking readiness follows delivery + * legacy "Finalize document approval" shortcut; booking readiness follows delivery * order (import) or export release. */ phasedCustoms?: boolean; @@ -393,7 +393,7 @@ export function ContractClearanceReviewSection({ }> {finalizeClearance.error instanceof Error ? finalizeClearance.error.message - : "Could not finalize clearance."} + : "Could not finalize document approval."} )} @@ -482,7 +482,7 @@ export function ContractClearanceReviewSection({ }) } > - Finalize clearance + Finalize document approval diff --git a/apps/edr-freight-web/backoffice/src/components/trainBuilder/BuildTrainModal.tsx b/apps/edr-freight-web/backoffice/src/components/trainBuilder/BuildTrainModal.tsx index 05b4bd546..925ff528d 100644 --- a/apps/edr-freight-web/backoffice/src/components/trainBuilder/BuildTrainModal.tsx +++ b/apps/edr-freight-web/backoffice/src/components/trainBuilder/BuildTrainModal.tsx @@ -160,7 +160,8 @@ export default function BuildTrainModal({ opened, onClose, onBuilt }: BuildTrain onChange={(value) => setImportTrainNumber(value ?? "")} searchable clearable - nothingFoundMessage="No free run numbers — add more in Dropdown Settings" + nothingFoundMessage={importNumbers.emptyMessage} + error={importNumbers.settingMissing ? importNumbers.emptyMessage : undefined} />