updates on the orders page fix
This commit is contained in:
@@ -1081,12 +1081,21 @@ const Orders = () => {
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Stack direction="row" spacing={0.5} alignItems="center" sx={{ mt: 0.125 }}>
|
<Stack direction="row" spacing={0.5} alignItems="center" sx={{ mt: 0.125 }}>
|
||||||
<MdAccessTime size={10} style={{ color: DT.textMuted, flexShrink: 0 }} />
|
<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')}
|
const dateObj = row.pickupslot && dayjs(row.pickupslot).isValid()
|
||||||
</Typography>
|
? dayjs(row.pickupslot)
|
||||||
<Typography sx={{ fontSize: 10.5, color: DT.textMuted, fontWeight: 600 }} noWrap>
|
: dayjs(row.deliverydate || row.orderdate);
|
||||||
· {dayjs(row.pickupslot).format('DD MMM YY')}
|
return (
|
||||||
</Typography>
|
<>
|
||||||
|
<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>
|
</Stack>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user