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

Merge pull request #441 from Tria-plc/freight/feature/first_mile_invoice

Browse Source 
fix
This commit is contained in:
yaschalew10
2026-07-04 03:59:09 +03:00
committed by GitHub
parent 21d8b44518 414ed92590
commit dc00527239
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,19 @@ const STATUS_META: Record<FirstMileApiStatus, { label: string; color: string }>
RECEIVED_TO_PORT: { label: "Received to Port", color: "green" },
};
// Invoice payment state → badge color, keyed by upper-cased status.
const INVOICE_STATUS_META: Record<string, { label: string; color: string }> = {
PAID: { label: "Paid", color: "green" },
PARTIALLY_PAID: { label: "Partially Paid", color: "teal" },
PENDING: { label: "Pending", color: "yellow" },
UNPAID: { label: "Unpaid", color: "yellow" },
OPEN: { label: "Open", color: "yellow" },
ISSUED: { label: "Issued", color: "blue" },
OVERDUE: { label: "Overdue", color: "red" },
CANCELLED: { label: "Cancelled", color: "gray" },
VOID: { label: "Void", color: "gray" },
};
const NEXT_STATUS: Partial<Record<FirstMileApiStatus, FirstMileApiStatus>> = {
PAYMENT_PENDING: "READY_TO_TRANSIT",
READY_TO_TRANSIT: "IN_TRANSIT",
@@ -757,7 +770,8 @@ const FirstMilePage = () => {
if (!invoice) {
return <Text c="dimmed">—</Text>;
}
const isPaid = (row.original as any).paid || invoice.status === "Paid";
const status = String((row.original as any).paid ? "PAID" : invoice.status || "").toUpperCase();
const badge = INVOICE_STATUS_META[status] ?? { color: "gray", label: status || "—" };
return (
<Group gap="xs" wrap="nowrap">
<UnstyledButton
@@ -772,7 +786,7 @@ const FirstMilePage = () => {
>
{invoice.number}
</UnstyledButton>
{isPaid && <Badge color="green" variant="light" size="sm">Paid</Badge>}
{status && <Badge color={badge.color} variant="filled" size="sm">{badge.label}</Badge>}
</Group>
);
},

18
apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
View File

@@ -71,6 +71,19 @@ const STATUS_META: Record<LastMileApiStatus, { label: string; color: string }> =
DELIVERED: { label: "Delivered", color: "green" },
};
// Invoice payment state → badge color, keyed by upper-cased status.
const INVOICE_STATUS_META: Record<string, { label: string; color: string }> = {
PAID: { label: "Paid", color: "green" },
PARTIALLY_PAID: { label: "Partially Paid", color: "teal" },
PENDING: { label: "Pending", color: "yellow" },
UNPAID: { label: "Unpaid", color: "yellow" },
OPEN: { label: "Open", color: "yellow" },
ISSUED: { label: "Issued", color: "blue" },
OVERDUE: { label: "Overdue", color: "red" },
CANCELLED: { label: "Cancelled", color: "gray" },
VOID: { label: "Void", color: "gray" },
};
const NEXT_STATUS: Partial<Record<LastMileApiStatus, LastMileApiStatus>> = {
PAYMENT_PENDING: "READY_TO_TRANSIT",
READY_TO_TRANSIT: "IN_TRANSIT",
@@ -1128,7 +1141,8 @@ const LastMilePage = () => {
if (!invoice) {
return <Text c="dimmed">—</Text>;
}
const isPaid = (row.original as any).paid || invoice.status === "Paid";
const status = String((row.original as any).paid ? "PAID" : invoice.status || "").toUpperCase();
const badge = INVOICE_STATUS_META[status] ?? { color: "gray", label: status || "—" };
return (
<Group gap="xs" wrap="nowrap">
<UnstyledButton
@@ -1143,7 +1157,7 @@ const LastMilePage = () => {
>
{invoice.number}
</UnstyledButton>
{isPaid && <Badge color="green" variant="light" size="sm">Paid</Badge>}
{status && <Badge color={badge.color} variant="filled" size="sm">{badge.label}</Badge>}
</Group>
);
},