From 2bf6530813d544f1f76f175cee3b68a4c60be39d Mon Sep 17 00:00:00 2001
From: dharaneesh-r <dharaneesh@tenext.in>
Date: Tue, 16 Jun 2026 10:59:50 +0530
Subject: [PATCH] updates on the orders page fix

---
 src/pages/nearle/orders/orders.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js
index ae770b1..c342d51 100644
--- a/src/pages/nearle/orders/orders.js
+++ b/src/pages/nearle/orders/orders.js
@@ -1081,12 +1081,21 @@ const Orders = () => {
                     </Tooltip>
                     <Stack direction="row" spacing={0.5} alignItems="center" sx={{ mt: 0.125 }}>
                       <MdAccessTime size={10} style={{ color: DT.textMuted, flexShrink: 0 }} />
-                      <Typography sx={{ fontSize: 10.5, color: DT.textSecondary, fontWeight: 700 }} noWrap>
-                        {dayjs(row.pickupslot).format('hh:mm A')}
-                      </Typography>
-                      <Typography sx={{ fontSize: 10.5, color: DT.textMuted, fontWeight: 600 }} noWrap>
-                        · {dayjs(row.pickupslot).format('DD MMM YY')}
-                      </Typography>
+                      {(() => {
+                        const dateObj = row.pickupslot && dayjs(row.pickupslot).isValid()
+                          ? dayjs(row.pickupslot)
+                          : dayjs(row.deliverydate || row.orderdate);
+                        return (
+                          <>
+                            <Typography sx={{ fontSize: 10.5, color: DT.textSecondary, fontWeight: 700 }} noWrap>
+                              {dateObj.format('hh:mm A')}
+                            </Typography>
+                            <Typography sx={{ fontSize: 10.5, color: DT.textMuted, fontWeight: 600 }} noWrap>
+                              · {dateObj.format('DD MMM YY')}
+                            </Typography>
+                          </>
+                        );
+                      })()}
                     </Stack>
                   </TableCell>