updates
This commit is contained in:
@@ -767,12 +767,12 @@ const Createorder1 = () => {
|
|||||||
// clientdetails(localStorage.getItem('tenantid'))
|
// clientdetails(localStorage.getItem('tenantid'))
|
||||||
// }
|
// }
|
||||||
if (localStorage.getItem('partnerid')) {
|
if (localStorage.getItem('partnerid')) {
|
||||||
fetchtenantinfolist(localStorage.getItem('partnerid'));
|
// fetchtenantinfolist(localStorage.getItem('partnerid'));
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchtenantlocation();
|
// fetchtenantlocation();
|
||||||
clientdetails();
|
clientdetails();
|
||||||
clientdetailsbusiness();
|
clientdetailsbusiness();
|
||||||
fetchtenantinfo();
|
fetchtenantinfo();
|
||||||
@@ -869,7 +869,6 @@ const Createorder1 = () => {
|
|||||||
if (res.data.status) {
|
if (res.data.status) {
|
||||||
setTenant(res.data.details);
|
setTenant(res.data.details);
|
||||||
setTenantid(res.data.details.tenantid);
|
setTenantid(res.data.details.tenantid);
|
||||||
// fetchadmintoken(res.data.details.tenantid, res.data.details.partnerid);
|
|
||||||
fetchAppAdminTokens();
|
fetchAppAdminTokens();
|
||||||
}
|
}
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
@@ -881,7 +880,7 @@ const Createorder1 = () => {
|
|||||||
};
|
};
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchtenantinfo();
|
fetchtenantinfo();
|
||||||
fetchtenantlocation();
|
// fetchtenantlocation();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
// ==================================================== || fetchTiming || ====================================================
|
// ==================================================== || fetchTiming || ====================================================
|
||||||
@@ -948,29 +947,29 @@ const Createorder1 = () => {
|
|||||||
// });
|
// });
|
||||||
// };
|
// };
|
||||||
|
|
||||||
const fetchtenantlocation = async () => {
|
// const fetchtenantlocation = async () => {
|
||||||
setLoading(true);
|
// setLoading(true);
|
||||||
await axios
|
// await axios
|
||||||
.get(`${process.env.REACT_APP_URL}/tenants/gettenantlocations/?tenantid=${tid}`)
|
// .get(`${process.env.REACT_APP_URL}/tenants/gettenantlocations/?tenantid=${tid}`)
|
||||||
.then((res) => {
|
// .then((res) => {
|
||||||
console.log('fetchtenantlocation', res);
|
// console.log('fetchtenantlocation', res);
|
||||||
if (res.data.status) {
|
// if (res.data.status) {
|
||||||
let arr = [];
|
// let arr = [];
|
||||||
res.data.details.map((val) => {
|
// res.data.details.map((val) => {
|
||||||
arr.push({
|
// arr.push({
|
||||||
...val,
|
// ...val,
|
||||||
label: ` ${val.locationname}`
|
// label: ` ${val.locationname}`
|
||||||
});
|
// });
|
||||||
});
|
// });
|
||||||
setTenantlocationlist(arr);
|
// setTenantlocationlist(arr);
|
||||||
}
|
// }
|
||||||
setLoading(false);
|
// setLoading(false);
|
||||||
})
|
// })
|
||||||
.catch((err) => {
|
// .catch((err) => {
|
||||||
console.log(err);
|
// console.log(err);
|
||||||
setLoading(false);
|
// setLoading(false);
|
||||||
});
|
// });
|
||||||
};
|
// };
|
||||||
|
|
||||||
// // =============================================== || fetchadmintoken (via tid , pid) || ===============================================
|
// // =============================================== || fetchadmintoken (via tid , pid) || ===============================================
|
||||||
// const fetchadmintoken = async (tid, pid) => {
|
// const fetchadmintoken = async (tid, pid) => {
|
||||||
|
|||||||
@@ -1149,6 +1149,7 @@ const Orders = () => {
|
|||||||
document.removeEventListener('keydown', handleKeyPress);
|
document.removeEventListener('keydown', handleKeyPress);
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
var day = 60 * 60 * 24 * 1000;
|
var day = 60 * 60 * 24 * 1000;
|
||||||
var startDate = new Date();
|
var startDate = new Date();
|
||||||
@@ -1695,73 +1696,10 @@ const Orders = () => {
|
|||||||
<Stack direction={{ xs: 'column', md: 'row' }} justifyContent="space-between" alignItems="center" spacing={2}>
|
<Stack direction={{ xs: 'column', md: 'row' }} justifyContent="space-between" alignItems="center" spacing={2}>
|
||||||
<Stack direction="column" alignItems="flex-start" spacing={1}>
|
<Stack direction="column" alignItems="flex-start" spacing={1}>
|
||||||
<Typography variant="h3">Orders</Typography>
|
<Typography variant="h3">Orders</Typography>
|
||||||
|
|
||||||
{/* </Stack> */}
|
|
||||||
{/*
|
|
||||||
<Stack direction='row' spacing={2}>
|
|
||||||
<Chip label='Orders-All' color="primary" variant="light" size="small" />
|
|
||||||
</Stack> */}
|
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
{/* <Stack direction='row' spacing={1}
|
|
||||||
sx={{ mt: { md: 0, xs: 2 }, p: 1, display: { xs: 'block', md: 'none' } }}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
variant={(tabstatus1 === 'Today') ? 'contained' : 'outlined'} onClick={handleChange1}
|
|
||||||
|
|
||||||
|
|
||||||
sx={{ borderRadius: '40px' }} size="small">Today</Button>
|
|
||||||
<Button
|
|
||||||
variant={(tabstatus1 === 'Tomorrow') ? 'contained' : 'outlined'} onClick={handleChange1}
|
|
||||||
|
|
||||||
sx={{ borderRadius: '40px' }} size="small" >Tomorrow</Button>
|
|
||||||
<Button
|
|
||||||
variant={(tabstatus1 === 'Week') ? 'contained' : 'outlined'} onClick={handleChange1}
|
|
||||||
|
|
||||||
sx={{ borderRadius: '40px' }} size="small">Week</Button>
|
|
||||||
<Button
|
|
||||||
variant={(tabstatus1 === 'All') ? 'contained' : 'outlined'} onClick={handleChange1}
|
|
||||||
|
|
||||||
sx={{ borderRadius: '40px' }} size="small">All</Button>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Box
|
|
||||||
sx={{ backgroundColor: 'white', display: { xs: 'block', md: 'none' } }}
|
|
||||||
|
|
||||||
>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<LocalizationProvider dateAdapter={AdapterDayjs} >
|
|
||||||
<DatePicker
|
|
||||||
label="Date"
|
|
||||||
value={dayjs(startdate)}
|
|
||||||
onChange={choosedate}
|
|
||||||
|
|
||||||
/>
|
|
||||||
</LocalizationProvider>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</Box>*/}
|
|
||||||
</Stack>
|
</Stack>
|
||||||
</Grid>
|
</Grid>
|
||||||
{/* <Grid item xs={12} lg={3} sm={6}>
|
|
||||||
<HoverSocialCard primary="Confirmed orders" secondary={(confirmed === '') ?
|
|
||||||
|
|
||||||
<Skeleton sx={{ width: '30px' }} animation="wave" />
|
|
||||||
|
|
||||||
: confirmed} percentage={percentage1.toString()} color={theme.palette.success.main} />
|
|
||||||
</Grid> */}
|
|
||||||
|
|
||||||
{/* <Grid item xs={12} lg={3} sm={6}>
|
|
||||||
<HoverSocialCard primary="Modified Orders" secondary={(cancelled === '') ?
|
|
||||||
<Skeleton sx={{ width: '30px' }} animation="wave" />
|
|
||||||
|
|
||||||
: modified} percentage={percentage2.toString()} color={theme.palette.secondary[600]} />
|
|
||||||
</Grid> */}
|
|
||||||
<Grid item xs={12} lg={3} sm={6}>
|
<Grid item xs={12} lg={3} sm={6}>
|
||||||
<HoverSocialCard
|
<HoverSocialCard
|
||||||
primary="Created Orders"
|
primary="Created Orders"
|
||||||
@@ -1778,18 +1716,7 @@ const Orders = () => {
|
|||||||
color={theme.palette.warning.main}
|
color={theme.palette.warning.main}
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
{/* <Grid item xs={12} lg={3} sm={6}>
|
|
||||||
<HoverSocialCard primary="Accepted orders" secondary={(assigned === '') ?
|
|
||||||
<Skeleton sx={{ width: '30px' }} animation="wave" />
|
|
||||||
|
|
||||||
: assigned} percentage={percentage2.toString()} color={theme.palette.info.main} />
|
|
||||||
</Grid>
|
|
||||||
<Grid item xs={12} lg={3} sm={6}>
|
|
||||||
<HoverSocialCard primary="Picked orders" secondary={(picked === '') ?
|
|
||||||
<Skeleton sx={{ width: '30px' }} animation="wave" />
|
|
||||||
|
|
||||||
: picked} percentage={percentage3.toString()} color={theme.palette.primary.main} />
|
|
||||||
</Grid> */}
|
|
||||||
<Grid item xs={12} lg={3} sm={6}>
|
<Grid item xs={12} lg={3} sm={6}>
|
||||||
<HoverSocialCard
|
<HoverSocialCard
|
||||||
primary="Delivered orders"
|
primary="Delivered orders"
|
||||||
@@ -1798,14 +1725,7 @@ const Orders = () => {
|
|||||||
color={theme.palette.success.main}
|
color={theme.palette.success.main}
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
{/*
|
|
||||||
<Grid item xs={12} lg={3} sm={6}>
|
|
||||||
<HoverSocialCard primary="Closed orders" secondary={(closed === '') ?
|
|
||||||
<Skeleton sx={{ width: '30px' }} animation="wave" />
|
|
||||||
|
|
||||||
: closed} percentage={percentage4.toString()} color={theme.palette.warning.main} />
|
|
||||||
</Grid>
|
|
||||||
*/}
|
|
||||||
<Grid item xs={12} lg={3} sm={6}>
|
<Grid item xs={12} lg={3} sm={6}>
|
||||||
<HoverSocialCard
|
<HoverSocialCard
|
||||||
primary="Cancelled Orders"
|
primary="Cancelled Orders"
|
||||||
@@ -1815,7 +1735,6 @@ const Orders = () => {
|
|||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
{/* <Grid item md={8} sx={{ display: { sm: 'none', md: 'block', lg: 'none' } }} /> */}
|
|
||||||
<Grid item xs={12} sx={{ mb: -3 }}>
|
<Grid item xs={12} sx={{ mb: -3 }}>
|
||||||
<Stack direction={'row'} justifyContent={'space-between'}>
|
<Stack direction={'row'} justifyContent={'space-between'}>
|
||||||
{startdate && enddate && (
|
{startdate && enddate && (
|
||||||
|
|||||||
Reference in New Issue
Block a user