@bjsdistribution/dms-client-return 0.0.21 → 0.0.23

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

@@ -9540,7 +9540,6 @@ function SelectionFilter() {
         type: 'SET_CLIENT_FILTER',
         payload: storedClientId
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1
@@ -9557,7 +9556,6 @@ function SelectionFilter() {
         type: 'SET_ACTIONS_FILTER',
         payload: selectedFilterValue
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1
@@ -9569,20 +9567,12 @@ function SelectionFilter() {
         type: 'SET_LOCATION_FILTER',
         payload: selectedLocationValue
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1
       });
     }
   };
-  React.useEffect(function () {
-    return function () {
-      dispatch({
-        type: 'CLEAR_CLIENT'
-      });
-    };
-  }, []);
   React.useEffect(function () {
     if (storedClientId) {
       dispatch({
@@ -9611,6 +9601,7 @@ function SelectionFilter() {
       });
     }
   }, [selectedFilterValue, selectedLocationValue]);
+  console.log(storedName, 'storedName');
   return React__default.createElement(Wrapper$k, null, React__default.createElement(FilterRow, null, React__default.createElement(LeftColumn, null, React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Clients"), React__default.createElement(StyledAntSelect$4, {
     options: clientOptions,
     placeholder: "Select Client Name",
@@ -9619,7 +9610,7 @@ function SelectionFilter() {
       minWidth: '14vw'
     },
     value: storedName
-  })), storedName && location.pathname.includes("/filter/") ? React__default.createElement(React__default.Fragment, null, React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Action Type"), React__default.createElement(StyledAntSelect$4, {
+  })), storedName && location.pathname.includes("filter/") ? React__default.createElement(React__default.Fragment, null, React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Action Type"), React__default.createElement(StyledAntSelect$4, {
     options: actionTypeOptions,
     placeholder: "Select Action Type",
     value: selectedFilterValue,
@@ -10002,13 +9993,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
   React.useEffect(function () {
     document.addEventListener('mousedown', handleClickOutside);
@@ -10102,8 +10091,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) {
@@ -10186,7 +10173,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
   }, React__default.createElement(dmsComponentLibrary.Checkbox, {
     checked: selectAll,
     onChange: handleSelectAll
-  })) : React__default.createElement("th", null), React__default.createElement("th", null, "Product Location"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, "Return Action Type"), React__default.createElement("th", null, "Code"), React__default.createElement("th", null, "Description"), React__default.createElement("th", null, "Part"), React__default.createElement("th", null, "Weight"), React__default.createElement("th", null, "CBM"), React__default.createElement("th", null, "Return Reason"), React__default.createElement("th", null, "Collected"), React__default.createElement("th", null, "Collection Reason"), React__default.createElement("th", {
+  })) : React__default.createElement("th", null), React__default.createElement("th", null, "Product Location"), React__default.createElement("th", null, "Return Location"), React__default.createElement("th", null, "Recipient"), React__default.createElement("th", null, "Code"), React__default.createElement("th", null, "Description"), React__default.createElement("th", null, "Part"), React__default.createElement("th", null, "Weight"), React__default.createElement("th", null, "CBM"), React__default.createElement("th", null, "Return Reason"), React__default.createElement("th", null, "Collected"), React__default.createElement("th", null, "Collection Reason"), React__default.createElement("th", {
     className: "emailInvoiceShare"
   }, "Labels"))), React__default.createElement("tbody", null, load ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 6
@@ -10197,7 +10184,7 @@ var ReturnOrderTable = function ReturnOrderTable() {
   })) : (returnData == null ? void 0 : returnData.length) === 0 ? React__default.createElement("tr", null, React__default.createElement("td", {
     colSpan: 14
   }, React__default.createElement(EmptyDataContainer$1, null, React__default.createElement(antd.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__default.createElement("tr", {
       key: item.id
     }, React__default.createElement("td", null, (item == null || (_item$order_product_r2 = item.order_product_return_action) == null ? void 0 : _item$order_product_r2.type) == 'RTS' ? React__default.createElement(React__default.Fragment, null, React__default.createElement(dmsComponentLibrary.Checkbox, {
@@ -10225,7 +10212,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__default.createElement("td", null, displayValueOrNA(item == null || (_item$order_product_r3 = item.order_product_return_action) == null ? void 0 : _item$order_product_r3.type)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.code)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.description)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.parts_count)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), ' ', item != null && item.weight && (item == null ? void 0 : item.weight) !== null ? 'KG' : ''), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React__default.createElement("td", null, displayValueOrNA(item == null || (_item$return_reasons = item.return_reasons) == null ? void 0 : _item$return_reasons.reason)), React__default.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__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.code)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.description)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.parts_count)), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.weight), ' ', item != null && item.weight && (item == null ? void 0 : item.weight) !== null ? 'KG' : ''), React__default.createElement("td", null, displayValueOrNA(item == null ? void 0 : item.cube)), React__default.createElement("td", null, displayValueOrNA(item == null || (_item$return_reasons = item.return_reasons) == null ? void 0 : _item$return_reasons.reason)), React__default.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 ? dateFns.format(new Date(ret.collected_at), 'dd/MM/yyyy') : 'UNKNOWN';
     }) : 'UNKNOWN'), React__default.createElement("td", null, displayValueOrNA(item == null || (_item$collection_reas = item.collection_reasons) == null ? void 0 : _item$collection_reas.reason)), React__default.createElement("td", null, React__default.createElement("ul", {
       className: "actionbox"
@@ -12527,12 +12514,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');
   React.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]);