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

Merge pull request #172 from Tria-plc/freight/fix/fixes

Browse Source 
freight/fix/fixes
This commit is contained in:
Nathnael Wondisha
2026-06-16 14:28:24 +03:00
committed by GitHub
parent 23272f972a e47340c2c8
commit c0b6869232
15 changed files with 928 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/edr-freight-web/backoffice/src/pages/bookings/BookingDetailPage.tsx
View File

@@ -13,7 +13,7 @@ import {
BookingReviewNotesCard,
BookingRouteCard,
detailStyles,
type BookingDetailView
type BookingDetailView,
} from "@/components/bookings/detail";
import Breadcrumbs from "@/components/ui/Breadcrumbs";
@@ -101,7 +101,9 @@ const BookingDetailPage = () => {
};
const approvalSteps = booking.approvalSteps ?? [];
const approvedCount = approvalSteps.filter((s) => s.status === "APPROVED").length;
const approvedCount = approvalSteps.filter(
(s) => s.status === "APPROVED",
).length;
const totalSteps = approvalSteps.length;
return (
@@ -116,7 +118,7 @@ const BookingDetailPage = () => {
{ label: booking.reference },
]}
/>
{/*
{/*
<BookingDetailHeader
booking={booking}
approvedCount={approvedCount}
@@ -125,13 +127,18 @@ const BookingDetailPage = () => {
<BookingLifecycleStepper status={booking.status} />
<Grid gutter="lg">
<Grid>
{/* LEFT — primary content */}
<Grid.Col span={{ base: 12, lg: 8 }}>
<Stack gap="lg">
<BookingRouteCard booking={booking} />
<BookingContainersCard containers={booking.bookingContainers ?? []} />
<BookingApprovalCard steps={approvalSteps} approvedCount={approvedCount} />
<BookingContainersCard
containers={booking.bookingContainers ?? []}
/>
<BookingApprovalCard
steps={approvalSteps}
approvedCount={approvedCount}
/>
<BookingReviewNotesCard notes={booking.reviewNotes ?? []} />
</Stack>
</Grid.Col>
@@ -139,9 +146,12 @@ const BookingDetailPage = () => {
{/* RIGHT — summary sidebar */}
<Grid.Col span={{ base: 12, lg: 4 }}>
<Stack gap="lg">
{booking.status === "SELECTED_FOR_BATCH" && booking.paymentDeadline && (
<BookingPaymentCountdownCard paymentDeadline={booking.paymentDeadline} />
)}
{booking.status === "SELECTED_FOR_BATCH" &&
booking.paymentDeadline && (
<BookingPaymentCountdownCard
paymentDeadline={booking.paymentDeadline}
/>
)}
<BookingPaymentCard
totalAmount={booking.totalAmount}
currency={booking.paymentCurrency}