diff --git a/src/pages/nearle/login.js b/src/pages/nearle/login.js index eea09dc..fb6aa0e 100644 --- a/src/pages/nearle/login.js +++ b/src/pages/nearle/login.js @@ -163,7 +163,7 @@ const Login = () => { overflow: 'hidden', flexBasis: '46%', flexDirection: 'column', - justifyContent: 'space-between', + justifyContent: 'center', color: '#fff', p: 6, background: 'linear-gradient(150deg, #4D1C61 0%, #662582 52%, #9255AB 100%)' @@ -193,54 +193,39 @@ const Login = () => { }} /> - - - NearlExpress - - - - + Operate your dispatch,
end to end.
- + Orders, AI route optimisation, live rider tracking and billing — all in the NearlExpress operator console. -
- - {['Real-time fleet visibility', 'AI-optimised dispatch routes', 'Tenant, pricing & invoice control'].map((t) => ( - - - ✓ - - {t} - - ))} - + + {['Real-time fleet visibility', 'AI-optimised dispatch routes', 'Tenant, pricing & invoice control'].map((t) => ( + + + ✓ + + {t} + + ))} + +
{/* ---- Right form panel ---- */} diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index 86069c2..9aaab12 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -206,6 +206,16 @@ const ORDERS_STATUS_TABS = [ { idx: 3, status: 'cancelled', label: 'Cancelled', color: '#ef4444', icon: MdCancel, countKey: 'cancelled' } ]; +const formatOrderDate = (row) => { + const dateCandidates = [row.pickupslot, row.deliverydate, row.orderdate]; + for (const candidate of dateCandidates) { + if (candidate && dayjs(candidate).isValid()) { + return `${dayjs(candidate).utc().format('DD/MM/YYYY')} ${dayjs(candidate).format('hh:mm A')}`; + } + } + return '—'; +}; + const Orders = () => { const theme = useTheme(); const isMobile = useMediaQuery(theme.breakpoints.down('md')); @@ -1469,7 +1479,7 @@ const Orders = () => { {`${row.locationname}-(${row.locationsuburb})`} - {row.orderid} · {dayjs(row.pickupslot).utc().format('DD/MM/YYYY')} {dayjs(row.pickupslot).format('hh:mm A')} + {row.orderid} · {formatOrderDate(row)} @@ -1691,7 +1701,7 @@ const Orders = () => { - {dayjs(row.pickupslot).utc().format('DD/MM/YYYY')} {dayjs(row.pickupslot).format('hh:mm A')} + {formatOrderDate(row)}