@bjsdistribution/dms-client-return 0.0.21 → 0.0.23

package/dist/dms-client-return.esm.js

@@ -9532,7 +9532,6 @@ function SelectionFilter() {
         type: 'SET_CLIENT_FILTER',
         payload: storedClientId
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1
@@ -9549,7 +9548,6 @@ function SelectionFilter() {
         type: 'SET_ACTIONS_FILTER',
         payload: selectedFilterValue
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1
@@ -9561,20 +9559,12 @@ function SelectionFilter() {
         type: 'SET_LOCATION_FILTER',
         payload: selectedLocationValue
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1
       });
     }
   };
-  useEffect(function () {
-    return function () {
-      dispatch({
-        type: 'CLEAR_CLIENT'
-      });
-    };
-  }, []);
   useEffect(function () {
     if (storedClientId) {
       dispatch({
@@ -9603,6 +9593,7 @@ function SelectionFilter() {
       });
     }
   }, [selectedFilterValue, selectedLocationValue]);
+  console.log(storedName, 'storedName');
   return React.createElement(Wrapper$k, null, React.createElement(FilterRow, null, React.createElement(LeftColumn, null, React.createElement(FilterColumn, null, React.createElement(Label$g, null, "Clients"), React.createElement(StyledAntSelect$4, {
     options: clientOptions,
     placeholder: "Select Client Name",
@@ -9611,7 +9602,7 @@ function SelectionFilter() {
       minWidth: '14vw'
     },
     value: storedName
-  })), storedName && location.pathname.includes("/filter/") ? React.createElement(React.Fragment, null, React.createElement(FilterColumn, null, React.createElement(Label$g, null, "Action Type"), React.createElement(StyledAntSelect$4, {
+  })), storedName && location.pathname.includes("filter/") ? React.createElement(React.Fragment, null, React.createElement(FilterColumn, null, React.createElement(Label$g, null, "Action Type"), React.createElement(StyledAntSelect$4, {
     options: actionTypeOptions,
     placeholder: "Select Action Type",
     value: selectedFilterValue,
@@ -9994,13 +9985,11 @@ var ReturnOrderTable = function ReturnOrderTable() {
     setPaginationObject = _UsePaginationData[1];
   var _usefetchAgain = usefetchAgain(),
     callForFetch = _usefetchAgain[0];
-  // console.log(callForFetch, 'callForFetchcallForFetchcallForFetchcallForFetch');
   var OpenDropDown = function OpenDropDown(index) {
     setPrintToggle(function (prevIndex) {
       return prevIndex === index ? null : index;
     });
   };
-  console.log(newpayload, 'newpayload');
   // Close dropdown outside click
   useEffect(function () {
     document.addEventListener('mousedown', handleClickOutside);
@@ -10094,8 +10083,6 @@ var ReturnOrderTable = function ReturnOrderTable() {
       setGrouped([]);
     }
   };
-  console.log(selectedReturnOrder, 'selectedReturnOrder');
-  console.log(newpayload, 'newpayload');
   var handleSelectOrderReturn = function handleSelectOrderReturn(id, return_location, return_locations, order_product_return_action, new_location, legacy_product_id) {
     setSelectedReturnOrder(function (prevSelectedLocations) {
       var isSelected = prevSelectedLocations == null ? void 0 : prevSelectedLocations.some(function (loc) {
@@ -10178,7 +10165,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
   }, React.createElement(Checkbox$1, {
     checked: selectAll,
     onChange: handleSelectAll
-  })) : React.createElement("th", null), React.createElement("th", null, "Product Location"), React.createElement("th", null, "Return Location"), React.createElement("th", null, "Recipient"), React.createElement("th", null, "Return Action Type"), React.createElement("th", null, "Code"), React.createElement("th", null, "Description"), React.createElement("th", null, "Part"), React.createElement("th", null, "Weight"), React.createElement("th", null, "CBM"), React.createElement("th", null, "Return Reason"), React.createElement("th", null, "Collected"), React.createElement("th", null, "Collection Reason"), React.createElement("th", {
+  })) : React.createElement("th", null), React.createElement("th", null, "Product Location"), React.createElement("th", null, "Return Location"), React.createElement("th", null, "Recipient"), React.createElement("th", null, "Code"), React.createElement("th", null, "Description"), React.createElement("th", null, "Part"), React.createElement("th", null, "Weight"), React.createElement("th", null, "CBM"), React.createElement("th", null, "Return Reason"), React.createElement("th", null, "Collected"), React.createElement("th", null, "Collection Reason"), React.createElement("th", {
     className: "emailInvoiceShare"
   }, "Labels"))), React.createElement("tbody", null, load ? React.createElement("tr", null, React.createElement("td", {
     colSpan: 6
@@ -10189,7 +10176,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
   })) : (returnData == null ? void 0 : returnData.length) === 0 ? React.createElement("tr", null, React.createElement("td", {
     colSpan: 14
   }, React.createElement(EmptyDataContainer$1, null, React.createElement(Empty, null)))) : returnData == null ? void 0 : returnData.map(function (item, index) {
-    var _item$order_product_r2, _item$orders_products, _item$orders_products2, _item$order_data, _item$order_data2, _item$order_product_r3, _item$return_reasons, _item$order_product_r4, _item$collection_reas;
+    var _item$order_product_r2, _item$orders_products, _item$orders_products2, _item$order_data, _item$order_data2, _item$return_reasons, _item$order_product_r3, _item$collection_reas;
     return React.createElement("tr", {
       key: item.id
     }, React.createElement("td", null, (item == null || (_item$order_product_r2 = item.order_product_return_action) == null ? void 0 : _item$order_product_r2.type) == 'RTS' ? React.createElement(React.Fragment, null, React.createElement(Checkbox$1, {
@@ -10217,7 +10204,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
       style: {
         color: '#888075'
       }
-    }, displayValueOrNA(item == null || (_item$order_data2 = item.order_data) == null || (_item$order_data2 = _item$order_data2.order_recipient) == null ? void 0 : _item$order_data2.postcode)))), React.createElement("td", null, displayValueOrNA(item == null || (_item$order_product_r3 = item.order_product_return_action) == null ? void 0 : _item$order_product_r3.type)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.code)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.description)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.parts_count)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), ' ', item != null && item.weight && (item == null ? void 0 : item.weight) !== null ? 'KG' : ''), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React.createElement("td", null, displayValueOrNA(item == null || (_item$return_reasons = item.return_reasons) == null ? void 0 : _item$return_reasons.reason)), React.createElement("td", null, (item == null || (_item$order_product_r4 = item.order_product_returns) == null ? void 0 : _item$order_product_r4.length) > 0 ? item.order_product_returns.map(function (ret) {
+    }, displayValueOrNA(item == null || (_item$order_data2 = item.order_data) == null || (_item$order_data2 = _item$order_data2.order_recipient) == null ? void 0 : _item$order_data2.postcode)))), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.code)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.description)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.parts_count)), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), ' ', item != null && item.weight && (item == null ? void 0 : item.weight) !== null ? 'KG' : ''), React.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React.createElement("td", null, displayValueOrNA(item == null || (_item$return_reasons = item.return_reasons) == null ? void 0 : _item$return_reasons.reason)), React.createElement("td", null, (item == null || (_item$order_product_r3 = item.order_product_returns) == null ? void 0 : _item$order_product_r3.length) > 0 ? item.order_product_returns.map(function (ret) {
       return ret != null && ret.collected_at ? format(new Date(ret.collected_at), 'dd/MM/yyyy') : 'UNKNOWN';
     }) : 'UNKNOWN'), React.createElement("td", null, displayValueOrNA(item == null || (_item$collection_reas = item.collection_reasons) == null ? void 0 : _item$collection_reas.reason)), React.createElement("td", null, React.createElement("ul", {
       className: "actionbox"
@@ -12519,12 +12506,21 @@ function ReturnClient() {
   // const [, dispatch] = useAtom(filtersReducerAtom);
   console.log(selectedClientString, 'selectedClient');
   console.log("../filter/:" + selectedClientString);
+  var splitPath = function splitPath(str) {
+    var _str$split;
+    var parts = str == null || (_str$split = str.split('/')) == null ? void 0 : _str$split.filter(function (part) {
+      return part !== '';
+    }); // Filter out empty parts
+    return parts;
+  };
+  var paths = splitPath(location.pathname);
+  console.log(paths, 'pathssssssssssssssssssssssssssss');
   useEffect(function () {
-    if (location.pathname.includes('/returnClient')) {
+    console.log(paths[paths.length - 1], 'paths[paths.length] paths[paths.length]');
+    if (paths[paths.length - 1] === 'returnclient') {
       localStorage.removeItem('clientName');
       localStorage.removeItem('clientId');
       localStorage.removeItem('uuid');
-      localStorage.removeItem('customer_id');
       // dispatch({ type: 'CLEAR_CLIENT', payload: [] });
     }
   }, [location.pathname]);