@bjsdistribution/dms-client-return 0.0.67 → 0.0.69

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

@@ -62,7 +62,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -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'
         });
       }
     }
@@ -3819,7 +3843,7 @@ function SpokePhoneIcon() {
 
 function useCopyToClipboard() {
   var copy = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(text) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(text) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -5212,7 +5236,7 @@ function useUpdateOrder() {
   var _useUpdateApiCall = useUpdateApiCall(),
     setCallApi = _useUpdateApiCall[1]; //single detail
   var update = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, signal, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -5320,7 +5344,7 @@ function OrderDetailsFooter() {
     return !isSame;
   };
   var onSave = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _response$data;
       var payload, response, _response$data$, _response$data$2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -5438,7 +5462,7 @@ function AddNote() {
     notificationData = _useState2[0],
     setNotificationData = _useState2[1];
   var saveNote = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, payload, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -5941,7 +5965,7 @@ var tableColumns = [{
 function useGetEventNotes() {
   var ssoToken = getCookie('id_token');
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -6026,7 +6050,7 @@ function SystemLogs() {
     setNotesData = _useEventNotesData[1];
   // const gsitId = orderDetails?.gsit_order_id;
   var fetchReminderData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -8230,7 +8254,7 @@ function ConfirmOrder() {
     return Object.keys(obj).length === 1 && obj.hasOwnProperty('id');
   }
   var ConfirmOrder = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var keysToRemovefromOrders, filteredOrderDetails, filteredPrevOrderDetails, payload, notUpdateOrder, _response$data, _response, formattedDate;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9077,7 +9101,7 @@ function useFetchSingleReminderData() {
     setLoading = _useFlagsLoading[1];
   var ssoToken = getCookie('id_token');
   var res = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9176,7 +9200,7 @@ function useUpdateReminder() {
   var _useFlagsLoading = useFlagsLoading(),
     setLoading = _useFlagsLoading[1];
   var update = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9246,7 +9270,7 @@ function useFetchReminders() {
   var _useOrderDetails = useOrderDetails(),
     OrderData = _useOrderDetails[0];
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9354,7 +9378,7 @@ var ViewReminderModal = function ViewReminderModal() {
     setCurrentAction(undefined);
   };
   var fetchReminderData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9427,7 +9451,7 @@ var ViewReminderModal = function ViewReminderModal() {
     }));
   };
   var handleEditReminder = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -9748,7 +9772,7 @@ function useCreateReminder() {
   var _useFlagsLoading = useFlagsLoading(),
     setLoading = _useFlagsLoading[1];
   var create = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9826,7 +9850,7 @@ function useFetchUnresolvedTasks() {
   var _useOrderDetails = useOrderDetails(),
     OrderData = _useOrderDetails[0];
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -9976,7 +10000,7 @@ function TaskReminderModal() {
     setReminderPayload(initialValue);
   };
   var handleReminderSubmit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -10026,7 +10050,7 @@ function OrderLock() {
     setCurrentAction(undefined);
   };
   var onComplete = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var isLocked, payload, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10073,7 +10097,7 @@ function useUpdateFlag() {
   var _useFlagsLoading = useFlagsLoading(),
     setLoading = _useFlagsLoading[1];
   var create = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
       var endpoint, requestOptions, response, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10165,7 +10189,7 @@ function HeaderSection() {
     setIsModalOpen(false);
   };
   var saveButton = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -10341,7 +10365,7 @@ function ActionSection() {
     setLoading = _useFlagsLoading[1];
   var updateFlag = useUpdateFlag();
   var onSubmit = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -10448,7 +10472,7 @@ function useFetchSingleFlagsData() {
   var ssoToken = getCookie('id_token');
   console.log(loading, 'loading loading');
   var res = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10579,7 +10603,7 @@ function ViewFlag() {
     }
   }, [staticData]);
   var fetchAndSetSingleFlagData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -10763,7 +10787,7 @@ function useSystemLogs() {
   var _useOrderProductSyste = useOrderProductSystemLogs(),
     setSystemLogsEvents = _useOrderProductSyste[1];
   var perform = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var endpoint, headers, response, _detail$, _json, detail, msg, json;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -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) {
@@ -11369,7 +11392,7 @@ function OrderView() {
   var _useOrderProductSyste = useOrderProductSystemLogs(),
     setSystemLogsEvents = _useOrderProductSyste[1];
   var fetchReminderData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -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,19 +11922,13 @@ 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/",
       method: 'GET',
       //@ts-ignore
       pagination: {
-        page: 1,
-        per_page: 50
+        is_pagination: false
       }
     }),
     fetchedCustomerData = _useApiHook.data,