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

Merge pull request #1440 from Tria-plc/freight/nati-2

Browse Source 
feat(bookings): surface cargo declared on the shipment request
This commit is contained in:
Nathnael Wondisha
2026-08-28 14:29:02 +03:00
committed by GitHub
parent 662af04b53 df8e10e041
commit 132374ed03
8 changed files with 162 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestsPage.tsx
View File

@@ -251,6 +251,25 @@ export default function BookingRequestsPage() {
? { containersMin: v.v[0], containersMax: v.v[1] }
: { containersMin: v.v[0], containersMax: v.v[0] },
},
{
// Declared on the shipment request, not yet on the booking. Pair it
// with Containers = 0 to find the set awaiting completion.
key: "requestedContainers",
label: "Requested containers",
type: "number",
secondary: true,
operators: ["is", "between"],
toParams: (v) =>
v.op === "between"
? {
requestedContainersMin: v.v[0],
requestedContainersMax: v.v[1],
}
: {
requestedContainersMin: v.v[0],
requestedContainersMax: v.v[0],
},
},
{
key: "serviceTypeId",
label: "Service",

11
apps/edr-freight-web/backoffice/src/services/bookings.service.ts
View File

@@ -82,6 +82,9 @@ export interface BookingListFilter {
/** Container count bounds — of containerTypeId when set, else of all types. */
containersMin?: string;
containersMax?: string;
/** Bounds on containers declared on the shipment request behind the booking. */
requestedContainersMin?: string;
requestedContainersMax?: string;
/** ONE_TIME | GENERAL_CONTRACT — the booking-kind tab filter. */
bookingType?: string;
/** 'true' → customs bookings, 'false' → self-clearance (non-customs). */
@@ -213,6 +216,10 @@ export const bookingsService = {
if (filter.containerTypeId) params.containerTypeId = filter.containerTypeId;
if (filter.containersMin) params.containersMin = filter.containersMin;
if (filter.containersMax) params.containersMax = filter.containersMax;
if (filter.requestedContainersMin)
params.requestedContainersMin = filter.requestedContainersMin;
if (filter.requestedContainersMax)
params.requestedContainersMax = filter.requestedContainersMax;
if (filter.bookingType) params.bookingType = filter.bookingType;
if (filter.tradeDirection) params.tradeDirection = filter.tradeDirection;
if (filter.paymentCurrency)
@@ -257,6 +264,10 @@ export const bookingsService = {
if (filter.containerTypeId) params.containerTypeId = filter.containerTypeId;
if (filter.containersMin) params.containersMin = filter.containersMin;
if (filter.containersMax) params.containersMax = filter.containersMax;
if (filter.requestedContainersMin)
params.requestedContainersMin = filter.requestedContainersMin;
if (filter.requestedContainersMax)
params.requestedContainersMax = filter.requestedContainersMax;
if (filter.bookingType) params.bookingType = filter.bookingType;
if (filter.tradeDirection) params.tradeDirection = filter.tradeDirection;
if (filter.paymentCurrency)