From 5c421dda05e7171c2f5c5a8a8402d39c7e515ce8 Mon Sep 17 00:00:00 2001 From: Malai Raja Date: Tue, 26 Dec 2023 19:39:22 +0530 Subject: [PATCH] 26122023 --- nearlexpressbuild | 2 +- src/pages/nearle/orders/createorder.js | 3 ++- src/pages/nearle/orders/orders.js | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nearlexpressbuild b/nearlexpressbuild index c38817a..3d035da 160000 --- a/nearlexpressbuild +++ b/nearlexpressbuild @@ -1 +1 @@ -Subproject commit c38817a7425a4c33ffc8f0f970110c11cfeb6c97 +Subproject commit 3d035da5280fc7d3500ff490584d80935dc2f185 diff --git a/src/pages/nearle/orders/createorder.js b/src/pages/nearle/orders/createorder.js index 9a8050f..a7ec7e7 100644 --- a/src/pages/nearle/orders/createorder.js +++ b/src/pages/nearle/orders/createorder.js @@ -283,7 +283,8 @@ const Createorder = () => { "subcategoryid": tenantinfo.subcategoryid, "partnerid": tenantinfo.partnerid, "deliverylat":val.latitude, - "deliverylong":val.longitude + "deliverylong":val.longitude, + "applocationid":parseInt(localStorage.getItem('applocationid')) }) diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index 22633d8..cda6d0f 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -1909,7 +1909,7 @@ const Orders = () => { setCreated(res.data.details.created.toString()) setClosed(res.data.details.delivered.toString()); // setPicked(res.data.details.picked.toString()) - setPercentage1((Math.round((res.data.details.total / res.data.details.total) * 100) || 0).toString()) + setPercentage1((Math.round((res.data.details.created / res.data.details.total) * 100) || 0).toString()) setPercentage3((Math.round((res.data.details.delivered / res.data.details.total) * 100) || 0).toString()) setPercentage4((Math.round((res.data.details.cancelled / res.data.details.total) * 100) || 0).toString()) @@ -2022,10 +2022,10 @@ const Orders = () => { : modified} percentage={percentage2.toString()} color={theme.palette.secondary[600]} /> */} - - : allorders} percentage={percentage1.toString()} color={theme.palette.primary.main} /> + : created} percentage={percentage1.toString()} color={theme.palette.primary.main} />