From 5bf82bf53111a7899a0f12a7b60893b65e675595 Mon Sep 17 00:00:00 2001 From: Nathnael Date: Mon, 20 Jul 2026 11:28:18 +0000 Subject: [PATCH] fix: notify the backoffice of new booking --- .../booking-lifecycle-notifier.service.ts | 13 +++++ .../contract-booking.completion.spec.ts | 1 + .../contract-booking.consolidation.spec.ts | 1 + .../contracts/contract-booking.service.ts | 14 +++++- .../src/pages/accounts/CompanyProfileForm.tsx | 48 ++++++++++++++----- 5 files changed, 64 insertions(+), 13 deletions(-) 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..44c51e4c1 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 @@ -253,6 +253,19 @@ export class BookingLifecycleNotifierService { // ── Staff-facing (backoffice inbox) ──────────────────────────────────────── + /** + * A booking was created under a contract. Contract drawdowns never pass + * through submit, so this is the only point at which staff learn the booking + * exists — {@link submittedToStaff} covers the direct-booking flow instead. + */ + createdToStaff(b: Booking): void { + this.inAppStaff( + b, + 'New booking created', + `Booking ${this.ref(b)} was created under a contract and has entered the pipeline.`, + ); + } + /** Customer submitted a booking for review. */ submittedToStaff(b: Booking): void { this.inAppStaff( diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts index 4f3deb513..7f0aaabea 100644 --- a/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts +++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts @@ -27,6 +27,7 @@ describe('ContractBookingService — quantity-cap completion', () => { {} as never, // workflowService {} as never, // invoiceService {} as never, // clearanceFeeService + { createdToStaff: jest.fn() } as never, // bookingNotifier {} as never, // dataSource {} as never, // trainSchedulingService {} as never, // bookingBatchService diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts index f28468936..68c02fa7d 100644 --- a/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts +++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts @@ -58,6 +58,7 @@ describe('ContractBookingService — drawdown consolidation gate', () => { {} as never, // workflowService invoiceService as never, {} as never, // clearanceFeeService + { createdToStaff: jest.fn() } as never, // bookingNotifier {} as never, // dataSource {} as never, // trainSchedulingService {} as never, // bookingBatchService 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 fd1f530b8..e230380f0 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 @@ -18,6 +18,7 @@ import { BookingContainerUnit } from '../bookings/entities/booking-container-uni import { BookingsRepository } from '../bookings/bookings.repository'; import { BookingPricingService } from '../bookings/booking-pricing.service'; import { BookingTransitionService } from '../bookings/booking-transition.service'; +import { BookingLifecycleNotifierService } from '../bookings/booking-lifecycle-notifier.service'; import { ConsolidationService } from '../bookings/consolidation.service'; import { PriceLineItemDto } from '../bookings/dto/generate-price-response.dto'; import { BookingInvoiceService } from '../bookings/booking-invoice.service'; @@ -97,6 +98,7 @@ export class ContractBookingService { private readonly workflowService: ClearanceWorkflowService, private readonly invoiceService: BookingInvoiceService, private readonly clearanceFeeService: ClearanceFeeService, + private readonly bookingNotifier: BookingLifecycleNotifierService, private readonly dataSource: DataSource, @Inject(forwardRef(() => TrainSchedulingService)) private readonly trainSchedulingService: TrainSchedulingService, @@ -352,6 +354,12 @@ export class ContractBookingService { const withContainers = await this.bookingsRepository.findByIdWithFiles( booking.id, ); + + // Tell staff the booking exists. Placed after the zero-price rollback (which + // hard-deletes the row) and before the consolidation gate, so it fires + // exactly once whether the booking parks for a partner or finalizes inline. + this.bookingNotifier.createdToStaff(withContainers ?? booking); + const intendedStatus = generalCustoms || generalSelfClear ? 'AWAITING_DOCUMENTS' @@ -481,6 +489,7 @@ export class ContractBookingService { ); const result = await this.bookingsRepository.findByIdWithFiles(booking.id); + this.bookingNotifier.createdToStaff(result ?? booking); return { booking: result ?? booking, warnings: [] }; } @@ -568,7 +577,10 @@ export class ContractBookingService { await this.clearanceFeeService.issueForBooking(booking, contract); } - return (await this.bookingsRepository.findByIdWithFiles(booking.id)) ?? booking; + const created = + (await this.bookingsRepository.findByIdWithFiles(booking.id)) ?? booking; + this.bookingNotifier.createdToStaff(created); + return created; } /** 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 47c00bef2..bef027c78 100644 --- a/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx +++ b/apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx @@ -9,10 +9,11 @@ import { Stack, Text, TextInput, + Tooltip, } from "@mantine/core"; import { zodResolver } from "@hookform/resolvers/zod"; import { useQuery } from "@tanstack/react-query"; -import { AlertCircle, ArrowLeft, ArrowRight } from "lucide-react"; +import { AlertCircle, ArrowLeft, ArrowRight, Info } from "lucide-react"; import { useEffect, useMemo, useRef, useState } from "react"; import { Controller, useForm } from "react-hook-form"; @@ -293,22 +294,28 @@ export default function CompanyProfileForm({ const [contactSameAsGm, setContactSameAsGm] = useState(false); const [poaSameAsContact, setPoaSameAsContact] = useState(false); - // General Manager source: the eTrade-registered business owner when a TIN - // lookup found one, otherwise the registering user's own account details. + // 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"); const gmSourceName = etradeOwner?.name ?? user.name?.en ?? ""; - const gmSourcePhone = etradeOwner - ? etradeOwner.phone - : toEthiopianE164(user.phoneNumber); + const gmSourceEmail = companyEmail || user.email || ""; + const gmSourcePhone = + companyPhone || etradeOwner?.phone || toEthiopianE164(user.phoneNumber) || ""; useEffect(() => { if (!gmSameAsOwner) return; setValue("generalManagerName", gmSourceName, { shouldValidate: true }); - setValue("generalManagerEmail", user.email ?? "", { shouldValidate: true }); - setValue("generalManagerPhone", gmSourcePhone ?? "", { + setValue("generalManagerEmail", gmSourceEmail, { shouldValidate: true }); + setValue("generalManagerPhone", gmSourcePhone, { shouldValidate: true, }); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [gmSameAsOwner, gmSourceName, gmSourcePhone, user.email]); + }, [gmSameAsOwner, gmSourceName, gmSourceEmail, gmSourcePhone]); const toggleGmSameAsOwner = (checked: boolean) => { setGmSameAsOwner(checked); @@ -624,7 +631,24 @@ export default function CompanyProfileForm({ {...register("vatNumber")} /> + FAN Number (16 digits) + + + + + } placeholder="1234567890123456" maxLength={16} error={errors.fanNumber?.message} @@ -743,8 +767,8 @@ export default function CompanyProfileForm({ title="Same as business owner" description={ etradeOwner - ? "Reuse the eTrade-registered owner's name and phone (email from your account). Uncheck to enter different details." - : "Reuse your account's name, email and phone. Uncheck to enter different details." + ? "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." } />