Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
natib21
2026-07-02 10:33:32 +00:00
parent 4e4d81479b
commit 4519a1d75d
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
View File

@@ -210,10 +210,11 @@ export class FirstMileService {
firstMilePickupAddress?: string | null;
serviceType?: { includesFirstMile?: boolean | null } | null;
}): boolean {
// Export bookings always need a first mile (pickup → origin yard); the
// pickup address is captured at assignment time, not required upfront.
return Boolean(booking.firstMilePickupAddress?.trim() ||
booking.serviceType?.includesFirstMile);
return Boolean(
booking.tradeDirection === 'EXPORT' &&
(booking.firstMilePickupAddress?.trim() ||
booking.serviceType?.includesFirstMile),
);
}
async update(id: string, dto: UpdateFirstMileDto): Promise<FirstMile> {

10
apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
View File

@@ -471,11 +471,11 @@ const FirstMilePage = () => {
paidBookings.filter(
(booking) => {
if (existingFirstMileBookingIds.has(booking.id)) return false;
return (
booking.tradeDirection === "EXPORT" ||
(booking.firstMilePickupAddress?.trim() ?? false) ||
booking.serviceType?.includesFirstMile
);
if (booking.paymentStatus !== "PAID") return false;
if (booking.tradeDirection !== "EXPORT") return false;
const hasPickupAddress = booking.firstMilePickupAddress?.trim() ?? false;
const includesFirstMile = booking.serviceType?.includesFirstMile ?? false;
return hasPickupAddress || includesFirstMile;
},
),
[existingFirstMileBookingIds, paidBookings],