From 12341b1a0ce8ed259e5dbb4574b6f40c3fd5eb09 Mon Sep 17 00:00:00 2001 From: dharaneesh-r Date: Thu, 4 Jun 2026 02:10:19 +0530 Subject: [PATCH] updates on the design in the order summary page and the orders details page --- src/pages/nearle/reports/orderSummary.js | 158 ++++++++++++++++++---- src/pages/nearle/reports/ordersDetails.js | 2 +- 2 files changed, 135 insertions(+), 25 deletions(-) diff --git a/src/pages/nearle/reports/orderSummary.js b/src/pages/nearle/reports/orderSummary.js index b0d070f..b8edcfc 100644 --- a/src/pages/nearle/reports/orderSummary.js +++ b/src/pages/nearle/reports/orderSummary.js @@ -669,11 +669,67 @@ export default function OrdersReport() { # Location All - - Orders + + + + + + + Orders + + - - Deliveries + + + + + + + Deliveries + + Kms Amount @@ -695,12 +751,52 @@ export default function OrdersReport() { } }} > - Pending - Completed - Cancelled - Pending - Completed - Cancelled + + Pending + + + Completed + + + Cancelled + + + Pending + + + Completed + + + Cancelled + @@ -718,8 +814,16 @@ export default function OrdersReport() { py: { xs: 1, md: 1.25 }, px: { xs: 1, md: 1.5 } }, + '& td.band-o': { backgroundColor: tint(C_ORDERS) }, + '& td.band-d': { backgroundColor: tint(C_DELIVERIES) }, + '& td.band-o-first': { borderLeft: `2px solid ${edge(C_ORDERS)}` }, + '& td.band-o-last': { borderRight: `2px solid ${edge(C_ORDERS)}` }, + '& td.band-d-first': { borderLeft: `2px solid ${edge(C_DELIVERIES)}` }, + '& td.band-d-last': { borderRight: `2px solid ${edge(C_DELIVERIES)}` }, backgroundColor: openRow === row.locationid ? tint(BRAND) : 'transparent', - '&:hover': { backgroundColor: openRow === row.locationid ? soft(BRAND) : DT.surfaceAlt } + '&:hover': { backgroundColor: openRow === row.locationid ? soft(BRAND) : DT.surfaceAlt }, + '&:hover td.band-o': { backgroundColor: soft(C_ORDERS) }, + '&:hover td.band-d': { backgroundColor: soft(C_DELIVERIES) } }} > @@ -741,23 +845,23 @@ export default function OrdersReport() { } /> - + } /> - + } /> - + } /> - + } /> - + } /> - + } /> @@ -988,7 +1092,13 @@ export default function OrdersReport() { borderBottom: 'none', py: 1.25, px: 1.5 - } + }, + '& td.band-o': { backgroundColor: soft(C_ORDERS) }, + '& td.band-d': { backgroundColor: soft(C_DELIVERIES) }, + '& td.band-o-first': { borderLeft: `2px solid ${edge(C_ORDERS)}` }, + '& td.band-o-last': { borderRight: `2px solid ${edge(C_ORDERS)}` }, + '& td.band-d-first': { borderLeft: `2px solid ${edge(C_DELIVERIES)}` }, + '& td.band-d-last': { borderRight: `2px solid ${edge(C_DELIVERIES)}` } }} > @@ -1002,22 +1112,22 @@ export default function OrdersReport() { {totalOrders} - + {totalOrderPend} - + {totalOrderComplete} - + {totalOrderCancel} - + {totalDeliPend} - + {totalDeliComplete} - + {totalDeliCancel} diff --git a/src/pages/nearle/reports/ordersDetails.js b/src/pages/nearle/reports/ordersDetails.js index 7614773..361f6b2 100644 --- a/src/pages/nearle/reports/ordersDetails.js +++ b/src/pages/nearle/reports/ordersDetails.js @@ -244,7 +244,7 @@ const TimelineCell = ({ value, color }) => { {dayjs(value).format('DD/MM/YYYY')} - + {dayjs(value).format('hh:mm A')}