diff --git a/nearlexpressbuild b/nearlexpressbuild index a31bad3..c38817a 160000 --- a/nearlexpressbuild +++ b/nearlexpressbuild @@ -1 +1 @@ -Subproject commit a31bad3ad7b0c62d8392c8e9a3c9adf40ea0c21e +Subproject commit c38817a7425a4c33ffc8f0f970110c11cfeb6c97 diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index 5ed9405..22633d8 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -1892,8 +1892,8 @@ const Orders = () => { const fetchpercentage = async (tid) => { setLoading(true) try { - // await axios.get(`${process.env.REACT_APP_URL2}/orders/orderlistsummary?fromdate=${startdate}&todate=${enddate}`) - await axios.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}&fromdate=${startdate}&todate=${enddate}`) + // await axios.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}&fromdate=${startdate}&todate=${enddate}`) + await axios.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}`) .then((res) => { console.log(res) @@ -1948,22 +1948,8 @@ const Orders = () => { Orders - {(startdate && enddate) && - - - {dayjs(startdate).format('DD/MM/YYYY')} - {dayjs(enddate).format('DD/MM/YYYY')}} variant="combined" color='warning' size='small' /> - - } - {(!startdate || !enddate) && - <> - - - - - } - {/* */} {/* @@ -2016,27 +2002,8 @@ const Orders = () => { */} - - setOpen(true)} > - - - - {/* @@ -2054,7 +2021,7 @@ const Orders = () => { : modified} percentage={percentage2.toString()} color={theme.palette.secondary[600]} /> */} - + @@ -2084,7 +2051,7 @@ const Orders = () => { : coveredorders} percentage={percentage3.toString()} color={theme.palette.success.main} /> - {/* + {/* @@ -2092,17 +2059,56 @@ const Orders = () => { : closed} percentage={percentage4.toString()} color={theme.palette.warning.main} /> */} - - - - : cancelled} percentage={percentage4.toString()} color={theme.palette.secondary[600]} /> - + + + + : cancelled} percentage={percentage4.toString()} color={theme.palette.secondary[600]} /> + - + {/* */} + + + {(startdate && enddate) && + + + {dayjs(startdate).format('DD/MM/YYYY')} - {dayjs(enddate).format('DD/MM/YYYY')}} variant="combined" color='warning' size='small' /> + + } + {(!startdate || !enddate) && + <> + + + + + } + + + setOpen(true)} > + + + + + +