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 = () => { - - {dayjs(row.pickupslot).format('hh:mm A')} - - - · {dayjs(row.pickupslot).format('DD MMM YY')} - + {(() => { + const dateObj = row.pickupslot && dayjs(row.pickupslot).isValid() + ? dayjs(row.pickupslot) + : dayjs(row.deliverydate || row.orderdate); + return ( + <> + + {dateObj.format('hh:mm A')} + + + · {dateObj.format('DD MMM YY')} + + + ); + })()}