@bjsdistribution/dms-client-return 0.0.40 → 0.0.42

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

@@ -2049,7 +2049,7 @@ function ServiceLevel() {
 }
 var Container$o = /*#__PURE__*/styled__default.div(_templateObject$x || (_templateObject$x = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 6px;\n  flex: 1;\n\n  ", "\n\n  > fieldset {\n    > div {\n      > div {\n        > label {\n          text-transform: capitalize;\n        }\n      }\n    }\n  }\n"])), function (_ref) {
   var disabled = _ref.disabled;
-  return disabled && "\n    cursor: not-allowed;\n    pointer-events: none;\n\n    > * {\n      cursor: not-allowed;\n    }\n  ";
+  return disabled && "\n    pointer-events: none;\n\n    > * {\n      pointer-events: none;\n    }\n  ";
 });
 
 var _templateObject$y;
@@ -2186,7 +2186,7 @@ function ServiceSlider(props) {
 }
 var ServiceName = /*#__PURE__*/styled__default.span(_templateObject$z || (_templateObject$z = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: #6a7378;\n  font-family: 'Roboto', sans-serif;\n  font-size: 14px;\n  font-style: normal;\n  font-weight: 600;\n  text-transform: capitalize;\n"])));
 var ServiceIcon = /*#__PURE__*/styled__default.img(_templateObject2$q || (_templateObject2$q = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  min-width: 28px;\n  height: 28px;\n"])));
-var Container$q = /*#__PURE__*/styled__default.div(_templateObject3$a || (_templateObject3$a = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 10px;\n  align-items: center;\n  cursor: not-allowed;\n  flex: 1;\n"])));
+var Container$q = /*#__PURE__*/styled__default.div(_templateObject3$a || (_templateObject3$a = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  display: flex;\n  gap: 10px;\n  align-items: center;\n  /* cursor: not-allowed; */\n  flex: 1;\n"])));
 
 var _templateObject$A;
 function OrderServices() {
@@ -3117,7 +3117,7 @@ function useGetEventNotes() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            endpoint = dmsComponentLibrary.getBaseEndpoint() + "/events/get/event_information/"; // setLoading(true);
+            endpoint = dmsComponentLibrary.getBaseEndpoint() + "events/get/event_information/"; // setLoading(true);
             _context.prev = 1;
             headers = {
               accept: 'application/json',
@@ -3936,14 +3936,6 @@ var selectedClient = /*#__PURE__*/jotai.atom(null);
 function useSelectedClient() {
   return jotai.useAtom(selectedClient);
 }
-var clientTableId = /*#__PURE__*/jotai.atom(null);
-function useIdForTableName() {
-  return jotai.useAtom(clientTableId);
-}
-var clientTableName = /*#__PURE__*/jotai.atom(null);
-function useTableName() {
-  return jotai.useAtom(clientTableName);
-}
 // Paginations
 var atomPaginationData = /*#__PURE__*/jotai.atom({
   firstPage: 1,
@@ -8865,8 +8857,6 @@ function SelectionFilter() {
   var _useSelectedClient = useSelectedClient(),
     selectedClient = _useSelectedClient[0],
     setSelectedClient = _useSelectedClient[1];
-  var _useIdForTableName = useIdForTableName(),
-    setClientIdForTable = _useIdForTableName[1];
   var _useState = React.useState(false),
     isButtonEnabled = _useState[0],
     setIsButtonEnabled = _useState[1];
@@ -8874,8 +8864,6 @@ function SelectionFilter() {
     setReturnPayload = _useReturnPayload[1];
   var _useLoading = useLoading(),
     load = _useLoading[0];
-  var _useTableName = useTableName(),
-    setTableName = _useTableName[1];
   var _useClearState = useClearState(),
     clearState = _useClearState[0],
     setClear = _useClearState[1];
@@ -8885,6 +8873,17 @@ function SelectionFilter() {
   var _useLocationOptions = useLocationOptions(),
     locationOptions = _useLocationOptions[0],
     setLocationOptions = _useLocationOptions[1];
+  var _useSearchParams = reactRouterDom.useSearchParams(),
+    searchParams = _useSearchParams[0];
+  var navigate = reactRouterDom.useNavigate();
+  //new codee
+  var urlCustomerId = searchParams.get('customerId');
+  var urlActiontype = searchParams.get('type');
+  var selectedCustomer = customers == null ? void 0 : customers.find(function (customer) {
+    return (customer == null ? void 0 : customer.customer_id.toString()) === urlCustomerId;
+  });
+  var accountNumber = selectedCustomer == null ? void 0 : selectedCustomer.account_number;
+  //customer name
   var clientOptions = customers == null ? void 0 : customers.filter(function (option) {
     return 'customer_id' in option && option.customer_id != null;
   }).map(function (option) {
@@ -8899,55 +8898,60 @@ function SelectionFilter() {
   });
   //client change
   var handleClientChange = function handleClientChange(value, option) {
-    // console.log(value, 'value');
     setSelectedClient(value);
-    localStorage.setItem('clientName', option == null ? void 0 : option.label);
-    localStorage.setItem('clientId', value == null ? void 0 : value.toString());
-    localStorage.setItem('account_number', option == null ? void 0 : option.account_number);
+    var filteredClient = clientOptions == null ? void 0 : clientOptions.find(function (client) {
+      return (client == null ? void 0 : client.value) == value;
+    });
+    if (filteredClient) {
+      var _filteredClient$actio, _filteredClient$retur;
+      var mappedActions = Array.isArray(filteredClient == null ? void 0 : filteredClient.actions) ? filteredClient == null || (_filteredClient$actio = filteredClient.actions) == null ? void 0 : _filteredClient$actio.map(function (action) {
+        return {
+          label: action,
+          value: action
+        };
+      }) : [];
+      setActionTypeOptions(mappedActions);
+      var mappedLocations = Array.isArray(filteredClient == null ? void 0 : filteredClient.return_locations) ? filteredClient == null || (_filteredClient$retur = filteredClient.return_locations) == null ? void 0 : _filteredClient$retur.map(function (location) {
+        return {
+          label: location == null ? void 0 : location.location_name,
+          value: location == null ? void 0 : location.token
+        };
+      }) : [];
+      setLocationOptions(mappedLocations);
+    }
     //set payload
     setReturnPayload(function (prevState) {
       return _extends({}, prevState, {
         account_number: option == null ? void 0 : option.account_number,
-        customer_id: value
+        customer_id: +value
       });
     });
   };
-  var storedName = localStorage.getItem('clientName');
-  var storedClientId = localStorage.getItem('clientId');
-  var storedAccountNumber = localStorage.getItem('account_number');
   React.useEffect(function () {
-    if (storedClientId !== selectedClient) {
-      localStorage.removeItem('clientDetails');
-      localStorage.removeItem('clientActions');
-      localStorage.removeItem('clientLocations');
-    }
-  }, [storedClientId]);
-  React.useEffect(function () {
-    if (storedClientId && storedAccountNumber) {
+    if (urlCustomerId && accountNumber) {
       setReturnPayload(function (prevState) {
         return _extends({}, prevState, {
-          account_number: storedAccountNumber,
-          customer_id: storedClientId
+          account_number: accountNumber,
+          customer_id: +urlCustomerId
         });
       });
     }
-  }, [storedClientId, storedAccountNumber]);
+  }, [accountNumber, urlCustomerId]);
   React.useEffect(function () {
-    var storedClientId = localStorage.getItem('clientId');
-    if (storedClientId && (clientOptions == null ? void 0 : clientOptions.length) > 0) {
+    if (urlCustomerId && (clientOptions == null ? void 0 : clientOptions.length) > 0) {
       var filteredClient = clientOptions == null ? void 0 : clientOptions.find(function (client) {
-        return (client == null ? void 0 : client.value) == storedClientId;
+        return (client == null ? void 0 : client.value) == urlCustomerId;
       });
       if (filteredClient) {
-        var _filteredClient$actio, _filteredClient$retur;
-        var mappedActions = Array.isArray(filteredClient == null ? void 0 : filteredClient.actions) ? filteredClient == null || (_filteredClient$actio = filteredClient.actions) == null ? void 0 : _filteredClient$actio.map(function (action) {
+        var _filteredClient$actio2, _filteredClient$retur2;
+        var mappedActions = Array.isArray(filteredClient == null ? void 0 : filteredClient.actions) ? filteredClient == null || (_filteredClient$actio2 = filteredClient.actions) == null ? void 0 : _filteredClient$actio2.map(function (action) {
           return {
             label: action,
             value: action
           };
         }) : [];
         setActionTypeOptions(mappedActions);
-        var mappedLocations = Array.isArray(filteredClient == null ? void 0 : filteredClient.return_locations) ? filteredClient == null || (_filteredClient$retur = filteredClient.return_locations) == null ? void 0 : _filteredClient$retur.map(function (location) {
+        var mappedLocations = Array.isArray(filteredClient == null ? void 0 : filteredClient.return_locations) ? filteredClient == null || (_filteredClient$retur2 = filteredClient.return_locations) == null ? void 0 : _filteredClient$retur2.map(function (location) {
           return {
             label: location == null ? void 0 : location.location_name,
             value: location == null ? void 0 : location.token
@@ -8968,10 +8972,10 @@ function SelectionFilter() {
   //Apply filters
   var applyFilters = function applyFilters() {
     if (selectedClient) {
-      setClientIdForTable(selectedClient);
-    }
-    if (storedName) {
-      setTableName(storedName);
+      var queryParams = new URLSearchParams({
+        customerId: selectedClient == null ? void 0 : selectedClient.toString()
+      });
+      navigate("/filter?" + queryParams.toString());
     }
     var selectedClientValue = clientOptions == null ? void 0 : clientOptions.find(function (client) {
       return (client == null ? void 0 : client.value) === selectedClient;
@@ -8991,10 +8995,10 @@ function SelectionFilter() {
       };
     }) : []);
     //client value
-    if (storedClientId) {
+    if (urlCustomerId) {
       dispatch({
         type: 'SET_CLIENT_FILTER',
-        payload: storedClientId
+        payload: urlCustomerId
       });
       dispatch({
         type: 'SET_PAGE',
@@ -9029,22 +9033,13 @@ function SelectionFilter() {
       });
     }
   };
-  // const storedName = localStorage.getItem('clientName');
-  React.useEffect(function () {
-    if (storedClientId) {
-      dispatch({
-        type: 'SET_CLIENT_FILTER',
-        payload: storedClientId
-      });
-    }
-  }, []);
   React.useEffect(function () {
-    if (storedClientId || selectedFilterValue || selectedLocationValue) {
+    if (selectedClient || selectedFilterValue || selectedLocationValue) {
       setIsButtonEnabled(true);
     } else {
       setIsButtonEnabled(false);
     }
-  }, [storedClientId, selectedFilterValue, selectedLocationValue]);
+  }, [selectedClient, selectedFilterValue, selectedLocationValue]);
   React.useEffect(function () {}, [location.pathname]);
   React.useEffect(function () {
     if (!selectedFilterValue || selectedFilterValue === null) {
@@ -9060,7 +9055,9 @@ function SelectionFilter() {
   }, [selectedFilterValue, selectedLocationValue]);
   var handleClear = function handleClear() {
     setClear(false);
-    localStorage.removeItem('clientDetails');
+    dispatch({
+      type: 'CLEAR_CLIENT'
+    });
     setClear(true);
   };
   React.useEffect(function () {
@@ -9071,25 +9068,64 @@ function SelectionFilter() {
       window.location.href = '/returnclient';
     }
   }, [clearState]);
+  React.useEffect(function () {
+    if (urlCustomerId && urlActiontype) {
+      dispatch({
+        type: 'SET_CLIENT_FILTER',
+        payload: urlCustomerId
+      });
+      setSelectedClient(+urlCustomerId);
+      dispatch({
+        type: 'SET_ACTIONS_FILTER',
+        payload: urlActiontype
+      });
+      setSelectedFilterValue(urlActiontype);
+      dispatch({
+        type: 'SET_PAGE',
+        payload: 1
+      });
+    } else if (urlCustomerId) {
+      dispatch({
+        type: 'SET_CLIENT_FILTER',
+        payload: urlCustomerId
+      });
+      setSelectedClient(+urlCustomerId);
+      dispatch({
+        type: 'SET_PAGE',
+        payload: 1
+      });
+    }
+  }, [urlCustomerId]);
+  var handleClearAction = function handleClearAction() {
+    dispatch({
+      type: 'CLEAR_ACTION'
+    });
+    var searchParams = new URLSearchParams(window.location.search);
+    searchParams["delete"]('type');
+    navigate("?" + searchParams.toString(), {
+      replace: true
+    });
+  };
   return React__default.createElement(Wrapper$j, 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$2, {
     options: clientOptions,
     placeholder: "Select Client Name",
     onChange: handleClientChange,
     style: {
-      minWidth: '14vw'
+      minWidth: '150px'
     },
-    value: storedName,
+    value: selectedClient,
     allowClear: true,
     onClear: handleClear
-  })), React__default.createElement(React__default.Fragment, null, React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Action Type"), React__default.createElement(StyledAntSelect$2, {
+  })), React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Action Type"), React__default.createElement(StyledAntSelect$2, {
     options: actionTypeOptions,
     placeholder: "Select Action Type",
     value: selectedFilterValue,
     onChange: handleActionClick,
     style: {
-      minWidth: '14vw'
+      minWidth: '150px'
     },
-    allowClear: true
+    allowClear: true,
+    onClear: handleClearAction
   })), React__default.createElement(FilterColumn, null, React__default.createElement(Label$g, null, "Location "), React__default.createElement(StyledAntSelect$2, {
     options: locationOptions,
     value: selectedLocationValue,
@@ -9100,7 +9136,7 @@ function SelectionFilter() {
     },
     allowClear: true,
     mode: "multiple"
-  })))), React__default.createElement(RightColumn$1, null, React__default.createElement(ApplyButton, {
+  }))), React__default.createElement(RightColumn$1, null, React__default.createElement(ApplyButton, {
     onClick: applyFilters,
     disabled: !isButtonEnabled
   }, "Apply"))));
@@ -9209,8 +9245,17 @@ var Container$13 = /*#__PURE__*/styled__default.div(_templateObject$1T || (_temp
 var ButtonText = /*#__PURE__*/styled__default.button(_templateObject2$1n || (_templateObject2$1n = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  color: white;\n  font-size: 14px;\n  font-style: normal;\n  font-weight: 600;\n\n  display: flex;\n  padding: 7px 12px;\n  justify-content: center;\n  align-items: center;\n  gap: 2px;\n  border-radius: 15px;\n  background: #3a3630;\n  font-family: 'Lato';\n  cursor: pointer;\n  border: none;\n\n  &:disabled {\n    border-radius: 15px;\n    background: rgba(136, 128, 117, 0.35);\n    color: #888075;\n    cursor: not-allowed;\n  }\n"])));
 
 var ReturnFilter = function ReturnFilter() {
-  var storedName = localStorage.getItem('clientName');
-  return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledFiter, null, React__default.createElement(Text$8, null, storedName), React__default.createElement(StyledFIlterELements, null, React__default.createElement(StyledTableFilter, null)), React__default.createElement(RightFilters, null)));
+  var _useCustomerData = useCustomerData(),
+    customers = _useCustomerData[0];
+  var queryParams = new URLSearchParams(location.search);
+  var customerId = queryParams.get('customerId');
+  var selectedCustomer = customers == null ? void 0 : customers.find(function (customer) {
+    var _customer$customer_id;
+    return (customer == null || (_customer$customer_id = customer.customer_id) == null ? void 0 : _customer$customer_id.toString()) === customerId;
+  });
+  var customerName = selectedCustomer == null ? void 0 : selectedCustomer.customer_name;
+  // const accountNumber = selectedCustomer?.account_number;
+  return React__default.createElement(React__default.Fragment, null, React__default.createElement(StyledFiter, null, React__default.createElement(Text$8, null, customerName), React__default.createElement(StyledFIlterELements, null, React__default.createElement(StyledTableFilter, null)), React__default.createElement(RightFilters, null)));
 };
 
 var _templateObject$1U, _templateObject2$1o, _templateObject3$Q, _templateObject4$u, _templateObject34, _templateObject35, _templateObject36, _templateObject37;
@@ -10002,7 +10047,6 @@ var ModalManager = function ModalManager() {
     response = _useApiHook.data,
     setShouldPerformAction = _useApiHook.setShouldPerformAction,
     confirmLoading = _useApiHook.loading,
-    apiError = _useApiHook.error,
     setError = _useApiHook.setError;
   React.useEffect(function () {
     SetPostLoading(confirmLoading);
@@ -10019,11 +10063,12 @@ var ModalManager = function ModalManager() {
   };
   React.useEffect(function () {
     // @ts-ignore
-    if (apiError && (apiError == null ? void 0 : apiError.code) !== 200) {
+    if (response && (response == null ? void 0 : response.code) == 500) {
+      // @ts-ignore
       antd.notification.error({
         message: 'Failure',
         // @ts-ignore
-        description: "" + (apiError == null ? void 0 : apiError.message)
+        description: "" + (response == null ? void 0 : response.message)
       });
       dispatch({
         type: 'close'
@@ -10056,7 +10101,7 @@ var ModalManager = function ModalManager() {
       // for dev
       navigate('/returnclient/order-return');
     }
-  }, [response, apiError, postLoading]);
+  }, [postLoading]);
   return React__default.createElement(React__default.Fragment, null, (popupName == null ? void 0 : popupName.state) === 'create-return' && React__default.createElement(React__default.Fragment, null, React__default.createElement(dmsComponentLibrary.AntModal, {
     openStatus: (popupName == null ? void 0 : popupName.state) == 'create-return' ? true : false,
     closeModal: function closeModal() {
@@ -10225,6 +10270,7 @@ var Pagination = function Pagination(_ref) {
 };
 
 var _templateObject$1Z, _templateObject2$1t;
+// import { useLocation } from 'react-router-dom';
 var ReturnTable = function ReturnTable() {
   var _UsePaginationData = UsePaginationData(),
     paginationObj = _UsePaginationData[0];
@@ -10233,6 +10279,7 @@ var ReturnTable = function ReturnTable() {
   var _useItemsPerPage = useItemsPerPage(),
     itemsPerPage = _useItemsPerPage[0],
     setItemsPerPage = _useItemsPerPage[1];
+  // const location = useLocation();
   var page = paginationObj.page,
     total = paginationObj.total;
   var handlePageChange = function handlePageChange(page) {
@@ -10241,6 +10288,10 @@ var ReturnTable = function ReturnTable() {
   var handleItemsPerPageChange = function handleItemsPerPageChange(itemsPerPage) {
     setItemsPerPage(itemsPerPage);
   };
+  // useEffect(() => {
+  //   const queryParams = new URLSearchParams(location.search);
+  //   const clientId = queryParams.get('customerId');
+  // }, [location]);
   return React__default.createElement("div", null, React__default.createElement(DashBoardWrapper$1, null, React__default.createElement("div", {
     className: "Tableconatiner"
   }, React__default.createElement(HeaderFilter, null), React__default.createElement(Container$15, null, React__default.createElement(ReturnFilter, null), React__default.createElement(ReturnOrderTable, null), total > 0 && React__default.createElement(Pagination, {
@@ -10703,24 +10754,64 @@ var filterReducer$1 = function filterReducer(state, action) {
         }])
       });
     case 'SET_CLIENT_FILTER':
+      if (action.payload) {
+        return _extends({}, state, {
+          'x-filters': [].concat(state['x-filters'].filter(function (f) {
+            return f.field !== 'customer_id';
+          }), [{
+            field: 'customer_id',
+            op: '=',
+            value: action.payload
+          }])
+        });
+      } else {
+        return _extends({}, state, {
+          'x-filters': state['x-filters'].filter(function (f) {
+            return f.field !== 'customer_id';
+          })
+        });
+      }
+    case 'CLEAR_CLIENT_FILTER':
       return _extends({}, state, {
-        'x-filters': [].concat(state['x-filters'].filter(function (f) {
+        'x-filters': state['x-filters'].filter(function (f) {
           return f.field !== 'customer_id';
-        }), [{
-          field: 'customer_id',
-          op: '=',
-          value: action.payload
-        }])
+        })
       });
     case 'SET_STATUS_ORDER_FILTER':
+      if (action.payload) {
+        return _extends({}, state, {
+          'x-filters': [].concat(state['x-filters'].filter(function (f) {
+            return f.field !== 'status_id';
+          }), [{
+            field: 'status_id',
+            op: '=',
+            value: action.payload
+          }])
+        });
+      } else {
+        return _extends({}, state, {
+          'x-filters': state['x-filters'].filter(function (f) {
+            return f.field !== 'status_id';
+          })
+        });
+      }
+    case 'SET_ASSIGNEE_FILTER':
       return _extends({}, state, {
-        'x-filters': [].concat(state['x-filters'].filter(function (f) {
-          return f.field !== 'status_id';
+        'x-filters': action.payload !== null ? [].concat(state['x-filters'].filter(function (f) {
+          return f.field !== 'bjs_delivery';
         }), [{
-          field: 'status_id',
+          field: 'bjs_delivery',
           op: '=',
           value: action.payload
-        }])
+        }]) : state['x-filters'].filter(function (f) {
+          return f.field !== 'bjs_delivery';
+        })
+      });
+    case 'CLEAR_STATUS_ORDER_FILTER':
+      return _extends({}, state, {
+        'x-filters': state['x-filters'].filter(function (f) {
+          return f.field !== 'status_id';
+        })
       });
     // case 'CLEAR_CLIENT':
     //   return {
@@ -10784,22 +10875,11 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
   var _useState3 = React.useState(),
     statusOrder = _useState3[0],
     setStatusOfOrder = _useState3[1];
-  var zoneOptions = [{
-    label: 'Zone 1',
-    value: 'zone1'
-  }, {
-    label: 'Zone 2',
-    value: 'zone2'
-  }, {
-    label: 'Zone 3',
-    value: 'zone3'
-  }, {
-    label: 'Zone 4',
-    value: 'zone4'
-  }, {
-    label: 'Zone 5',
-    value: 'zone5'
-  }];
+  var _useState4 = React.useState(),
+    selectedAssignee = _useState4[0],
+    setSelectedAssignee = _useState4[1];
+  var _useAssignData = useAssignData(),
+    assignData = _useAssignData[0];
   // date change here
   var handleDateChange = function handleDateChange(date) {
     setSelectedDate(date ? date == null ? void 0 : date.$d : null);
@@ -10859,14 +10939,54 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
       payload: 1
     });
   };
+  var handleAssigneeChange = function handleAssigneeChange(value) {
+    var _assignData$find;
+    var bjsDeliveryValue = (_assignData$find = assignData.find(function (client) {
+      return client.id === value;
+    })) == null ? void 0 : _assignData$find.bjs_delivery;
+    if (bjsDeliveryValue === undefined) return;
+    setSelectedAssignee(value);
+    dispatch({
+      type: 'SET_ASSIGNEE_FILTER',
+      payload: bjsDeliveryValue
+    });
+    dispatch({
+      type: 'SET_PAGE',
+      payload: 1
+    });
+  };
+  var handleClearAssignee = function handleClearAssignee() {
+    setSelectedAssignee(null);
+    dispatch({
+      type: 'SET_ASSIGNEE_FILTER',
+      payload: null
+    });
+    dispatch({
+      type: 'SET_PAGE',
+      payload: 1
+    });
+  };
   var handleClearAll = function handleClearAll() {
     setSelectedDate(null);
     setSelectedClient(null);
     setStatusOfOrder(null);
+    setSelectedAssignee(null);
     dispatch({
       type: 'CLEAR_ALL_FILTER'
     });
   };
+  var handleClear = function handleClear() {
+    dispatch({
+      type: 'CLEAR_STATUS_ORDER_FILTER'
+    });
+    setStatusOfOrder(null);
+  };
+  var handleClearClient = function handleClearClient() {
+    dispatch({
+      type: 'CLEAR_CLIENT_FILTER'
+    });
+    setSelectedClient(null);
+  };
   //clearing filters
   React.useEffect(function () {
     if (selectedDate === null) {
@@ -10908,7 +11028,9 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     style: {
       minWidth: '130px'
     },
-    value: statusOrder
+    value: statusOrder,
+    onClear: handleClear,
+    allowClear: true
   }))), React__default.createElement("div", {
     className: "datefilter"
   }, React__default.createElement("div", {
@@ -10922,25 +11044,30 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
     style: {
       width: '125px',
       border: 'none'
-    }
+    },
+    allowClear: true,
+    onClear: handleClearClient
   }))), React__default.createElement("div", {
-    className: "datefilter",
-    style: {
-      pointerEvents: 'none',
-      opacity: 0.5
-    }
+    className: "datefilter"
   }, React__default.createElement("div", {
     className: "dateiconcontainer"
   }, React__default.createElement(AssigneIcon, null)), React__default.createElement(StyledAntSelect$4, null, React__default.createElement(antd.Select, {
-    options: zoneOptions,
+    options: assignData == null ? void 0 : assignData.map(function (client) {
+      return {
+        label: client.type,
+        value: client.id
+      };
+    }),
     className: "custom-select",
-    placeholder: "Asignee",
-    onChange: function onChange() {},
+    placeholder: "Assignee",
+    onChange: handleAssigneeChange,
+    value: selectedAssignee,
     style: {
       minWidth: '100px'
     },
-    disabled: true
-  }))), selectedDate || statusOrder || selectedClient ? React__default.createElement(React__default.Fragment, null, React__default.createElement(ClearAll, {
+    allowClear: true,
+    onClear: handleClearAssignee
+  }))), selectedDate || statusOrder || selectedClient || selectedAssignee ? React__default.createElement(React__default.Fragment, null, React__default.createElement(ClearAll, {
     onClick: handleClearAll
   }, React__default.createElement(StyledFilterBtnIcon, null, React__default.createElement("i", {
     className: "cross"
@@ -11216,6 +11343,7 @@ var ReturnTable$1 = function ReturnTable() {
   var navigate = reactRouterDom.useNavigate();
   var _useCustomerData = useCustomerData(),
     customers = _useCustomerData[0];
+  // const [searchParams] = useSearchParams();
   //sorting
   var _useState2 = React.useState(null),
     sortConfig = _useState2[0],
@@ -11264,7 +11392,6 @@ var ReturnTable$1 = function ReturnTable() {
     fetchedStaticData = _useApiHook.data,
     staticDataLoading = _useApiHook.loading;
   React.useEffect(function () {
-    // setLoading(staticDataLoading);
     if (fetchedStaticData && fetchedStaticData.data) {
       var result = fetchedStaticData == null ? void 0 : fetchedStaticData.data;
       setOrderStaticData(result[0]);
@@ -11283,10 +11410,7 @@ var ReturnTable$1 = function ReturnTable() {
     setUpdatedData(updatedClientData);
   }, [customers, clientData]);
   //handle Redirect
-  var handleRedirect = function handleRedirect(customerName, customerId, account_number) {
-    localStorage.setItem('clientName', customerName);
-    localStorage.setItem('clientId', customerId == null ? void 0 : customerId.toString());
-    localStorage.setItem('account_number', account_number);
+  var handleRedirect = function handleRedirect(customerId) {
     if (customerId) {
       dispatch({
         type: 'SET_CLIENT_FILTER',
@@ -11302,12 +11426,40 @@ var ReturnTable$1 = function ReturnTable() {
         payload: []
       });
     }
+    var queryParams = new URLSearchParams({
+      customerId: customerId == null ? void 0 : customerId.toString()
+    });
     //for dev
-    navigate("filter/" + customerId);
+    navigate("filter?" + queryParams.toString());
     //for local
-    // navigate(`/filter/${customerId}`);
+    //navigate(`/filter?${queryParams.toString()}`);
+  };
+  //for RTS
+  var handleRedirectRTS = function handleRedirectRTS(customerId, RTS) {
+    if (customerId) {
+      dispatch({
+        type: 'SET_CLIENT_FILTER',
+        payload: customerId
+      });
+      dispatch({
+        type: 'SET_PAGE',
+        payload: 1
+      });
+    } else {
+      dispatch({
+        type: 'SET_CLIENT_FILTER',
+        payload: []
+      });
+    }
+    var queryParams = new URLSearchParams({
+      customerId: customerId == null ? void 0 : customerId.toString(),
+      type: RTS
+    });
+    //for dev
+    navigate("filter?" + queryParams.toString());
+    //for local
+    //navigate(`/filter?${queryParams.toString()}`);
   };
-  console.log(statsLoading, 'statsLoading');
   return React__default.createElement(React__default.Fragment, null, statsLoading && React__default.createElement(Loader, null), React__default.createElement(StyledTableWrapper$2, {
     id: "tableScrolling"
   }, React__default.createElement(StyledTable$3, null, React__default.createElement("thead", null, React__default.createElement("tr", null, [{
@@ -11368,14 +11520,27 @@ var ReturnTable$1 = function ReturnTable() {
       key: index
     }, React__default.createElement("td", null, key == null ? void 0 : key.trading_as), React__default.createElement("td", {
       onClick: function onClick() {
-        return handleRedirect(key == null ? void 0 : key.customer_name, key == null ? void 0 : key.customer_id, key == null ? void 0 : key.account_number);
+        return handleRedirect(key == null ? void 0 : key.customer_id);
       },
       style: {
         color: '#0099ff',
         fontWeight: 600,
         cursor: 'pointer'
       }
-    }, React__default.createElement("span", null, key == null ? void 0 : key.customer_name)), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.orders))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.return_order_products))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.RTS))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.PENDING))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.DISPOSE))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key['RE-ALLOCATE']), ' ')), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key['RE-DEL']))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.RECYCLE))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.UNKNOWN))));
+    }, React__default.createElement("span", null, key == null ? void 0 : key.customer_name)), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.orders))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.return_order_products))), React__default.createElement("td", {
+      style: {
+        color: (key == null ? void 0 : key.RTS) > 0 ? '#0099ff' : 'inherit',
+        fontWeight: (key == null ? void 0 : key.RTS) > 0 ? 600 : 'normal',
+        cursor: (key == null ? void 0 : key.RTS) > 0 ? 'pointer' : 'default'
+      },
+      onClick: function onClick() {
+        return handleRedirectRTS(key == null ? void 0 : key.customer_id, 'RTS');
+      }
+    }, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, {
+      style: {
+        backgroundColor: (key == null ? void 0 : key.RTS) > 0 ? 'rgba(99, 150, 229, 0.1)' : 'rgba(153, 153, 153, 0.1)'
+      }
+    }, key == null ? void 0 : key.RTS))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.PENDING))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.DISPOSE))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key['RE-ALLOCATE']), ' ')), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key['RE-DEL']))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.RECYCLE))), React__default.createElement("td", null, React__default.createElement(ColumStyle, null, React__default.createElement(GreyBox, null, key == null ? void 0 : key.UNKNOWN))));
   })))));
 };
 
