@bjsdistribution/dms-client-return 0.0.66 → 0.0.68

package/dist/dms-client-return.cjs.development.js

@@ -1754,14 +1754,23 @@ var ReturnOrderTable = function ReturnOrderTable() {
     setLoading(returnDataLoad);
     if (fetchedOrderData && fetchedOrderData != null && fetchedOrderData.data) {
       setReturnData(fetchedOrderData == null ? void 0 : fetchedOrderData.data);
-      if (paginationData !== null) {
-        var _JSON$parse = JSON.parse(paginationData),
-          rest = _objectWithoutPropertiesLoose(_JSON$parse, _excluded);
-        setPaginationObject(rest);
+      if (paginationData) {
+        try {
+          var _JSON$parse = JSON.parse(paginationData),
+            count = _JSON$parse.count,
+            rest = _objectWithoutPropertiesLoose(_JSON$parse, _excluded);
+          setPaginationObject(rest);
+        } catch (error) {
+          console.error('Error parsing paginationData:', error);
+          antd.notification.error({
+            message: 'Error',
+            description: 'Failed to parse pagination data'
+          });
+        }
       } else {
         antd.notification.error({
           message: 'Error',
-          description: 'Pagination data is null'
+          description: 'Pagination data is null or undefined'
         });
       }
     }
@@ -2829,6 +2838,11 @@ var OrderTable = function OrderTable() {
           color: '#845ADF',
           background: 'rgba(132, 90, 223, 0.15)'
         };
+      case 'Awaiting':
+        return {
+          color: '#845ADF',
+          background: 'rgba(132, 90, 223, 0.15)'
+        };
       case 'Completed':
         return {
           color: '#1F9254',
@@ -2947,6 +2961,7 @@ var OrderTable = function OrderTable() {
       OO: 'On Hold',
       SC: 'Sub-Contracted',
       'awaiting route': 'Awaiting route',
+      'awaiting confirmation': 'Awaiting',
       completed: 'completed',
       outstanding: 'Outstanding',
       routed: 'Routed'
@@ -3623,14 +3638,23 @@ var ReturnAfterTable = function ReturnAfterTable() {
     setLoading(loading);
     if (fetchedReturnOrderData && fetchedReturnOrderData != null && fetchedReturnOrderData.data) {
       setReturnOrderData(fetchedReturnOrderData == null ? void 0 : fetchedReturnOrderData.data);
-      if (paginationData !== null) {
-        var _JSON$parse = JSON.parse(paginationData),
-          rest = _objectWithoutPropertiesLoose(_JSON$parse, _excluded$3);
-        setPaginationObject(rest);
+      if (paginationData) {
+        try {
+          var _JSON$parse = JSON.parse(paginationData),
+            count = _JSON$parse.count,
+            rest = _objectWithoutPropertiesLoose(_JSON$parse, _excluded$3);
+          setPaginationObject(rest);
+        } catch (error) {
+          console.error('Error parsing paginationData:', error);
+          antd.notification.error({
+            message: 'Error',
+            description: 'Failed to parse pagination data'
+          });
+        }
       } else {
         antd.notification.error({
           message: 'Error',
-          description: 'Pagination data is null'
+          description: 'Pagination data is null or undefined'
         });
       }
     }
@@ -11265,7 +11289,6 @@ function OrderView() {
   React.useEffect(function () {
     setLoading(depotDataLoading);
     if (fetchedDepotData && fetchedDepotData.data) {
-      console.log(fetchedDepotData, 'fetchedDepotData');
       var requiredData = fetchedDepotData == null ? void 0 : fetchedDepotData.data;
       if (requiredData.length > 0) {
         var options = requiredData == null ? void 0 : requiredData.map(function (x) {
@@ -11808,14 +11831,23 @@ function ReturnMainTable() {
     if (fetchedClientData && fetchedClientData.data) {
       var result = fetchedClientData == null ? void 0 : fetchedClientData.data;
       setClientData(result);
-      if (paginationData !== null) {
-        var _JSON$parse = JSON.parse(paginationData),
-          rest = _objectWithoutPropertiesLoose(_JSON$parse, _excluded$7);
-        setPaginationObject(rest);
+      if (paginationData) {
+        try {
+          var _JSON$parse = JSON.parse(paginationData),
+            count = _JSON$parse.count,
+            rest = _objectWithoutPropertiesLoose(_JSON$parse, _excluded$7);
+          setPaginationObject(rest);
+        } catch (error) {
+          console.error('Error parsing paginationData:', error);
+          antd.notification.error({
+            message: 'Error',
+            description: 'Failed to parse pagination data'
+          });
+        }
       } else {
         antd.notification.error({
           message: 'Error',
-          description: 'Pagination data is null'
+          description: 'Pagination data is null or undefined'
         });
       }
     }
@@ -11882,7 +11914,7 @@ function ReturnClient() {
   };
   var paths = splitPath(location.pathname);
   React.useEffect(function () {
-    if (paths[paths.length - 1] === 'orders/view/return') {
+    if (paths.join('/') === 'orders/view/return') {
       setActionTypeOptions([]);
       setLocationOptions([]);
       setSelectedClient(null);
@@ -11890,11 +11922,6 @@ function ReturnClient() {
       setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
-  // useEffect(() => {
-  //   if (selectedClientId) {
-  //     navigate(`filter/${selectedClientId}`);
-  //   }
-  // }, [selectedClientId]);
   //API for client data
   var _useApiHook = dmsComponentLibrary.useApiHook({
       endpoint: "/return_orders/customers/",