diff --git a/src/pages/nearle/orders/createorder1.js b/src/pages/nearle/orders/createorder1.js index c1a9cd6..8f9af4d 100644 --- a/src/pages/nearle/orders/createorder1.js +++ b/src/pages/nearle/orders/createorder1.js @@ -767,12 +767,12 @@ const Createorder1 = () => { // clientdetails(localStorage.getItem('tenantid')) // } if (localStorage.getItem('partnerid')) { - fetchtenantinfolist(localStorage.getItem('partnerid')); + // fetchtenantinfolist(localStorage.getItem('partnerid')); } }, []); useEffect(() => { - fetchtenantlocation(); + // fetchtenantlocation(); clientdetails(); clientdetailsbusiness(); fetchtenantinfo(); @@ -869,7 +869,6 @@ const Createorder1 = () => { if (res.data.status) { setTenant(res.data.details); setTenantid(res.data.details.tenantid); - // fetchadmintoken(res.data.details.tenantid, res.data.details.partnerid); fetchAppAdminTokens(); } setLoading(false); @@ -881,7 +880,7 @@ const Createorder1 = () => { }; useEffect(() => { fetchtenantinfo(); - fetchtenantlocation(); + // fetchtenantlocation(); }, []); // ==================================================== || fetchTiming || ==================================================== @@ -948,29 +947,29 @@ const Createorder1 = () => { // }); // }; - const fetchtenantlocation = async () => { - setLoading(true); - await axios - .get(`${process.env.REACT_APP_URL}/tenants/gettenantlocations/?tenantid=${tid}`) - .then((res) => { - console.log('fetchtenantlocation', res); - if (res.data.status) { - let arr = []; - res.data.details.map((val) => { - arr.push({ - ...val, - label: ` ${val.locationname}` - }); - }); - setTenantlocationlist(arr); - } - setLoading(false); - }) - .catch((err) => { - console.log(err); - setLoading(false); - }); - }; + // const fetchtenantlocation = async () => { + // setLoading(true); + // await axios + // .get(`${process.env.REACT_APP_URL}/tenants/gettenantlocations/?tenantid=${tid}`) + // .then((res) => { + // console.log('fetchtenantlocation', res); + // if (res.data.status) { + // let arr = []; + // res.data.details.map((val) => { + // arr.push({ + // ...val, + // label: ` ${val.locationname}` + // }); + // }); + // setTenantlocationlist(arr); + // } + // setLoading(false); + // }) + // .catch((err) => { + // console.log(err); + // setLoading(false); + // }); + // }; // // =============================================== || fetchadmintoken (via tid , pid) || =============================================== // const fetchadmintoken = async (tid, pid) => { diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index 750593c..3079dd2 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -1149,6 +1149,7 @@ const Orders = () => { document.removeEventListener('keydown', handleKeyPress); }; }, []); + useEffect(() => { var day = 60 * 60 * 24 * 1000; var startDate = new Date(); @@ -1695,73 +1696,10 @@ const Orders = () => { Orders - - {/* */} - {/* - - - */} - - {/* - - - - - - - - - - - - - - - - - - - */} - {/* - - - : confirmed} percentage={percentage1.toString()} color={theme.palette.success.main} /> - */} - {/* - - - : modified} percentage={percentage2.toString()} color={theme.palette.secondary[600]} /> - */} { color={theme.palette.warning.main} /> - {/* - - : assigned} percentage={percentage2.toString()} color={theme.palette.info.main} /> - - - - - : picked} percentage={percentage3.toString()} color={theme.palette.primary.main} /> - */} { color={theme.palette.success.main} /> - {/* - - - - : closed} percentage={percentage4.toString()} color={theme.palette.warning.main} /> - - */} + { /> - {/* */} {startdate && enddate && (