@@ -11451,8 +11616,9 @@ function ReturnMainTable() {
     setLoading = _useStatsLoading[1];
   var _useClientData = useClientData(),
     setClientData = _useClientData[1];
-  var _useTableName = useTableName(),
-    tableName = _useTableName[0];
+  // const [tableName] = useTableName();
+  var queryParams = new URLSearchParams(location.search);
+  var customerId = queryParams.get('customerId');
   var handlePageChange = function handlePageChange(page) {
     setCurrentPage(page);
   };
@@ -11489,7 +11655,7 @@ function ReturnMainTable() {
     className: " " + (isScrolled ? 'stickyTableHead' : '')
   }, React__default.createElement("div", {
     className: "Tableconatiner"
-  }, React__default.createElement(HeaderFilter, null), React__default.createElement(Container$18, null, React__default.createElement(Row$7, null, React__default.createElement(Text$8, null, "Client Return"), tableName ? React__default.createElement(ReturnFilter, null) : React__default.createElement(Filters, null)), React__default.createElement(ReturnTable$1, null)), total > 0 && React__default.createElement(Pagination, {
+  }, React__default.createElement(HeaderFilter, null), React__default.createElement(Container$18, null, React__default.createElement(Row$7, null, React__default.createElement(Text$8, null, "Client Return"), customerId ? React__default.createElement(ReturnFilter, null) : React__default.createElement(Filters, null)), React__default.createElement(ReturnTable$1, null)), total > 0 && React__default.createElement(Pagination, {
     currentPage: page,
     totalItems: total,
     itemsPerPage: itemsPerPage,
@@ -11545,9 +11711,6 @@ function ReturnClient() {
   var LoadingMessage = function LoadingMessage() {
     return React__default.createElement("div", null, "Loading...");
   };
-  var _useIdForTableName = useIdForTableName(),
-    selectedClientId = _useIdForTableName[0];
-  var navigate = reactRouterDom.useNavigate();
   var _useCustomerData = useCustomerData(),
     setCustomers = _useCustomerData[1];
   var _useActionType = useActionType(),
@@ -11562,8 +11725,12 @@ function ReturnClient() {
     setActionTypeOptions = _useActionTypeOptions[1];
   var _useLocationOptions = useLocationOptions(),
     setLocationOptions = _useLocationOptions[1];
-  var _useTableName = useTableName(),
-    setTableName = _useTableName[1];
+  var _useSelectedAction = useSelectedAction(),
+    setSelectedFilterValue = _useSelectedAction[1];
+  var _useSelectedClient = useSelectedClient(),
+    setSelectedClient = _useSelectedClient[1];
+  var _useSearchParams = reactRouterDom.useSearchParams(),
+    searchParams = _useSearchParams[0];
   var splitPath = function splitPath(str) {
     var _str$split;
     var parts = str == null || (_str$split = str.split('/')) == null ? void 0 : _str$split.filter(function (part) {
@@ -11574,19 +11741,17 @@ function ReturnClient() {
   var paths = splitPath(location.pathname);
   React.useEffect(function () {
     if (paths[paths.length - 1] === 'returnclient') {
-      localStorage.removeItem('clientName');
-      localStorage.removeItem('clientId');
-      localStorage.removeItem('account_number');
       setActionTypeOptions([]);
       setLocationOptions([]);
-      setTableName('');
+      setSelectedClient(null);
+      setSelectedFilterValue(null);
     }
-  }, [location.pathname]);
-  React.useEffect(function () {
-    if (selectedClientId) {
-      navigate("filter/" + selectedClientId);
-    }
-  }, [selectedClientId]);
+  }, [location.pathname, searchParams]);
+  // useEffect(() => {
+  //   if (selectedClientId) {
+  //     navigate(`filter/${selectedClientId}`);
+  //   }
+  // }, [selectedClientId]);
   //API for client data
   var _useApiHook = dmsComponentLibrary.useApiHook({
       endpoint: "/return_orders/customers/",
@@ -11653,7 +11818,7 @@ function ReturnClient() {
     path: "order-return/:id",
     element: React__default.createElement(OrderView, null)
   }), React__default.createElement(reactRouterDom.Route, {
-    path: "filter/:clientId",
+    path: "filter",
     element: React__default.createElement(ReturnTable, null)
   }))));
 }